1.5.0328

bugfixes:增加希沃签名
2025-04-01 18:18:32 +08:00
parent 8716bf0e36
commit 7599d14897
7 changed files with 53 additions and 21 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {

    defaultConfig {
        applicationId "com.aoleyun.sn"
-        versionCode 169
-        versionName "1.4.1217"
+        versionCode 170
+        versionName "1.5.0328"

        //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature.
        minSdkVersion 24
@@ -73,6 +73,14 @@ android {
 //        newly.res.srcDirs = ['src/beta/res']
    }

+    // Disable release builds for now
+    android.variantFilter { variant ->
+//        // Icon recents is Go only
+//        if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
+//            variant.setIgnore(true)
+//        }
+    }
+
    //签名
    signingConfigs {
        zhanRui {
@@ -216,17 +224,32 @@ android {
            v1SigningEnabled true
            v2SigningEnabled true
        }
-    }

-    // Disable release builds for now
-    android.variantFilter { variant ->
-//        // Icon recents is Go only
-//        if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
-//            variant.setIgnore(true)
-//        }
+        seewo {
+            storeFile file("keystore/aiud.keystore")
+            storePassword "s4HdJuphaiHhU7WY"
+            keyAlias "androidreleasekey"
+            keyPassword "JwUw2oV16rUjWLBC"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
    }

    buildTypes {
+       seewoDebug.initWith(debug)
+       seewoDebug {
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.seewo
+            buildConfigField "String", "platform", '"seewo"'
+        }
+
+       seewoRelease.initWith(release)
+       seewoRelease {
+            signingConfig signingConfigs.seewo
+            buildConfigField "String", "platform", '"seewo"'
+        }
+
        P50Debug.initWith(debug)
        P50Debug {
            versionNameSuffix "-debug"
--- a/app/keystore/aiud.keystore
+++ b/app/keystore/aiud.keystore
--- a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java
+++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java
@@ -308,7 +308,6 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
                            }
                            String data = GsonUtils.toJSONString(baseResponse.data);
                            Log.e("setSystemSetting", "onNext: " + data);
-//                            cacheHelper.put(UrlAddress.GET_FIRMWARE, data);
                            //结果保存到本地
                            JgyUtils.getInstance().SettingSysData(data);

@@ -322,7 +321,6 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
                            }

                            JgyUtils.getInstance().SettingSysData("");
-//                            cacheHelper.put(UrlAddress.GET_FIRMWARE, "");
                        }

                    }
--- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
@@ -1998,9 +1998,6 @@ public class NetInterfaceManager {
                    //结果保存到本地
                    JgyUtils.getInstance().SettingSysData(data);
                } else {
-                    //没有数据全部关闭
-//                                SysSettingUtils.setDisableSetting(mContext);
-//                                SPUtils.put(mContext, "SystemSettingData", "");
                    JgyUtils.getInstance().SettingSysData("");
                    cacheHelper.put(UrlAddress.GET_FIRMWARE, "");
                    //获取系统管控先不要关闭开发人员选项
@@ -2013,9 +2010,6 @@ public class NetInterfaceManager {
            @Override
            public void onError(@NonNull Throwable e) {
                Log.e("setSystemSetting", "onError: " + e.getMessage());
-                String oldData = (String) SPUtils.get(mContext, "SystemSettingData", "");
-                Log.e("setSystemSetting", "oldData: " + oldData);
-                JgyUtils.getInstance().SettingSysData(oldData);
                onComplete();
            }

@@ -2384,7 +2378,9 @@ public class NetInterfaceManager {
                                        || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.YXPD1Platform
                                        || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G11Platform
                                        || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.MT8768Platform
+                                        || "YXPC3".equals(Build.MODEL)
                                ) {
+                                    SysSettingUtils.openMtp(mContext);
                                    JgyUtils.getInstance().hideApp(PackageNames.YIXUEPAI_DESKTOP);
                                    JgyUtils.getInstance().setDefaultDesktop();
                                    StatusBarManager mStatusBarManager = (StatusBarManager) mContext.getSystemService(Context.STATUS_BAR_SERVICE);
@@ -2627,10 +2623,13 @@ public class NetInterfaceManager {
                tagSets.add(JgyUtils.HL500Tag);
            } else if (platform == JgyUtils.G11JPlatform) {
                tagSets.add(JgyUtils.G11JTag);
-            }else if (platform == JgyUtils.P50Platform) {
+            } else if (platform == JgyUtils.P50Platform) {
                tagSets.add(JgyUtils.P50Tag);
+            } else if (platform == JgyUtils.seewoPlatform) {
+                tagSets.add(JgyUtils.seewoTag);
            }
        });
+
        Log.e(TAG, "clearAndAppendTags: " + tagSets);
        String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]);
        CloudPushService pushService = PushServiceFactory.getCloudPushService();
--- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java
@@ -155,6 +155,7 @@ public class JgyUtils {
    public static final int HL500Platform = 20;
    public static final int G11JPlatform = 21;
    public static final int P50Platform = 23;
+    public static final int seewoPlatform = 25;


    public static final String Other = "其他";
@@ -176,6 +177,7 @@ public class JgyUtils {
    public static final String HL500Tag = "HL500";
    public static final String G11JTag = "aud8786";
    public static final String P50Tag = "P50TD";
+    public static final String seewoTag = "seewo";


    private CacheHelper cacheHelper;
@@ -315,6 +317,9 @@ public class JgyUtils {
        } else if (P50Tag.equalsIgnoreCase(platform)) {
            Log.i(TAG, "checkAppPlatform: " + "P50TD");
            return P50Platform;
+        } else if (seewoTag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "seewo");
+            return seewoPlatform;
        } else {
            Log.i(TAG, "checkAppPlatform: " + "没有数据");
            return UnknowPlatform;
@@ -373,7 +378,9 @@ public class JgyUtils {
            getAppPlatformCallback.AppPlatform(G11JPlatform);
        } else if (P50Tag.equalsIgnoreCase(platform)) {
            getAppPlatformCallback.AppPlatform(P50Platform);
-        }else {
+        } else if (seewoTag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(seewoPlatform);
+        } else {
            getAppPlatformCallback.AppPlatform(UnknowPlatform);
        }
    }
@@ -630,6 +637,11 @@ public class JgyUtils {
    }

    public void onBootOpenApp() {
+        if ("G1096JW".equals(Build.MODEL)) {
+            if (ApkUtils.isAvailable(mContext, "com.aisudu.xhb")) {
+                ApkUtils.openPackage(mContext, "com.aisudu.xhb");
+            }
+        }
        String qch_app_power_on = Settings.System.getString(crv, CommonConfig.AOLE_ACTION_APP_POWER_ON);
        if (TextUtils.isEmpty(qch_app_power_on)) {
            return;
@@ -1347,7 +1359,6 @@ public class JgyUtils {
    }

    public void SettingSysData(String data) {
-        SPUtils.put(mContext, "SystemSettingData", data);
        if (TextUtils.isEmpty(data)) {
            Log.e(TAG, "SettingSysData: " + "data is empty");
            SysSettingUtils.setDisableSetting(mContext);
--- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
@@ -134,7 +134,7 @@ public class SysSettingUtils {
        setNotification(context, 1);
    }

-    private static void openMtp(Context context) {
+    public static void openMtp(Context context) {
        String usbStatus = CommonConfig.AOLE_ACTION_USB_USB_MTP;
        Intent usbIntent = new Intent(usbStatus);
        context.sendBroadcast(usbIntent);
--- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java
@@ -1818,6 +1818,7 @@ public class Utils {
                || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.HL500Platform
                || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G11JPlatform
                || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.P50Platform
+                || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.seewoPlatform
        ) {
            return Utils.getProperty("ro.build.display.id", "获取失败");
        } else {