1.4.0103 更换图标,G10P 标签MTK11改为G104,G10P标签为G10P

build.gradle

@@ -28,7 +28,7 @@ def appName() {
 }
 
 def releaseTime() {
-    return new Date().format("yyyyMMdd", TimeZone.getDefault())
+    return new Date().format("yyyyMMdd_HHmmss", TimeZone.getDefault())
 }
 
 final String ANDROID_TOP = "${rootDir}"
@@ -71,8 +71,8 @@ android {
 //        versionName "2.3.9"
 
         //cube
-        versionCode 81
-        versionName "6.4.1"
+        versionCode 100
+        versionName "1.4.0103"
 
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
@@ -152,19 +152,55 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
+        teclast8183 {
+            storeFile file("src/doc/TeclastMTK12.jks")
+            storePassword "123456"
+            keyAlias "TeclastMTK12"
+            keyPassword "123456"
+            v2SigningEnabled false
+        }
     }
 
     buildTypes {
+        c2Debug.initWith(debug)
+        c2Debug {
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.teclast8183
+            buildConfigField "String", "platform", '"MTK8183"'
+        }
+
+        c2Release.initWith(release)
+        c2Release {
+            signingConfig signingConfigs.teclast8183
+            buildConfigField "String", "platform", '"MTK8183"'
+        }
+
         G10PDebug.initWith(debug)
         G10PDebug {
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.G10P
+            buildConfigField "String", "platform", '"G10P"'
+        }
+
+        G10PRelease.initWith(release)
+        G10PRelease {
+            signingConfig signingConfigs.G10P
+            buildConfigField "String", "platform", '"G10P"'
+        }
+
+        G104Debug.initWith(debug)
+        G104Debug {
             buildConfigField "String", "platform", '"MTK11"'
             versionNameSuffix "-debug"
             debuggable true
             signingConfig signingConfigs.G10P
         }
 
-        G10PRelease.initWith(release)
-        G10PRelease {
+        G104Release.initWith(release)
+        G104Release {
             buildConfigField "String", "platform", '"MTK11"'
             signingConfig signingConfigs.G10P
         }
@@ -247,7 +283,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = output.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}.apk"
                         output.outputFileName = fileName
                     }
                 }
@@ -269,7 +305,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = ""
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk"
+                        def fileName = "${appName()}_${variant.versionCode}_V${variant.versionName}_${releaseTime()}_${productFlavors[0].name}_${buildType.name}.apk"
                         output.outputFileName = fileName
                     }
                 }

iconloaderlib/build.gradle

@@ -13,6 +13,8 @@ android {
     }
 
     buildTypes {
+        c2Debug {}
+        c2Release {}
         G10PDebug {}
         G10PRelease {}
         zhanRuiDebug {}

src/com/aoleyun/os/icons/IconCache.java

@@ -261,6 +261,11 @@ public class IconCache extends BaseIconCache {
         this.add("com.mediatek.fmradio.FmRadioActivity");//收音机
         this.add("com.android.fmradio.FmMainActivity");//收音机
         this.add("com.android.email.activity.Welcome");//电子邮件
+        this.add("com.android.dialer.app.calllog.CallLogActivity");//通话记录
+        this.add("com.aoleyun.sn.activity.EyeProtectionActivity");//护眼模式
+        this.add("com.aoleyun.sn.activity.CleanupActivity");//一键加速
+        this.add("com.aoleyun.sn.activity.update.UpdateActivity");//检查更新
+
     }};
     private List<String> appIconList = new ArrayList<String>() {{
         this.add("com_android_appstore");
@@ -292,6 +297,10 @@ public class IconCache extends BaseIconCache {
         this.add("com_mediatek_fmradio");
         this.add("com_mediatek_fmradio");//收音机
         this.add("com_android_email");
+        this.add("com_android_calllog");
+        this.add("com_system_huyan");
+        this.add("com_system_clean");
+        this.add("com_aoleyun_update");
     }};
 
     public Drawable getFullResIcon(LauncherActivityInfo info) {
@@ -308,20 +317,20 @@ public class IconCache extends BaseIconCache {
             if (appClassNameList.indexOf(info.getComponentName().getClassName()) == -1) {
                 icon = BitmapUtils.getRoundedBitmap(mIconProvider.getIcon(info, mIconDpi, flattenDrawable), mContext);
             } else {
-                if ("com.android.calendar.AllInOneActivity".equals(name)) {
-                    icon = BitmapUtils.createCalendarIconBitmap(mContext.getResources().getDrawable(R.drawable.mask), mContext);
-                } else if ("com.android.deskclock.DeskClock".equals(name)) {
-                    icon = BitmapUtils.getDeskClockIcon(mContext);
+//                if ("com.android.calendar.AllInOneActivity".equals(name)) {
+//                    icon = BitmapUtils.createCalendarIconBitmap(mContext.getResources().getDrawable(R.drawable.mask), mContext);
+//                } else if ("com.android.deskclock.DeskClock".equals(name)) {
+//                    icon = BitmapUtils.getDeskClockIcon(mContext);
+//                } else {
+                int i = appClassNameList.indexOf(name);
+                String val = appIconList.get(i);
+                int resID = mContext.getResources().getIdentifier(val, "drawable", "com.aoleyun.os");
+                if (resID == 0) {
+                    icon = mIconProvider.getIcon(info, mIconDpi, flattenDrawable);
                 } else {
-                    int i = appClassNameList.indexOf(name);
-                    String val = appIconList.get(i);
-                    int resID = mContext.getResources().getIdentifier(val, "drawable", "com.aoleyun.os");
-                    if (resID == 0) {
-                        icon = mIconProvider.getIcon(info, mIconDpi, flattenDrawable);
-                    } else {
-                        icon = mContext.getResources().getDrawable(resID);
-                    }
+                    icon = mContext.getResources().getDrawable(resID);
                 }
+//                }
             }
         }
 //        return mIconProvider.getIcon(info, mIconDpi, flattenDrawable);

src/com/aoleyun/os/model/LoaderTask.java

@@ -271,7 +271,7 @@ public class LoaderTask implements Runnable {
     public static HashSet<String> showApp = new HashSet<String>() {{
 //        this.add(BuildConfig.APPLICATION_ID);
         //aoleyun
-//        this.add("com.aoleyun.sn");
+        this.add("com.aoleyun.sn");
         this.add("com.aoleyun.appstore");
         this.add("com.aoleyun.postern");
         this.add("com.aoleyun.browser");
@@ -296,7 +296,6 @@ public class LoaderTask implements Runnable {
         this.add("com.android.calculator2");
         this.add("com.android.settings");
         this.add("com.android.stk");
-        this.add("com.mediatek.camera");
         this.add("com.mediatek.filemanager");
         //uiui
         this.add("com.calculator.uiui");
@@ -309,6 +308,9 @@ public class LoaderTask implements Runnable {
         this.add("com.alibaba.android.rimet");
         this.add("com.tencent.wemeet.app");
         this.add("com.qi.studycomputer.launcher");
+
+        this.add("com.ygyb.yischool");
+        this.add("com.gl.dongwa");
     }};
 
     //add for load all app on workspace
@@ -328,7 +330,7 @@ public class LoaderTask implements Runnable {
                 for (LauncherActivityInfo app : apps) {
                     Log.e("verifyApplications", "AllAPP: " + app.getApplicationInfo().packageName);
                     if (BuildConfig.APPLICATION_ID.equals(app.getApplicationInfo().packageName)
-                            || "com.ygyb.yischool".equals(app.getApplicationInfo().packageName)
+//                            || "com.ygyb.yischool".equals(app.getApplicationInfo().packageName)
                     )
                         continue;
                     /*系统应用*/

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

@@ -199,9 +199,14 @@ public class NetInterfaceManager {
                     set.add(JGYUtils.TeclastP20sTag);
                 } else if (platform == JGYUtils.AH6016Platform) {
                     set.add(JGYUtils.AH6016Tag);
-                }else if (platform == JGYUtils.ZR6016Platform) {
+                } else if (platform == JGYUtils.ZR6016Platform) {
                     set.add(JGYUtils.ZR6016Tag);
+                } else if (platform == JGYUtils.G10PPlatform) {
+                    set.add(JGYUtils.G10PTag);
+                } else if (platform == JGYUtils.C2Platform) {
+                    set.add(JGYUtils.C2Tag);
                 }
+
             }
         });
         getPushTagsObservable()

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

@@ -37,6 +37,9 @@ public class JGYUtils {
     public static final int TeclastP20sPlatform = 6;
     public static final int AH6016Platform = 9;
     public static final int ZR6016Platform = 10;
+    public static final int HRAD13Platform = 11;
+    public static final int G10PPlatform = 12;
+    public static final int C2Platform = 13;
 
 
     public static final String Other = "其他";
@@ -47,6 +50,9 @@ public class JGYUtils {
     public static final String TeclastP20sTag = "P20S";
     public static final String AH6016Tag = "AH6016";
     public static final String ZR6016Tag = "ZR6016";
+    public static final String HRAD13Tag = "HRAD13";
+    public static final String G10PTag = "G10P";
+    public static final String C2Tag = "MTK8183";
 
 
     private JGYUtils(Context context) {
@@ -93,6 +99,12 @@ public class JGYUtils {
         } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "ZR6016");
             return ZR6016Platform;
+        } else if (G10PTag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "G10P");
+            return G10PPlatform;
+        } else if (C2Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "C2");
+            return C2Platform;
         } else {
             Log.i(TAG, "checkAppPlatform: " + "没有数据");
             return UnknowPlatform;
@@ -119,6 +131,10 @@ public class JGYUtils {
             getAppPlatformCallback.AppPlatform(AH6016Platform);
         } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(ZR6016Platform);
+        } else if (G10PTag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(G10PPlatform);
+        } else if (C2Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(C2Platform);
         } else {
             getAppPlatformCallback.AppPlatform(UnknowPlatform);
         }