1.修复拔掉SIM卡后，4g和流量的图标还现实的问题。

2.加入混淆 androidx

Signed-off-by: kfl_614 <kfl_614@163.com>

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a86af50..3067675 100644 (file)
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -120,4 +120,13 @@
 
 -keep public class com.android.support.a
 -keep public class com.android.support.b
--keep public class rx.internal.util
\ No newline at end of file
+-keep public class rx.internal.util
+
+#androidx 混淆
+-keep class com.google.android.material.** {*;}
+-keep class androidx.** {*;}
+-keep public class * extends androidx.**
+-keep interface androidx.** {*;}
+-dontwarn com.google.android.material.**
+-dontnote com.google.android.material.**
+-dontwarn androidx.**
\ No newline at end of file

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 217e3e7..38dd4a6 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
@@ -12,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.ic.launcher.configure.l02.L02Icon;
 import com.ic.launcher.databinding.FragmentL02MainBinding;
 import com.ic.launcher.listener.ILowPowerStateListener;
 import com.ic.launcher.mode.BaseModel;
@@ -80,11 +81,16 @@ public class L02MainFragment extends BaseFragment {
             if(mainBinding != null){
                 mainBinding.setPhoneNetType(resID);
             }
-
         });
 
         model.getObservableSignal().observe(this, resID ->{
             if(mainBinding != null){
+                if(resID == L02Icon.l02SignalResId[0]
+                || resID == L02Icon.l02SignalResId[1]){
+                    mainBinding.setPhoneShow(false);
+                }else{
+                    mainBinding.setPhoneShow(true);
+                }
                 mainBinding.setPhoneSignal(resID);
             }
         });
@@ -101,7 +107,6 @@ public class L02MainFragment extends BaseFragment {
             if(mainBinding != null){
                 mainBinding.setBatteryValue(value);
             }
-
         });
 
         model.getObservableBattery().observe(this, resID ->{

diff --git a/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java b/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
index 11a8a3a..92013d4 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
@@ -213,7 +213,7 @@ public class TimeDatePresenter extends PresenterCycle {
         @Override
         void onThreadExecute() {
             if (secondMessage != null) {
-                IcLog.i(TAG, "LoopSecondThread....................");
+                //IcLog.i(TAG, "LoopSecondThread....................");
                 secondMessage.sendEmptyMessage(1);
             }
         }

diff --git a/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java b/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
index f4f5fb6..e037107 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
@@ -50,13 +50,24 @@ public class WidgetPhoneStateView extends LinearLayout {
         transportIv.setImageResource(transport);
     }
 
+    public void updatePhoneVisibility (boolean state){
+        if(state){
+            netTypeIv.setVisibility(VISIBLE);
+            transportIv.setVisibility(VISIBLE);
+        }else{
+            netTypeIv.setVisibility(GONE);
+            transportIv.setVisibility(GONE);
+        }
+
+    }
 
-    @BindingAdapter(value = {"app:signalDrawable", "app:netTypeDrawable", "app:transportDrawable"}, requireAll = false)
-    public static void updatePhoneState(WidgetPhoneStateView view, int signal, int netType, int transport) {
+    @BindingAdapter(value = {"app:signalDrawable", "app:netTypeDrawable", "app:transportDrawable", "app:phoneShow"}, requireAll = false)
+    public static void updatePhoneState(WidgetPhoneStateView view, int signal, int netType, int transport,boolean isShow) {
         if (view != null) {
             view.updateSinalDrawable(signal);
             view.updateNetTypeDrawable(netType);
             view.updateTransportDrawable(transport);
+            view.updatePhoneVisibility(isShow);
         }
     }
 }

diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml
index ba6d674..347eacb 100644 (file)
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -6,7 +6,9 @@
     tools:context=".fragment.l02.L02StatusBarFragment">
 
     <data>
-
+        <variable
+            name="phoneShow"
+            type="boolean" />
         <variable
             name="phoneSignal"
             type="int" />
@@ -80,7 +82,8 @@
                 android:layout_marginStart="10dp"
                 app:netTypeDrawable="@{phoneNetType}"
                 app:signalDrawable="@{phoneSignal}"
-                app:transportDrawable="@{phoneTransport}" />
+                app:transportDrawable="@{phoneTransport}"
+                app:phoneShow="@{phoneShow}"/>
 
             <com.ic.launcher.widget.WidgetBatteryStateView
                 android:layout_width="wrap_content"