From: snickersun <scy@incartech.cn>
Date: Sat, 14 Nov 2020 09:20:42 +0000 (+0800)
Subject: release V179
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=5d97c5e7cad2e05f5818f28a69eec891347d9061;p=launcher4.git

release V179
添加 disableOutTemp变量控制室外温度是否显示（for S123）
---

diff --git a/app/release/ICL02Launcher_V179_202011141710_release.apk b/app/release/ICL02Launcher_V179_202011141710_release.apk
new file mode 100644
index 0000000..321ba17
Binary files /dev/null and b/app/release/ICL02Launcher_V179_202011141710_release.apk differ
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 61c93ff..dd58ebe 100644
--- a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
@@ -75,15 +75,23 @@ public class L02MainFragment extends BaseFragment {
             mainBinding.setShowStep(View.GONE);
             mainBinding.setShowTemp(View.VISIBLE);
             mainBinding.setShowHR(View.VISIBLE);
+            if (SystemUtils.showOutTemp()){
+                Log.i(TAG,"show out temp");
+                mainBinding.setShowOutTemp(View.VISIBLE);
+            }else{
+                Log.i(TAG,"donot show out temp");
+                mainBinding.setShowOutTemp(View.GONE);
+            }
         }else if(SystemUtils.h88tinyMode()) {
             Log.i(TAG,"h88tiny");
             mainBinding.setShowTemp(View.GONE);
             mainBinding.setShowStep(View.GONE);
             mainBinding.setShowHR(View.GONE);
-
+            mainBinding.setShowOutTemp(View.GONE);
         }else{
             Log.i(TAG,"not S123");
             mainBinding.setShowTemp(View.GONE);
+            mainBinding.setShowOutTemp(View.GONE);
             mainBinding.setShowStep(View.VISIBLE);
             mainBinding.setShowHR(View.VISIBLE);
         }
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 3140a3f..d149e4d 100644
--- a/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
@@ -69,12 +69,18 @@ public class S123MainFragment extends BaseFragment {
             Log.i(TAG,"isS123");
             mainBinding.setShowStep(View.GONE);
             mainBinding.setShowTemp(View.VISIBLE);
+            if (SystemUtils.showOutTemp()){
+                Log.i(TAG,"show out temp");
+                mainBinding.setShowOutTemp(View.VISIBLE);
+            }else{
+                Log.i(TAG,"donot show out temp");
+                mainBinding.setShowOutTemp(View.GONE);
+            }
         }else{
             Log.i(TAG,"not S123");
             mainBinding.setShowTemp(View.GONE);
+            mainBinding.setShowOutTemp(View.GONE);
             mainBinding.setShowStep(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 cf98658..31135f7 100644
--- a/app/src/main/java/com/ic/launcher/util/SystemUtils.java
+++ b/app/src/main/java/com/ic/launcher/util/SystemUtils.java
@@ -35,6 +35,11 @@ public class SystemUtils {
         return cid;
     }
 
+    public static boolean showOutTemp(){
+        boolean show=true;
+        show=!getSystemPropertiesBoolean("persyst.sys.disableTempOut",false);
+        return show;
+    }
     public static boolean isL02()
     {
         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 42b662b..3040ad0 100644
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -71,7 +71,9 @@
         <variable
             name="gpsStatus"
             type="boolean" />
-
+        <variable
+            name="showOutTemp"
+            type="int" />
         <variable
             name="showTemp"
             type="int" />
@@ -194,14 +196,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:visibility="@{showTemp}"
+                android:visibility="@{showOutTemp}"
                 android:gravity="center">
 
                 <ImageView
                     android:id="@+id/l02_temp_out"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:visibility="@{showTemp}"
+                    android:visibility="@{showOutTemp}"
                     android:layout_alignLeft="@+id/l02_temp_out_value"
                     android:layout_alignRight="@+id/l02_temp_out_value"
                     android:src="@mipmap/outtemp" />
@@ -213,7 +215,7 @@
                     android:layout_below="@+id/l02_temp_out"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:visibility="@{showTemp}"
+                    android:visibility="@{showOutTemp}"
                     android:text="@{outTempValue}"
                     android:textAlignment="center" />
 
diff --git a/app/src/main/res/layout/fragment_s123_main.xml b/app/src/main/res/layout/fragment_s123_main.xml
index a9b9a5c..dd7f35a 100644
--- a/app/src/main/res/layout/fragment_s123_main.xml
+++ b/app/src/main/res/layout/fragment_s123_main.xml
@@ -76,6 +76,10 @@
             name="gpsStatus"
             type="boolean" />
 
+        <variable
+            name="showOutTemp"
+            type="int" />
+
         <variable
             name="showTemp"
             type="int" />
@@ -204,12 +208,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:visibility="@{showOutTemp}"
                     android:gravity="center">
 
                     <ImageView
                         android:id="@+id/l02_temp_out"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
+                        android:visibility="@{showOutTemp}"
                         android:layout_alignLeft="@+id/l02_temp_out_value"
                         android:layout_alignRight="@+id/l02_temp_out_value"
                         android:src="@mipmap/outtemp" />
@@ -221,6 +227,7 @@
                         android:layout_below="@+id/l02_temp_out"
                         android:layout_weight="1"
                         android:gravity="center"
+                        android:visibility="@{showOutTemp}"
                         android:text="@{outTempValue}"
                         android:textAlignment="center" />
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 4dd2d10..785bdf2 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 10 18:53:54 CST 2020
-VERSION_CODE=178
+#Sat Nov 14 17:10:22 CST 2020
+VERSION_CODE=179