From: snickersun <scy@incartech.cn>
Date: Fri, 22 Jan 2021 06:36:04 +0000 (+0800)
Subject: release V188
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=a5d32707cd48bb742376b283275139a467bc25d7;p=launcher4.git

release V188
N123与S123 显示同样的 主页面
---

diff --git a/app/release/ICL02Launcher_V187_202012311422_release.apk b/app/release/ICL02Launcher_V188_202012311432_release.apk
similarity index 57%
rename from app/release/ICL02Launcher_V187_202012311422_release.apk
rename to app/release/ICL02Launcher_V188_202012311432_release.apk
index b8d2613..9d4bba2 100644
Binary files a/app/release/ICL02Launcher_V187_202012311422_release.apk and b/app/release/ICL02Launcher_V188_202012311432_release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 8335542..5550751 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 187,
-      "versionName": "202012311422",
+      "versionCode": 188,
+      "versionName": "202012311432",
       "enabled": true,
-      "outputFile": "ICL02Launcher_V187_202012311422_release.apk"
+      "outputFile": "ICL02Launcher_V188_202012311432_release.apk"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/launcher/FragmentManage.java b/app/src/main/java/com/ic/launcher/FragmentManage.java
index 766dabe..187144d 100644
--- a/app/src/main/java/com/ic/launcher/FragmentManage.java
+++ b/app/src/main/java/com/ic/launcher/FragmentManage.java
@@ -147,7 +147,7 @@ public class FragmentManage {
             case CLOCK_INDEX_12:
                 return Clock12DialFragment.newInstance();
             default:
-                if(SystemUtils.isS123()){
+                if(SystemUtils.isS123()||SystemUtils.isN123()) {
                     return S123MainFragment.newInstance();
                 }else {
                     return L02MainFragment.newInstance();
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 df9059d..b19dc89 100644
--- a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
@@ -69,7 +69,7 @@ public class L02MainFragment extends BaseFragment {
         mainBinding.setOutTempValue(String.format("%.1f",SPUtils.getTempOutSP(mContext)));
         chargingState=false;
         mainBinding.setStepValue("0");
-        if(SystemUtils.isS123())
+        if(SystemUtils.isS123()||SystemUtils.isN123())
         {
             Log.i(TAG,"isS123");
             mainBinding.setShowStep(View.GONE);
diff --git a/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java b/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
index 36eb4f5..36dddd8 100644
--- a/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
@@ -65,7 +65,7 @@ public class S123MainFragment extends BaseFragment {
         mainBinding.setBatteryFull(false);
         chargingState = false;
         mainBinding.setStepValue("0");
-        if (SystemUtils.isS123()) {
+        if (SystemUtils.isS123()||SystemUtils.isN123()) {
             Log.i(TAG, "isS123");
             mainBinding.setShowStep(View.GONE);
             mainBinding.setShowTemp(View.VISIBLE);
diff --git a/app/version_code.properties b/app/version_code.properties
index cf32a9f..41f5346 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Dec 31 14:22:02 CST 2020
-VERSION_CODE=187
+#Thu Dec 31 14:32:35 CST 2020
+VERSION_CODE=188