From: snickersun Date: Thu, 5 Nov 2020 03:10:33 +0000 (+0800) Subject: release V171 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=48657414b911033a27c5938461f3aff3c8c51db5;p=launcher4.git release V171 添加 H88Tiny mode，给C5项目准备，只有短信和设置。 --- diff --git a/app/release/ICL02Launcher_V169_202011022110_release.apk b/app/release/ICL02Launcher_V171_202011051108_release.apk similarity index 56% rename from app/release/ICL02Launcher_V169_202011022110_release.apk rename to app/release/ICL02Launcher_V171_202011051108_release.apk index def5133..c76c2b8 100644 Binary files a/app/release/ICL02Launcher_V169_202011022110_release.apk and b/app/release/ICL02Launcher_V171_202011051108_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 34bad8a..fc303ab 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":169,"versionName":"202011022110","enabled":true,"outputFile":"ICL02Launcher_V169_202011022110_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V169_202011022110_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":171,"versionName":"202011051108","enabled":true,"outputFile":"ICL02Launcher_V171_202011051108_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V171_202011051108_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java index 41d4233..7158cdb 100644 --- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java +++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java @@ -33,6 +33,8 @@ public class L02AppInfo { String language = locale.getLanguage(); if (SystemUtils.isH88()) { return mH88AppList; + }else if (SystemUtils.h88tinyMode()) { + return mH88TinyAppList; }else if (SystemUtils.isS123()) { return mS123DefaultAppList; }else if (SystemUtils.isYT()){ @@ -281,6 +283,7 @@ public class L02AppInfo { private static final List mH88AppList = new ArrayList() { { + add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_qr_code_h88, R.string.app_h88_qrcode, "com.ic.launcher", "com.ic.launcher.QrCodeActivity")); @@ -327,4 +330,17 @@ public class L02AppInfo { } }; + + private static final List mH88TinyAppList = new ArrayList() { + { + + //短信 + add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_sms_l02, R.string.app_Sms, + "com.zmapp.sms", "com.zmapp.sms.MainActivity")); + //设置 + add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_settings_l02, R.string.main_manu_settings, + "com.eqc.settings", "com.eqc.settings.MainActivity")); + + } + }; } diff --git a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java index c24cd9e..61c93ff 100644 --- a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java +++ b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java @@ -74,12 +74,18 @@ public class L02MainFragment extends BaseFragment { Log.i(TAG,"isS123"); mainBinding.setShowStep(View.GONE); mainBinding.setShowTemp(View.VISIBLE); + mainBinding.setShowHR(View.VISIBLE); + }else if(SystemUtils.h88tinyMode()) { + Log.i(TAG,"h88tiny"); + mainBinding.setShowTemp(View.GONE); + mainBinding.setShowStep(View.GONE); + mainBinding.setShowHR(View.GONE); + }else{ Log.i(TAG,"not S123"); mainBinding.setShowTemp(View.GONE); mainBinding.setShowStep(View.VISIBLE); - - + mainBinding.setShowHR(View.VISIBLE); } //监听事件 initOnTouchListener(mainBinding.getRoot()); diff --git a/app/src/main/java/com/ic/launcher/util/SystemUtils.java b/app/src/main/java/com/ic/launcher/util/SystemUtils.java index 29ccecd..cf98658 100644 --- a/app/src/main/java/com/ic/launcher/util/SystemUtils.java +++ b/app/src/main/java/com/ic/launcher/util/SystemUtils.java @@ -43,6 +43,14 @@ public class SystemUtils { } return false; } + + public static boolean h88tinyMode(){ + String launcher=getLauncherName(); + if (launcher.equals("h88tiny")){ + return true; + } + return false; + } public static boolean isH88() { String launcher=getLauncherName(); diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml index c00a17c..49c011d 100644 --- a/app/src/main/res/layout/fragment_l02_main.xml +++ b/app/src/main/res/layout/fragment_l02_main.xml @@ -71,6 +71,10 @@ + + @@ -164,12 +168,14 @@ style="@style/watchDateIconStyle" android:layout_alignParentStart="true" android:layout_marginStart="10dp" + android:visibility="@{showHR}" android:src="@mipmap/clockl02_heartrate_icon" /> @@ -184,18 +191,21 @@ android:id="@+id/l02_spo2_value" style="@style/watchDateIconTextStyle" android:layout_marginStart="2dp" + android:visibility="@{showHR}" android:layout_toEndOf="@id/s123_spo2_img" android:text="@{spo2value}" /> diff --git a/app/src/main/res/layout/fragment_s123_main.xml b/app/src/main/res/layout/fragment_s123_main.xml index 2bed594..cedbc51 100644 --- a/app/src/main/res/layout/fragment_s123_main.xml +++ b/app/src/main/res/layout/fragment_s123_main.xml @@ -77,7 +77,9 @@ - + diff --git a/app/version_code.properties b/app/version_code.properties index 191b12e..5a8f32e 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Mon Nov 02 21:10:10 CST 2020 -VERSION_CODE=169 +#Thu Nov 05 11:08:58 CST 2020 +VERSION_CODE=171