version:1.6.3

fix:修复专注模式能打开九学王应用
update:

FlycoTabLayoutZ_Lib/build.gradle

@@ -13,8 +13,10 @@ android {
         versionName version
     }
     buildTypes {
-        iPlay50SEDebug{}
-        iPlay50SERelease{}
+        U807Debug {}
+        U807Release {}
+        iPlay50SEDebug {}
+        iPlay50SERelease {}
         debug {}
         release {}
     }

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"

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() {

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";
 }

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) {

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());

niceimageview/build.gradle

@@ -11,8 +11,10 @@ android {
     }
 
     buildTypes {
-        iPlay50SEDebug{}
-        iPlay50SERelease{}
+        U807Debug {}
+        U807Release {}
+        iPlay50SEDebug {}
+        iPlay50SERelease {}
         debug {}
         release {}
     }

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'