version:zhanrui 6.4.1

fix:
update:更换图标,修改主页

build.gradle

@@ -66,13 +66,13 @@ android {
         minSdkVersion 26
         targetSdkVersion 28
 
-////       //MTK
-//        versionCode 48
-//        versionName "2.3.8"
+//       //MTK
+//        versionCode 49
+//        versionName "2.3.9"
 
         //cube
-        versionCode 80
-        versionName "6.4.0"
+        versionCode 81
+        versionName "6.4.1"
 
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
@@ -109,6 +109,15 @@ android {
             v2SigningEnabled false
         }
 
+        zhanRui12 {
+            storeFile file("src/doc/zhanrui12.jks")
+            storePassword "123456"
+            keyAlias "zhanrui12"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+
         mtk {
             storeFile file("src/doc/xueshibaoos.jks")
             storePassword "123456"
@@ -125,9 +134,41 @@ android {
             keyPassword "123456"
             v2SigningEnabled false
         }
+
+        zhanruiG10Z{
+            storeFile file("src/doc/zhanruiG10Z.keystore")
+            storePassword "123456"
+            keyAlias "zhanruiG10Z"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+
+        G10P {
+            storeFile file("src/doc/G10PMTK11.jks")
+            storePassword "123456"
+            keyAlias "G10PMTK11"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
     }
 
     buildTypes {
+        G10PDebug.initWith(debug)
+        G10PDebug {
+            buildConfigField "String", "platform", '"MTK11"'
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.G10P
+        }
+
+        G10PRelease.initWith(release)
+        G10PRelease {
+            buildConfigField "String", "platform", '"MTK11"'
+            signingConfig signingConfigs.G10P
+        }
+
         zhanRuiDebug.initWith(debug)
         zhanRuiDebug {
             versionNameSuffix "-debug"
@@ -151,6 +192,20 @@ android {
             signingConfig signingConfigs.zhanRuiUserdebug
         }
 
+        zhanRui12Debug.initWith(debug)
+        zhanRui12Debug {
+            versionNameSuffix "-debug"
+            buildConfigField "String", "platform", '"AH6016"'
+            debuggable true
+            signingConfig signingConfigs.zhanRui12
+        }
+
+        zhanRui12Release.initWith(release)
+        zhanRui12Release {
+            buildConfigField "String", "platform", '"AH6016"'
+            signingConfig signingConfigs.zhanRui12
+        }
+
         TeclastP20SDebug.initWith(debug)
         TeclastP20SDebug {
             debuggable true
@@ -165,6 +220,20 @@ android {
             signingConfig signingConfigs.TeclastP20S
         }
 
+        zhanruiG10ZDebug.initWith(debug)
+        zhanruiG10ZDebug {
+            buildConfigField "String", "platform", '"ZR6016"'
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.zhanruiG10Z
+        }
+
+        zhanruiG10ZRelease.initWith(release)
+        zhanruiG10ZRelease {
+            buildConfigField "String", "platform", '"ZR6016"'
+            signingConfig signingConfigs.zhanruiG10Z
+        }
+
         debug {
             buildConfigField "String", "platform", '"MTK"'
             debuggable true
@@ -200,7 +269,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = ""
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}.apk"
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk"
                         output.outputFileName = fileName
                     }
                 }

iconloaderlib/build.gradle

@@ -13,12 +13,18 @@ android {
     }
 
     buildTypes {
+        G10PDebug {}
+        G10PRelease {}
         zhanRuiDebug {}
         zhanRuiRelease {}
+        zhanRui12Debug {}
+        zhanRui12Release {}
         alldocubeDebug {}
         alldocubeDebugReleas {}
         TeclastP20SDebug {}
         TeclastP20SRelease {}
+        zhanruiG10ZDebug {}
+        zhanruiG10ZRelease {}
         debug {}
         release {}
     }

res/xml/default_workspace_6x4.xml

@@ -62,10 +62,18 @@
     <!--        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" />-->
     <!--    </resolve>-->
 
+<!--    <favorite-->
+<!--        launcher:container="-101"-->
+<!--        launcher:className="com.aoleyun.browser.activity.main.MainActivity"-->
+<!--        launcher:packageName="com.aoleyun.browser"-->
+<!--        launcher:screen="2"-->
+<!--        launcher:x="2"-->
+<!--        launcher:y="0" />-->
+
     <favorite
         launcher:container="-101"
-        launcher:className="com.aoleyun.browser.activity.main.MainActivity"
-        launcher:packageName="com.aoleyun.browser"
+        launcher:className="com.aoleyun.info.activity.main.MainActivity"
+        launcher:packageName="com.aoleyun.info"
         launcher:screen="2"
         launcher:x="2"
         launcher:y="0" />

src/com/aoleyun/os/Launcher.java

@@ -75,7 +75,7 @@ import com.alibaba.sdk.android.push.CloudPushService;
 import com.alibaba.sdk.android.push.CommonCallback;
 import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
 import com.aoleyun.os.DropTarget.DragObject;
-import com.aoleyun.os.uiuiutils.APKUtils;
+import com.aoleyun.os.uiuiutils.ApkUtils;
 import com.aoleyun.os.uiuiutils.Utils;
 import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
 import com.aoleyun.os.allapps.AllAppsContainerView;
@@ -1178,7 +1178,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 
     private void sendAppUsageRecord(String packageName) {
         Log.e("sendAppUsageRecord", "packageName: " + packageName);
-        String app_name = APKUtils.getAppNameByPackage(Launcher.this, packageName);
+        String app_name = ApkUtils.getAppNameByPackage(Launcher.this, packageName);
         long openTime = TimeUtils.getInstance().getStartTime() / 1000;
         long closeTime = TimeUtils.getInstance().getEndTime() / 1000;
         NetInterfaceManager.getInstance()
@@ -1281,7 +1281,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         /*打开霸屏应用*/
         String always_top_packagename = Settings.System.getString(getContentResolver(), "always_top_packagename");
         if (!TextUtils.isEmpty(always_top_packagename)) {
-            APKUtils.openPackage(Launcher.this, always_top_packagename);
+            ApkUtils.openPackage(Launcher.this, always_top_packagename);
         }
         mUpdate.checkUpdate(System.currentTimeMillis());
         mPasswd.getPassword(System.currentTimeMillis());

src/com/aoleyun/os/network/HTTPInterface.java

@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.aoleyun.os.network.bean.AppPasswdBean;
 import com.aoleyun.os.network.bean.BaseResponse;
-import com.aoleyun.os.uiuiutils.APKUtils;
+import com.aoleyun.os.uiuiutils.ApkUtils;
 import com.aoleyun.os.uiuiutils.TimeUtils;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -71,9 +71,9 @@ public class HTTPInterface {
         long time = TimeUtils.getInstance().getStartTime();
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("app_package", packageName);
-        jsonObject.addProperty("version_name", APKUtils.getAPPVersionName(context, packageName));
+        jsonObject.addProperty("version_name", ApkUtils.getAPPVersionName(context, packageName));
         jsonObject.addProperty("run_time", time / 1000);
-        jsonObject.addProperty("app_name", APKUtils.getAppNameByPackage(context, packageName));
+        jsonObject.addProperty("app_name", ApkUtils.getAppNameByPackage(context, packageName));
         jsonObject.addProperty("status", 1);
         String jsonString = jsonObject.toString();
         NetInterfaceManager.getInstance().getRunningAppObservable(jsonString)

src/com/aoleyun/os/network/NetInterfaceManager.java

@@ -191,6 +191,16 @@ public class NetInterfaceManager {
                     set.add(JGYUtils.MTKTag);
                 } else if (platform == JGYUtils.ZhanruiPlatform) {
                     set.add(JGYUtils.ZhanruiTag);
+                } else if (platform == JGYUtils.CubePlatform) {
+                    set.add(JGYUtils.CubeTag);
+                } else if (platform == JGYUtils.MTK11Platform) {
+                    set.add(JGYUtils.MTK11Tag);
+                } else if (platform == JGYUtils.TeclastP20sPlatform) {
+                    set.add(JGYUtils.TeclastP20sTag);
+                } else if (platform == JGYUtils.AH6016Platform) {
+                    set.add(JGYUtils.AH6016Tag);
+                }else if (platform == JGYUtils.ZR6016Platform) {
+                    set.add(JGYUtils.ZR6016Tag);
                 }
             }
         });

src/com/aoleyun/os/service/MainService.java

@@ -13,7 +13,7 @@ import android.util.Log;
 import com.aoleyun.os.BuildConfig;
 import com.aoleyun.os.network.NetInterfaceManager;
 import com.aoleyun.os.network.bean.BaseResponse;
-import com.aoleyun.os.uiuiutils.APKUtils;
+import com.aoleyun.os.uiuiutils.ApkUtils;
 import com.aoleyun.os.uiuiutils.CmdUtil;
 import com.aoleyun.os.uiuiutils.ForegroundAppUtil;
 import com.aoleyun.os.uiuiutils.TimeUtils;
@@ -227,7 +227,7 @@ public class MainService extends Service {
 
     @Download.onTaskComplete
     void taskComplete(DownloadTask task) {
-        APKUtils.installApp(MainService.this, task.getFilePath());
+        ApkUtils.installApp(MainService.this, task.getFilePath());
         Aria.download(this).load(task.getDownloadEntity().getId()).cancel();
     }
 

src/com/aoleyun/os/uiuiutils/ApkUtils.java

@@ -26,7 +26,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.List;
 
-public class APKUtils {
+public class ApkUtils {
     public static boolean openPackage(Context context, String packageName) {
         Context pkgContext = getPackageContext(context, packageName);
         Intent intent = getAppOpenIntentByPackageName(context, packageName);

src/com/aoleyun/os/uiuiutils/JGYUtils.java

@@ -31,16 +31,22 @@ public class JGYUtils {
 
     public static final int UnknowPlatform = 0;
     public static final int MTKPlatform = 1;
-    // TODO: 2022/4/23  标签替换未完成
     public static final int CubePlatform = 2;
     public static final int ZhanruiPlatform = 3;
+    public static final int MTK11Platform = 5;
+    public static final int TeclastP20sPlatform = 6;
+    public static final int AH6016Platform = 9;
+    public static final int ZR6016Platform = 10;
 
 
     public static final String Other = "其他";
     public static final String MTKTag = "MTK";
-    // TODO: 2022/4/23  标签替换未完成
     public static final String CubeTag = "展锐cube";
     public static final String ZhanruiTag = "展锐";
+    public static final String MTK11Tag = "MTK11";
+    public static final String TeclastP20sTag = "P20S";
+    public static final String AH6016Tag = "AH6016";
+    public static final String ZR6016Tag = "ZR6016";
 
 
     private JGYUtils(Context context) {
@@ -64,18 +70,6 @@ public class JGYUtils {
         return sInstance;
     }
 
-    public int checkSNPlatform(String sn) {
-        String secondChars = sn.substring(1, 2);
-        if ("N".equalsIgnoreCase(secondChars)) {//MTK平台
-            return MTKPlatform;
-        } else if ("R".equalsIgnoreCase(secondChars)) {//展锐平台
-            return ZhanruiPlatform;
-        } else {
-            Log.e(TAG, "checkSNPlatform: " + "sn: " + sn + "没有对应平台");
-            return UnknowPlatform;
-        }
-    }
-
     public int checkAppPlatform() {
         String platform = BuildConfig.platform;
         if ("MTK".equalsIgnoreCase(platform)) {
@@ -87,21 +81,24 @@ public class JGYUtils {
         } else if ("ZhanRuiCube".equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "酷比平台");
             return CubePlatform;
+        } else if ("MTK11".equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "MTK11");
+            return MTK11Platform;
+        } else if (TeclastP20sTag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "P20S");
+            return TeclastP20sPlatform;
+        } else if (AH6016Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "AH6016Tag");
+            return AH6016Platform;
+        } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "ZR6016");
+            return ZR6016Platform;
         } else {
             Log.i(TAG, "checkAppPlatform: " + "没有数据");
             return UnknowPlatform;
         }
     }
 
-    public boolean isSamePlatform(String platform) {
-        String AppPlatform = BuildConfig.platform;
-        if ("ZhanRui".equals(AppPlatform)) {
-            return ZhanruiTag.equals(platform);
-        } else {
-            return AppPlatform.equals(platform);
-        }
-    }
-
     public interface GetAppPlatformCallback {
         void AppPlatform(int platform);
     }
@@ -114,24 +111,19 @@ public class JGYUtils {
             getAppPlatformCallback.AppPlatform(ZhanruiPlatform);
         } else if ("ZhanRuiCube".equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(CubePlatform);
+        } else if (MTK11Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(MTK11Platform);
+        } else if (TeclastP20sTag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(TeclastP20sPlatform);
+        } else if (AH6016Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(AH6016Platform);
+        } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(ZR6016Platform);
         } else {
             getAppPlatformCallback.AppPlatform(UnknowPlatform);
         }
     }
 
-    public String getAppPlatform() {
-        String platform = BuildConfig.platform;
-        if ("MTK".equalsIgnoreCase(platform)) {
-            return MTKTag;
-        } else if ("ZhanRui".equalsIgnoreCase(platform)) {
-            return ZhanruiTag;
-        } else if ("ZhanRuiCube".equalsIgnoreCase(platform)) {
-            return CubeTag;
-        } else {
-            return Other;
-        }
-    }
-
     public static boolean isOfficialVersion() {
         String channelValue = JGYUtils.getInstance().getStringMetaData();
         return "official".equals(channelValue);