From 7ed3114868996b866631802ffb247741043869c9 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Thu, 28 Sep 2023 11:30:31 +0800
Subject: [PATCH] =?UTF-8?q?version:1.6.3=20fix:=E4=BF=AE=E5=A4=8D=E4=B8=93?=
 =?UTF-8?q?=E6=B3=A8=E6=A8=A1=E5=BC=8F=E8=83=BD=E6=89=93=E5=BC=80=E4=B9=9D?=
 =?UTF-8?q?=E5=AD=A6=E7=8E=8B=E5=BA=94=E7=94=A8=20update:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlycoTabLayoutZ_Lib/build.gradle              |   6 +-
 app/build.gradle                              |  24 +++++++-
 app/keystore/AllwinnerU807.jks                | Bin 0 -> 2843 bytes
 .../uiui/zyos/activity/main/MainActivity.java |  16 +++--
 .../com/uiui/zyos/config/CommonConfig.java    |   2 +-
 .../com/uiui/zyos/manager/RemoteManager.java  |   2 +-
 .../com/uiui/zyos/utils/OpenApkUtils.java     |  56 ++++++++++++++++++
 niceimageview/build.gradle                    |   6 +-
 verification-view/build.gradle                |  30 +++++-----
 9 files changed, 113 insertions(+), 29 deletions(-)
 create mode 100644 app/keystore/AllwinnerU807.jks

diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle
index 7b57655..e21b40c 100644
--- a/FlycoTabLayoutZ_Lib/build.gradle
+++ b/FlycoTabLayoutZ_Lib/build.gradle
@@ -13,8 +13,10 @@ android {
         versionName version
     }
     buildTypes {
-        iPlay50SEDebug{}
-        iPlay50SERelease{}
+        U807Debug {}
+        U807Release {}
+        iPlay50SEDebug {}
+        iPlay50SERelease {}
         debug {}
         release {}
     }
diff --git a/app/build.gradle b/app/build.gradle
index 8739135..2a3d6b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 53
-        versionName "1.6.1"
+        versionCode 55
+        versionName "1.6.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -60,9 +60,29 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
+        U807 {
+            storeFile file("keystore/AllwinnerU807.jks")
+            storePassword "123456"
+            keyAlias "u807"
+            keyPassword "123456"
+            v2SigningEnabled false
+        }
     }
 
     buildTypes {
+        U807Debug.initWith(debug)
+        U807Debug {
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.U807
+        }
+
+        U807Release.initWith(release)
+        U807Release {
+            signingConfig signingConfigs.U807
+        }
+
 //        iPlay50SEDebug.initWith(debug)
 //        iPlay50SEDebug {
 //            versionNameSuffix "-debug"
diff --git a/app/keystore/AllwinnerU807.jks b/app/keystore/AllwinnerU807.jks
new file mode 100644
index 0000000000000000000000000000000000000000..c8d68c594229e3fd96f457de23a3663edbd95039
GIT binary patch
literal 2843
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
index b313609..e286454 100644
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
@@ -250,12 +250,16 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
             public void onClick(View view) {
 //                Intent intent = new Intent(Settings.ACTION_SETTINGS);
 //                startActivity(intent);
-                int activated = Settings.Secure.getInt(getContentResolver(), Settings.Secure.NIGHT_DISPLAY_ACTIVATED, 0);
-                if (RemoteManager.getInstance().putSecureInt(Settings.Secure.NIGHT_DISPLAY_ACTIVATED, activated == 0 ? 1 : 0)) {
-                    Log.e(TAG, "onClick: putSecureInt successfully");
-                } else {
-                    Log.e(TAG, "onClick: putSecureInt failed");
-                }
+//                int activated = Settings.Secure.getInt(getContentResolver(), Settings.Secure.NIGHT_DISPLAY_ACTIVATED, 0);
+//                if (RemoteManager.getInstance().putSecureInt(Settings.Secure.NIGHT_DISPLAY_ACTIVATED, activated == 0 ? 1 : 0)) {
+//                    Log.e(TAG, "onClick: putSecureInt successfully");
+//                } else {
+//                    Log.e(TAG, "onClick: putSecureInt failed");
+//                }
+                ComponentName cn = new ComponentName(RemoteManager.SN_PACKAGE_NAME, "com.uiui.zy.activity.EyeProtectionActivity");
+                Intent intent = new Intent();
+                intent.setComponent(cn);
+                startActivity(intent);
             }
         });
         cl_5.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java
index d25df2a..49bc215 100644
--- a/app/src/main/java/com/uiui/zyos/config/CommonConfig.java
+++ b/app/src/main/java/com/uiui/zyos/config/CommonConfig.java
@@ -28,7 +28,7 @@ public class CommonConfig {
     public static final String MAP_ADDRESS_KEY = "map_address_key";
     public static final String MAP_ERROR_KEY = "map_error_key";
 
-    public static final String SETTING_OTHER_APPINSTALLER_KEY = "setting_other_appInstaller";
+    public static final String SETTING_OTHER_APPINSTALLER_KEY = "iflytek_setting_other_appInstaller";
     /*应用市场的app列表*/
     public final static String ADMIN_APP_LIST = "only_admin_app_list";
 }
diff --git a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
index 06bc2af..abd99de 100644
--- a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
+++ b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
@@ -63,7 +63,7 @@ public class RemoteManager {
                 getLocation();
                 try {
                     String sn = mGetInfoInterface.getSerial();
-                    CrashReport.setDeviceModel(mContext, sn);
+                    CrashReport.setDeviceId(mContext, sn);
                     mMMKV.encode(SN_KEY, sn);
                     Log.e(TAG, "onServiceConnected: sn = " + sn);
                 } catch (RemoteException e) {
diff --git a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java
index ec6ec07..3fde5c2 100644
--- a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java
@@ -17,6 +17,8 @@ import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.jxw.JxwPackageConfig;
 
 import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
 
 public class OpenApkUtils {
     private static final String TAG = OpenApkUtils.class.getSimpleName();
@@ -103,6 +105,9 @@ public class OpenApkUtils {
      * @return true为能打开
      */
     public boolean isCloudLessonMod(String pkg) {
+        if (mJxwApps.contains(pkg)) {
+            return true;
+        }
         if (mLessonJson == null)
             return true;
         if (mLessonJson.getIs_lesson() == 1) {
@@ -121,6 +126,57 @@ public class OpenApkUtils {
         }
     }
 
+    private Set<String> mJxwApps = new HashSet<String>() {{
+        this.add("air.com.zhihuiyoujiao.flashplayer");
+        this.add("com.example.arithmeticformula");
+        this.add("com.example.elementcycleapp");
+        this.add("com.example.pianpangbushou");
+        this.add("com.iflytek.cyber.iot.show.core");
+        this.add("com.iflytek.speechcloud");
+        this.add("com.jxw.bihuamingcheng");
+        this.add("com.jxw.bishunguize");
+        this.add("com.jxw.characterlearning");
+        this.add("com.jxw.dmxcy");
+        this.add("com.jxw.englishsoundmark");
+        this.add("com.jxw.examsystem");
+        this.add("com.jxw.game");
+        this.add("com.jxw.gb.zwpg");
+        this.add("com.jxw.handwrite");
+        this.add("com.jxw.jinfangyici");
+        this.add("com.jxw.jxwbook");
+        this.add("com.jxw.jxwcalculator");
+        this.add("com.jxw.laboratory");
+        this.add("com.jxw.learnchinesepinyin");
+        this.add("com.jxw.letterstudynew");
+        this.add("com.jxw.liancichengju");
+        this.add("com.jxw.mskt.video");
+        this.add("com.jxw.newyouer.video");
+        this.add("com.jxw.online_study");
+        this.add("com.jxw.question");
+        this.add("com.jxw.schultegrid");
+        this.add("com.jxw.singsound");
+        this.add("com.jxw.studydigital");
+        this.add("com.jxw.teacher.video");
+        this.add("com.jxw.wuweijidanci");
+        this.add("com.jxw.youer.video");
+        this.add("com.jxw.yuwenxiezuo");
+        this.add("com.jxw.yyhb");
+        this.add("com.jxw.zncd");
+        this.add("com.oirsdfg89.flg");
+        this.add("com.study.flashplayer");
+        this.add("com.tech.translate");
+        this.add("com.uiui.zybrowser	");
+        this.add("com.uiui.zysn	");
+        this.add("com.jxw.launcher");
+        this.add("com.uiui.zyappstore	");
+        this.add("com.uiui.zy");
+        this.add("com.uiui.zyos");
+        this.add("com.teclast.zyos");
+        this.add("com.teclast.zybrowser");
+        this.add("com.teclast.zyappstore");
+        this.add("com.teclast.zy");
+    }};
+
     private void sendRuningApp(String packageName) {
         AppUsedTimeUtils.getInstance().setAppPackageName(packageName);
         AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle
index 1c7bcc9..618fefe 100644
--- a/niceimageview/build.gradle
+++ b/niceimageview/build.gradle
@@ -11,8 +11,10 @@ android {
     }
 
     buildTypes {
-        iPlay50SEDebug{}
-        iPlay50SERelease{}
+        U807Debug {}
+        U807Release {}
+        iPlay50SEDebug {}
+        iPlay50SERelease {}
         debug {}
         release {}
     }
diff --git a/verification-view/build.gradle b/verification-view/build.gradle
index 236fe53..97b61c6 100644
--- a/verification-view/build.gradle
+++ b/verification-view/build.gradle
@@ -13,23 +13,25 @@ android {
     }
 
     buildTypes {
-        iPlay50Debug{}
-        iPlay50Release{}
-        zhanRuiUserdebug{}
-        iPlay50SEDebug{}
-        iPlay50SERelease{}
-        iPlay50ProDebug{}
-        iPlay50ProRelease{}
-        iPlay50miniDebug{}
-        iPlay50miniRelease{}
-        iPlay5013Debug{}
-        iPlay5013Release{}
+        U807Debug {}
+        U807Release {}
+        iPlay50Debug {}
+        iPlay50Release {}
+        zhanRuiUserdebug {}
+        iPlay50SEDebug {}
+        iPlay50SERelease {}
+        iPlay50ProDebug {}
+        iPlay50ProRelease {}
+        iPlay50miniDebug {}
+        iPlay50miniRelease {}
+        iPlay5013Debug {}
+        iPlay5013Release {}
         MTKAndroid12Debug {}
         MTKAndroid12Release {}
         teclast8183Debug {}
         teclast8183Release {}
-        XPadDebug{}
-        XPadRelease{}
+        XPadDebug {}
+        XPadRelease {}
         debug {}
         release {}
     }
@@ -42,8 +44,6 @@ android {
 }
 
 
-
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.3.1'