version:2.0.9

bugfixes:
update:增加iplay50p平台，退出放在个人中心

FlycoTabLayoutZ_Lib/build.gradle

@@ -13,6 +13,8 @@ android {
         versionName version
     }
     buildTypes {
+        iPlay50PDebug {}
+        iPlay50PRelease {}
         MTKT1102Debug {}
         MTKT1102Release {}
         U807Debug {}

PhotoPreview/build.gradle

@@ -10,6 +10,8 @@ android {
     }
 
     buildTypes {
+        iPlay50PDebug {}
+        iPlay50PRelease {}
         MTKT1102Debug {}
         MTKT1102Release {}
         U807Debug {}

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 99
+        versionCode 100
-        versionName "2.0.8"
+        versionName "2.0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -84,9 +84,38 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
+        iPlay50P {
+            storeFile file("keystore/iPlay50P.jks")
+            storePassword "123456"
+            keyAlias "iplay50p"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
     }
 
     buildTypes {
+        iPlay50PDebug.initWith(debug)
+        iPlay50PDebug {
+            buildConfigField "String", "platform", '"T1102"'
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.iPlay50P
+            manifestPlaceholders = [
+                    AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c"
+            ]
+        }
+
+        iPlay50PRelease.initWith(release)
+        iPlay50PRelease {
+            buildConfigField "String", "platform", '"T1102"'
+            signingConfig signingConfigs.iPlay50P
+            manifestPlaceholders = [
+                    AMAP_KEY: "aed54e2ec50c45151d17b512c9e4f34c"
+            ]
+        }
+
         MTKT1102Debug.initWith(debug)
         MTKT1102Debug {
             buildConfigField "String", "platform", '"MTKT1102"'

app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java

@@ -840,16 +840,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
         }
 
         public void open9(View view) {
-            Intent intent = new Intent("Receiver_Refresh_Password_Action");
+            OpenApkUtils.getInstance().openAppWithoutArgs(JxwPackageConfig.JXW_USAGEDATE_NAME, JxwPackageConfig.JXW_USAGEDATE_CLASS);
-            intent.setPackage("com.uiui.zy");
-            sendBroadcast(intent);
-
-            boolean is_activation = RemoteManager.getInstance().getSnIsActivation();
-            if (is_activation) {
-                startActivity(new Intent(MainActivity.this, ExitActivity.class));
-            } else {
-                Utils.exitDesktop(MainActivity.this);
-            }
         }
 
         public void openAppStore(View view) {

app/src/main/java/com/uiui/zyos/activity/user/UserActivity.java

@@ -19,6 +19,7 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener;
 import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.R;
+import com.uiui.zyos.activity.ExitActivity;
 import com.uiui.zyos.activity.edit.EditActivity;
 import com.uiui.zyos.activity.permission.PermissionActivity;
 import com.uiui.zyos.activity.update.UpdateActivity;
@@ -36,6 +37,7 @@ import com.uiui.zyos.utils.ActivationUtil;
 import com.uiui.zyos.utils.ApkUtils;
 import com.uiui.zyos.utils.FileUtil;
 import com.uiui.zyos.utils.GlideLoadUtils;
+import com.uiui.zyos.utils.Utils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -279,5 +281,18 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
         public void checkPermission(View view) {
             startActivity(new Intent(UserActivity.this, PermissionActivity.class));
         }
+
+        public void exitDesktop(View view) {
+            Intent intent = new Intent("Receiver_Refresh_Password_Action");
+            intent.setPackage("com.uiui.zy");
+            sendBroadcast(intent);
+
+            boolean is_activation = RemoteManager.getInstance().getSnIsActivation();
+            if (is_activation) {
+                startActivity(new Intent(UserActivity.this, ExitActivity.class));
+            } else {
+                Utils.exitDesktop(UserActivity.this);
+            }
+        }
     }
 }

app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java

@@ -85,7 +85,12 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppHolder> {
                         Intent intent = new Intent();
                         ComponentName componentName = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.update.UpdateActivity");
                         intent.setComponent(componentName);
-                        mContext.startActivity(intent);
+                        try {
+                            mContext.startActivity(intent);
+                        } catch (Exception e) {
+                            Toaster.show("打开失败，请检查是否安装");
+                            Log.e(TAG, "onClick: " + e.getMessage());
+                        }
                         break;
                     case AppManager.MANUAL_NAME:
                         mContext.startActivity(new Intent(mContext, ManualActivity.class));

app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java

@@ -99,6 +99,7 @@ public class AppViewModel extends BaseViewModel<FragmentAppBinding, FragmentEven
         desktopIcon.setPackageName(AppManager.ADD_NAME);
         desktopIcon.setIcon(getCtx().getDrawable(R.drawable.icon_add));
         desktopIcons.add(desktopIcons.size(), desktopIcon);
+
         mDesktopIconListData.setValue(desktopIcons);
     }
 }

app/src/main/java/com/uiui/zyos/manager/AppManager.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.tencent.mmkv.MMKV;
+import com.uiui.zyos.R;
 import com.uiui.zyos.bean.DesktopIcon;
 import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.utils.ApkUtils;
@@ -60,7 +61,10 @@ public class AppManager {
             throw new RuntimeException("Context is NULL");
         }
         this.mContext = context;
-        this.showPackages = mMMKV.decodeStringSet(SHOW_PACKAGE_KEY, new HashSet<>());
+        this.showPackages = mMMKV.decodeStringSet(SHOW_PACKAGE_KEY, new HashSet<String>(){{
+            this.add("com.jxw.yyhb");
+            this.add("com.jxw.souti");
+        }});
         this.showPackages.removeIf(TextUtils::isEmpty);
     }
 
@@ -124,6 +128,9 @@ public class AppManager {
             resolveInfos.removeIf(resolveInfo -> "com.uiui.city".equals(resolveInfo.activityInfo.packageName));
         }
         Set<String> desktopIcons = resolveInfos.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet());
+        if (showPackages.contains("com.jxw.souti")) {
+            desktopIcons.add("com.jxw.souti");
+        }
         return desktopIcons;
     }
 
@@ -193,6 +200,19 @@ public class AppManager {
             }
         });
         ArrayList<DesktopIcon> desktopIcons = new ArrayList<>();
+        if (showPackages.contains("com.jxw.souti")) {
+            if (ApkUtils.isAvailable(mContext, "com.jxw.souti")) {
+                DesktopIcon desktopIcon = new DesktopIcon();
+                desktopIcon.setLable("拍照搜题");
+                desktopIcon.setPackageName("com.jxw.souti");
+                desktopIcon.setClassName("com.jxw.souti.ui.activity.MainActivity");
+                desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_souti));
+                desktopIcons.add(desktopIcon);
+            }
+        }
+
+
+
         for (ResolveInfo applicationInfo : resolveInfos) {
             if (!ApkUtils.excludeClassName.contains(applicationInfo.activityInfo.name)) {
                 desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, applicationInfo));
@@ -253,6 +273,15 @@ public class AppManager {
 //            }
 //        });
         ArrayList<DesktopIcon> desktopIcons = new ArrayList<>();
+        if (ApkUtils.isAvailable(mContext, "com.jxw.souti")) {
+            DesktopIcon desktopIcon = new DesktopIcon();
+            desktopIcon.setLable("拍照搜题");
+            desktopIcon.setPackageName("com.jxw.souti");
+            desktopIcon.setClassName("com.jxw.souti.ui.activity.MainActivity");
+            desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_souti));
+            desktopIcons.add(desktopIcon);
+        }
+
         for (ResolveInfo resolveInfo : resolveInfos) {
             desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, resolveInfo));
         }

app/src/main/res/layout/activity_main.xml

@@ -421,7 +421,7 @@
                             android:layout_marginEnd="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
-                            android:src="@drawable/exit_icon"
+                            android:src="@drawable/com_jxw_usagedate"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -430,7 +430,7 @@
                             android:id="@+id/tv_appname9"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="退出系统"
+                            android:text="学情管理"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_7"
                             app:layout_constraintEnd_toEndOf="@+id/iv_icon9"

app/src/main/res/layout/activity_user.xml

@@ -58,19 +58,18 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:id="@+id/tv_version"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginEnd="@dimen/dp_8"
-                android:gravity="center"
+                android:background="@drawable/bt_checkupdate_bg"
                 android:maxLines="1"
-                android:singleLine="true"
+                android:onClick="@{click::exitDesktop}"
-                android:text="版本"
+                android:text="退出桌面"
-                android:onClick="@{click::checkUpdate}"
+                android:textColor="@color/white"
-                android:textColor="@color/title_gray"
+                android:textSize="@dimen/sp_10"
-                android:textSize="@dimen/sp_9"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/textView"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
@@ -176,7 +175,8 @@
                         <RadioGroup
                             android:id="@+id/radioGroup"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent">
+                            android:layout_height="match_parent"
+                            android:layout_marginBottom="@dimen/dp_8">
 
                             <RadioButton
                                 android:id="@+id/rb_center"
@@ -240,6 +240,22 @@
                         android:text="权限设置"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_10"
+                        app:layout_constraintBottom_toTopOf="@+id/tv_version"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_version"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/dp_8"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:onClick="@{click::checkUpdate}"
+                        android:singleLine="true"
+                        android:text="版本"
+                        android:textColor="@color/title_gray"
+                        android:textSize="@dimen/sp_9"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent" />

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">学习课堂</string>
+    <string name="app_name">关爱守护</string>
     <string name="privacy_agreement"><u>隐私协议</u></string>
     <string name="privacy_agreement_title">服务协议和隐私政策</string>
     <string name="privacy_agreement_content">\t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，

niceimageview/build.gradle

@@ -11,6 +11,8 @@ android {
     }
 
     buildTypes {
+        iPlay50PDebug {}
+        iPlay50PRelease {}
         MTKT1102Debug {}
         MTKT1102Release {}
         U807Debug {}

verification-view/build.gradle

@@ -13,6 +13,8 @@ android {
     }
 
     buildTypes {
+        iPlay50PDebug {}
+        iPlay50PRelease {}
         MTKT1102Debug {}
         MTKT1102Release {}
         U807Debug {}