diff --git a/build.gradle b/build.gradle index d9f1f18..7a6a906 100644 --- a/build.gradle +++ b/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 } } diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index 1e43fa1..b26aa0c 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -13,6 +13,8 @@ android { } buildTypes { + c2Debug {} + c2Release {} G10PDebug {} G10PRelease {} zhanRuiDebug {} diff --git a/res/drawable-hdpi/com_android_appstore.png b/res/drawable-hdpi/com_android_appstore.png index 9b06c7c..ad6a779 100644 Binary files a/res/drawable-hdpi/com_android_appstore.png and b/res/drawable-hdpi/com_android_appstore.png differ diff --git a/res/drawable-hdpi/com_android_browser.png b/res/drawable-hdpi/com_android_browser.png index a0bb4a3..7a77613 100644 Binary files a/res/drawable-hdpi/com_android_browser.png and b/res/drawable-hdpi/com_android_browser.png differ diff --git a/res/drawable-hdpi/com_android_calculator2.png b/res/drawable-hdpi/com_android_calculator2.png index 4c46da8..10f07e1 100644 Binary files a/res/drawable-hdpi/com_android_calculator2.png and b/res/drawable-hdpi/com_android_calculator2.png differ diff --git a/res/drawable-hdpi/com_android_calendar.png b/res/drawable-hdpi/com_android_calendar.png index ef5e141..97e2463 100644 Binary files a/res/drawable-hdpi/com_android_calendar.png and b/res/drawable-hdpi/com_android_calendar.png differ diff --git a/res/drawable-hdpi/com_android_calllog.png b/res/drawable-hdpi/com_android_calllog.png new file mode 100644 index 0000000..9c749e1 Binary files /dev/null and b/res/drawable-hdpi/com_android_calllog.png differ diff --git a/res/drawable-hdpi/com_android_camera.png b/res/drawable-hdpi/com_android_camera.png index 6e3f4af..3d4d19b 100644 Binary files a/res/drawable-hdpi/com_android_camera.png and b/res/drawable-hdpi/com_android_camera.png differ diff --git a/res/drawable-hdpi/com_android_clean.png b/res/drawable-hdpi/com_android_clean.png index 5d8431c..3cac170 100644 Binary files a/res/drawable-hdpi/com_android_clean.png and b/res/drawable-hdpi/com_android_clean.png differ diff --git a/res/drawable-hdpi/com_android_contacts.png b/res/drawable-hdpi/com_android_contacts.png index 62b572e..bc8ff0f 100644 Binary files a/res/drawable-hdpi/com_android_contacts.png and b/res/drawable-hdpi/com_android_contacts.png differ diff --git a/res/drawable-hdpi/com_android_deskclock.png b/res/drawable-hdpi/com_android_deskclock.png index e240294..6c37219 100644 Binary files a/res/drawable-hdpi/com_android_deskclock.png and b/res/drawable-hdpi/com_android_deskclock.png differ diff --git a/res/drawable-hdpi/com_android_dialer.png b/res/drawable-hdpi/com_android_dialer.png index 80a0eb9..332522e 100644 Binary files a/res/drawable-hdpi/com_android_dialer.png and b/res/drawable-hdpi/com_android_dialer.png differ diff --git a/res/drawable-hdpi/com_android_email.png b/res/drawable-hdpi/com_android_email.png index 2eb7a70..ce4a78b 100644 Binary files a/res/drawable-hdpi/com_android_email.png and b/res/drawable-hdpi/com_android_email.png differ diff --git a/res/drawable-hdpi/com_android_gallery3d_app.png b/res/drawable-hdpi/com_android_gallery3d_app.png index 938d2cd..72a6fd5 100644 Binary files a/res/drawable-hdpi/com_android_gallery3d_app.png and b/res/drawable-hdpi/com_android_gallery3d_app.png differ diff --git a/res/drawable-hdpi/com_android_mms_ui.png b/res/drawable-hdpi/com_android_mms_ui.png index 7550ec4..52cb1b5 100644 Binary files a/res/drawable-hdpi/com_android_mms_ui.png and b/res/drawable-hdpi/com_android_mms_ui.png differ diff --git a/res/drawable-hdpi/com_android_music.png b/res/drawable-hdpi/com_android_music.png index af5a0aa..c9a85d2 100644 Binary files a/res/drawable-hdpi/com_android_music.png and b/res/drawable-hdpi/com_android_music.png differ diff --git a/res/drawable-hdpi/com_android_providers_downloads_ui.png b/res/drawable-hdpi/com_android_providers_downloads_ui.png index 55cd1e9..856cb04 100644 Binary files a/res/drawable-hdpi/com_android_providers_downloads_ui.png and b/res/drawable-hdpi/com_android_providers_downloads_ui.png differ diff --git a/res/drawable-hdpi/com_android_quicksearchbox.png b/res/drawable-hdpi/com_android_quicksearchbox.png index fd8b051..13e5ead 100644 Binary files a/res/drawable-hdpi/com_android_quicksearchbox.png and b/res/drawable-hdpi/com_android_quicksearchbox.png differ diff --git a/res/drawable-hdpi/com_android_settings.png b/res/drawable-hdpi/com_android_settings.png index 1a01dc3..41c7061 100644 Binary files a/res/drawable-hdpi/com_android_settings.png and b/res/drawable-hdpi/com_android_settings.png differ diff --git a/res/drawable-hdpi/com_android_soundrecorder.png b/res/drawable-hdpi/com_android_soundrecorder.png index 6c54e53..1b9b4e7 100644 Binary files a/res/drawable-hdpi/com_android_soundrecorder.png and b/res/drawable-hdpi/com_android_soundrecorder.png differ diff --git a/res/drawable-hdpi/com_android_stk_stkmain.png b/res/drawable-hdpi/com_android_stk_stkmain.png index eb953e6..9905e7b 100644 Binary files a/res/drawable-hdpi/com_android_stk_stkmain.png and b/res/drawable-hdpi/com_android_stk_stkmain.png differ diff --git a/res/drawable-hdpi/com_android_vdieo.png b/res/drawable-hdpi/com_android_vdieo.png index 9b3b17b..cc4bd28 100644 Binary files a/res/drawable-hdpi/com_android_vdieo.png and b/res/drawable-hdpi/com_android_vdieo.png differ diff --git a/res/drawable-hdpi/com_aoleyun_info.png b/res/drawable-hdpi/com_aoleyun_info.png index 3de6524..fb5a173 100644 Binary files a/res/drawable-hdpi/com_aoleyun_info.png and b/res/drawable-hdpi/com_aoleyun_info.png differ diff --git a/res/drawable-hdpi/com_aoleyun_sn.png b/res/drawable-hdpi/com_aoleyun_sn.png index 05e32b2..86f4829 100644 Binary files a/res/drawable-hdpi/com_aoleyun_sn.png and b/res/drawable-hdpi/com_aoleyun_sn.png differ diff --git a/res/drawable-hdpi/com_aoleyun_update.png b/res/drawable-hdpi/com_aoleyun_update.png new file mode 100644 index 0000000..d0c9e8d Binary files /dev/null and b/res/drawable-hdpi/com_aoleyun_update.png differ diff --git a/res/drawable-hdpi/com_mediatek_filemanager.png b/res/drawable-hdpi/com_mediatek_filemanager.png index da3b15f..1f63805 100644 Binary files a/res/drawable-hdpi/com_mediatek_filemanager.png and b/res/drawable-hdpi/com_mediatek_filemanager.png differ diff --git a/res/drawable-hdpi/com_mediatek_fmradio.png b/res/drawable-hdpi/com_mediatek_fmradio.png index 2a2cea8..4b90244 100644 Binary files a/res/drawable-hdpi/com_mediatek_fmradio.png and b/res/drawable-hdpi/com_mediatek_fmradio.png differ diff --git a/res/drawable-hdpi/com_system_clean.png b/res/drawable-hdpi/com_system_clean.png new file mode 100644 index 0000000..f6b590a Binary files /dev/null and b/res/drawable-hdpi/com_system_clean.png differ diff --git a/res/drawable-hdpi/com_system_huyan.png b/res/drawable-hdpi/com_system_huyan.png new file mode 100644 index 0000000..938ad56 Binary files /dev/null and b/res/drawable-hdpi/com_system_huyan.png differ diff --git a/res/drawable-hdpi/icon_update.png b/res/drawable-hdpi/icon_update.png new file mode 100644 index 0000000..39baf9c Binary files /dev/null and b/res/drawable-hdpi/icon_update.png differ diff --git a/res/drawable-hdpi/mask.png b/res/drawable-hdpi/mask.png index 4de28a2..8d57254 100644 Binary files a/res/drawable-hdpi/mask.png and b/res/drawable-hdpi/mask.png differ diff --git a/res/drawable-hdpi/square.png b/res/drawable-hdpi/square.png index 5ed94a3..460152e 100644 Binary files a/res/drawable-hdpi/square.png and b/res/drawable-hdpi/square.png differ diff --git a/res/drawable-hdpi/wallpapers.png b/res/drawable-hdpi/wallpapers.png index ea4b174..aa0a964 100644 Binary files a/res/drawable-hdpi/wallpapers.png and b/res/drawable-hdpi/wallpapers.png differ diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png index 1cd4d0e..8e79650 100644 Binary files a/res/mipmap-hdpi/ic_launcher_home.png and b/res/mipmap-hdpi/ic_launcher_home.png differ diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png index 1cd4d0e..8e79650 100644 Binary files a/res/mipmap-mdpi/ic_launcher_home.png and b/res/mipmap-mdpi/ic_launcher_home.png differ diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png index 1cd4d0e..8e79650 100644 Binary files a/res/mipmap-xhdpi/ic_launcher_home.png and b/res/mipmap-xhdpi/ic_launcher_home.png differ diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png index 1cd4d0e..8e79650 100644 Binary files a/res/mipmap-xxhdpi/ic_launcher_home.png and b/res/mipmap-xxhdpi/ic_launcher_home.png differ diff --git a/src/com/aoleyun/os/icons/IconCache.java b/src/com/aoleyun/os/icons/IconCache.java index ffc3a3a..518a043 100644 --- a/src/com/aoleyun/os/icons/IconCache.java +++ b/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 appIconList = new ArrayList() {{ 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); diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java index 444812f..ee4d727 100644 --- a/src/com/aoleyun/os/model/LoaderTask.java +++ b/src/com/aoleyun/os/model/LoaderTask.java @@ -271,7 +271,7 @@ public class LoaderTask implements Runnable { public static HashSet showApp = new HashSet() {{ // 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; /*系统应用*/ diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java index e8d9bd1..2ce1246 100644 --- a/src/com/aoleyun/os/network/NetInterfaceManager.java +++ b/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() diff --git a/src/com/aoleyun/os/uiuiutils/JGYUtils.java b/src/com/aoleyun/os/uiuiutils/JGYUtils.java index e1389e0..2c17db7 100644 --- a/src/com/aoleyun/os/uiuiutils/JGYUtils.java +++ b/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); } diff --git a/src/doc/TeclastMTK12.jks b/src/doc/TeclastMTK12.jks new file mode 100644 index 0000000..669cfa9 Binary files /dev/null and b/src/doc/TeclastMTK12.jks differ