release V191

添加 锁定，解锁图标，并更新链接和断开服务器图标

diff --git a/app/release/ICL02Launcher_V188_202012311432_release.apk b/app/release/ICL02Launcher_V191_202102062356_release.apk
similarity index 53%
rename from app/release/ICL02Launcher_V188_202012311432_release.apk
rename to app/release/ICL02Launcher_V191_202102062356_release.apk
index 9d4bba2..5abda1a 100644 (file)
Binary files a/app/release/ICL02Launcher_V188_202012311432_release.apk and b/app/release/ICL02Launcher_V191_202102062356_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 5550751..3571099 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 188,
-      "versionName": "202012311432",
+      "versionCode": 191,
+      "versionName": "202102062356",
       "enabled": true,
-      "outputFile": "ICL02Launcher_V188_202012311432_release.apk"
+      "outputFile": "ICL02Launcher_V191_202102062356_release.apk"
     }
   ]
 }
\ 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 197cdf7..daab594 100644 (file)
--- 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 {
             return mH88AppList;
         } else if (SystemUtils.h88tinyMode()) {
             return mH88TinyAppList;
+        } else if (SystemUtils.isC5FZD()) {
+            return mC5AppList;
         } else if (SystemUtils.isN123()) {
             return mN123DefaultAppList;
         } else if (SystemUtils.isS123()) {
@@ -416,6 +418,50 @@ public class L02AppInfo {
                     "com.eqc.settings", "com.eqc.settings.MainActivity"));
 
 
+        }
+    };
+    private static final List<AppInfoEntity> mC5AppList = new ArrayList<AppInfoEntity>() {
+        {
+
+
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_qr_code_h88, R.string.app_h88_qrcode,
+                    "com.ic.launcher", "com.ic.launcher.QrCodeActivity"));
+
+            if (temperature_sensor_available) {
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
+                        "com.ic.temperature", "com.ic.temperature.MainActivity"));
+            }
+            //心率
+            if (ppg_ecg_sensor_available) {
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
+                        "com.ic.blood", "com.ic.blood.BloodActivity"));
+            }
+            //联系人
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_contacts_l02, R.string.app_ContactName,
+                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"));
+            //拨号
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_dialer_l02, R.string.app_dialer,
+                    "com.ic.dial", "com.ic.dial.MainActivity"));
+            //运动
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
+                    "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
+            //自由锻炼
+            if (SystemUtils.getSystemPropertiesString("persist.sys.enablePractice", "false").equals("true")) {
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.practice_logo, R.string.app_practise,
+                        "com.ic.launcher", "com.ic.launcher.PractiseActivity"));
+
+            }
+            //短信
+            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_language_h88, R.string.app_h88_language,
+                    "com.ic.languageguide", "com.ic.languageguide.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/configure/l02/L02Icon.java b/app/src/main/java/com/ic/launcher/configure/l02/L02Icon.java
index 15fe4db..a5e209f 100644 (file)
--- a/app/src/main/java/com/ic/launcher/configure/l02/L02Icon.java
+++ b/app/src/main/java/com/ic/launcher/configure/l02/L02Icon.java
@@ -26,12 +26,8 @@ public class L02Icon {
 
     //L02 信号图片
     public static int[] l02TransportResId = new int[]{
-            R.mipmap.qs_server_connected_off,
-            R.mipmap.qs_server_connected_on
-//            R.mipmap.l02_data_transport_0,
-//            R.mipmap.l02_data_transport_1,
-//            R.mipmap.l02_data_transport_2,
-//            R.mipmap.l02_data_transport_3
+            R.mipmap.disconnect,
+            R.mipmap.connection
     };
 
     //L02 信号图片
@@ -69,7 +65,10 @@ public class L02Icon {
             R.mipmap.clockl02_minutes_8,
             R.mipmap.clockl02_minutes_9
     };
-
+    public static int[] l02CutoffStatResId = new int[]{
+            R.mipmap.lock_fill,
+            R.mipmap.unlock_fill
+    };
     public static final int CLOCK_INDEX_6 = 1701;
     public static final int CLOCK_INDEX_L02 = 1702;
     public static final int CLOCK_INDEX_12 = 1703;

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 b19dc89..eed10cd 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/L02MainFragment.java
@@ -151,6 +151,11 @@ public class L02MainFragment extends BaseFragment {
             }
         });
 
+        model.getObservableCutoffStat().observe(this, resID -> {
+            if(mainBinding != null){
+                mainBinding.setCutoffstat(resID);
+            }
+        });
         model.getObservableBTStatus().observe(this,btStatus ->{
             if(mainBinding !=null){
                 mainBinding.setBtStatus(btStatus);

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 36dddd8..304c343 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/S123MainFragment.java
@@ -114,7 +114,11 @@ public class S123MainFragment extends BaseFragment {
                 mainBinding.setPhoneTransport(resID);
             }
         });
-
+        model.getObservableCutoffStat().observe(this, resID -> {
+            if(mainBinding != null){
+                mainBinding.setCutoffstat(resID);
+            }
+        });
         model.getObservablePhoneType().observe(this, resID -> {
             if (mainBinding != null) {
                 mainBinding.setPhoneNetType(resID);

diff --git a/app/src/main/java/com/ic/launcher/mode/L02MainModel.java b/app/src/main/java/com/ic/launcher/mode/L02MainModel.java
index 05a5dac..1b76efe 100644 (file)
--- a/app/src/main/java/com/ic/launcher/mode/L02MainModel.java
+++ b/app/src/main/java/com/ic/launcher/mode/L02MainModel.java
@@ -75,6 +75,13 @@ public class L02MainModel extends BaseModel {
         }
         return null;
     }
+    public LiveData<Integer> getObservableCutoffStat() {
+        PresenterCycle state = getPresenterList(PHONE_LIST_INDEX);
+        if (state != null) {
+            return ((PhoneStatePresenter) state).getCutoffStatObservable();
+        }
+        return null;
+    }
 
     public LiveData<Integer> getObservableBattery() {
         PresenterCycle state = getPresenterList(BATTERY_LIST_INDEX);

diff --git a/app/src/main/java/com/ic/launcher/presenter/PhoneStatePresenter.java b/app/src/main/java/com/ic/launcher/presenter/PhoneStatePresenter.java
index d019290..cc3d1f1 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/PhoneStatePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/PhoneStatePresenter.java
@@ -18,6 +18,7 @@ public class PhoneStatePresenter extends PresenterCycle {
     private MediatorLiveData<Integer> mObsPhoneTransportID;
     private MediatorLiveData<Integer> mObsPhoneTypeID;
     private MediatorLiveData<Integer> mObsPhoneSignalID;
+    private MediatorLiveData<Integer> mObsCutoffStatID;
     private MediatorLiveData<Boolean> mObsBTStatusID;
     private MediatorLiveData<Boolean> mObsWiFiStatusID;
     private MediatorLiveData<Boolean> mObsGpsStatusID;
@@ -62,9 +63,12 @@ public class PhoneStatePresenter extends PresenterCycle {
         mObsBTStatusID = new MediatorLiveData<>();
         mObsWiFiStatusID = new MediatorLiveData<>();
         mObsGpsStatusID = new MediatorLiveData<>();
+        mObsCutoffStatID = new MediatorLiveData<>();
         queryState = new QueryPhoneState(context, mObsPhoneTypeID,
                 mObsPhoneSignalID,
-                mObsPhoneTransportID, mObsBTStatusID,
+                mObsPhoneTransportID,
+                mObsCutoffStatID,
+                mObsBTStatusID,
                 mObsWiFiStatusID,
                 mObsGpsStatusID);
     }
@@ -81,6 +85,9 @@ public class PhoneStatePresenter extends PresenterCycle {
         return mObsPhoneTransportID;
     }
 
+    public LiveData<Integer> getCutoffStatObservable() {
+        return mObsCutoffStatID;
+    }
 
     public LiveData<Boolean> getBTStatusObservalbe() {
         return mObsBTStatusID;

diff --git a/app/src/main/java/com/ic/launcher/presenter/QueryPhoneState.java b/app/src/main/java/com/ic/launcher/presenter/QueryPhoneState.java
index fb54fa4..481395e 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/QueryPhoneState.java
+++ b/app/src/main/java/com/ic/launcher/presenter/QueryPhoneState.java
@@ -25,6 +25,7 @@ import com.ic.launcher.util.SystemUtils;
 
 import java.util.List;
 
+import static com.ic.launcher.configure.l02.L02Icon.l02CutoffStatResId;
 import static com.ic.launcher.configure.l02.L02Icon.l02PhoneTypeResId;
 import static com.ic.launcher.configure.l02.L02Icon.l02SignalResId;
 import static com.ic.launcher.configure.l02.L02Icon.l02TransportResId;
@@ -42,6 +43,7 @@ public class QueryPhoneState extends QueryThread {
     private MediatorLiveData<Integer> mObsPhoneTypeID;
     private MediatorLiveData<Integer> mObsPhoneSignalID;
     private MediatorLiveData<Integer> mObsPhoneTransportID;
+    private MediatorLiveData<Integer> mObsCutoffStatusID;
     private MediatorLiveData<Boolean> mObsBTStatusID;
     private MediatorLiveData<Boolean> mObsWiFiStatusID;
     private MediatorLiveData<Boolean> mObsGpsStatusID;
@@ -56,6 +58,7 @@ public class QueryPhoneState extends QueryThread {
                            MediatorLiveData<Integer> mObsPhoneTypeID,
                            MediatorLiveData<Integer> mObsPhoneSignalID,
                            MediatorLiveData<Integer> mObsPhoneTransportID,
+                           MediatorLiveData<Integer> mObsCutoffStatusID,
                            MediatorLiveData<Boolean> mObsBTStatusID,
                            MediatorLiveData<Boolean> mObsWiFiStatusID,
                            MediatorLiveData<Boolean> mObsGpsStatusID) {
@@ -65,6 +68,7 @@ public class QueryPhoneState extends QueryThread {
         this.locationManager = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE);
         this.mObsPhoneTypeID = mObsPhoneTypeID;
         this.mObsPhoneSignalID = mObsPhoneSignalID;
+        this.mObsCutoffStatusID=mObsCutoffStatusID;
         this.mObsPhoneTransportID = mObsPhoneTransportID;
         this.mObsBTStatusID = mObsBTStatusID;
         this.mObsWiFiStatusID = mObsWiFiStatusID;
@@ -79,6 +83,8 @@ public class QueryPhoneState extends QueryThread {
         mObsWiFiStatusID = null;
         mObsBTStatusID = null;
         mObsGpsStatusID = null;
+        mObsCutoffStatusID = null;
+
     }
 
     @Override
@@ -101,6 +107,22 @@ public class QueryPhoneState extends QueryThread {
         }else{
             mObsPhoneTransportID.postValue(l02TransportResId[0]);
         }
+        String prop_lock=SystemUtils.getSystemPropertiesString("persist.sys.show_lock_propname","");
+        IcLog.i(TAG, "prop_lock:" + prop_lock);
+        if (!prop_lock.isEmpty())
+        {
+            //"persist.sys.ic_antioff",persist.sys.ic_cutoff"
+            Boolean cutoff=SystemUtils.getSystemPropertiesBoolean(prop_lock,false);
+            IcLog.i(TAG, "getprop " + prop_lock+" "+cutoff);
+            if(cutoff) {
+                mObsCutoffStatusID.postValue(l02CutoffStatResId[1]);
+            }else{
+                mObsCutoffStatusID.postValue(l02CutoffStatResId[0]);
+            }
+        }else{
+            mObsCutoffStatusID.postValue(-1);
+        }
+
 //
 //        long rw = TrafficStats.getMobileRxPackets();
 //        long sw = TrafficStats.getMobileTxPackets();

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 bd6794d..a05b42d 100644 (file)
--- a/app/src/main/java/com/ic/launcher/util/SystemUtils.java
+++ b/app/src/main/java/com/ic/launcher/util/SystemUtils.java
@@ -56,7 +56,13 @@ public class SystemUtils {
         }
         return false;
     }
-
+    public static boolean isC5FZD(){
+        String launcher=getLauncherName();
+        if (launcher.equals("c5fzd")){
+            return true;
+        }
+        return false;
+    }
     public static boolean h88tinyMode(){
         String launcher=getLauncherName();
         if (launcher.equals("h88tiny")){

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 509e927..ae82cd6 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
@@ -22,6 +22,7 @@ public class WidgetPhoneStateView extends LinearLayout {
     private ImageView BTIV;
     private ImageView WiFiIv;
     private ImageView GPSIv;
+    private ImageView lockstatIv;
     public WidgetPhoneStateView(Context context) {
         this(context, null);
     }
@@ -43,6 +44,7 @@ public class WidgetPhoneStateView extends LinearLayout {
         BTIV = view.findViewById(R.id.status_bt);
         WiFiIv = view.findViewById(R.id.status_wifi);
         GPSIv = view.findViewById(R.id.status_gps);
+        lockstatIv = view.findViewById(R.id.lock_status_iv);
     }
 
     public void updateSinalDrawable(int signal) {
@@ -86,6 +88,15 @@ public class WidgetPhoneStateView extends LinearLayout {
         }
 
     }
+
+    public void updateCustoffStat(int resid){
+        if(resid<0){
+            lockstatIv.setVisibility(GONE);
+        }else {
+            lockstatIv.setVisibility(VISIBLE);
+            lockstatIv.setImageResource(resid);
+        }
+    }
     public void updateGpsDrawable(boolean visable){
         GPSIv.setImageResource(R.mipmap.qs_locate_type_gps);
         if(visable)
@@ -93,8 +104,8 @@ public class WidgetPhoneStateView extends LinearLayout {
         else
             GPSIv.setVisibility(GONE);
     }
-    @BindingAdapter(value = {"signalDrawable", "netTypeDrawable", "transportDrawable", "phoneShow","btenabled","wifienabled","gpsenabled"}, requireAll = false)
-    public static void updatePhoneState(WidgetPhoneStateView view, int signal, int netType, int transport,boolean isShow,boolean btenabled,boolean wifienabled,boolean gpsenabled) {
+    @BindingAdapter(value = {"signalDrawable", "netTypeDrawable", "transportDrawable","lockstatDrawable", "phoneShow","btenabled","wifienabled","gpsenabled"}, requireAll = false)
+    public static void updatePhoneState(WidgetPhoneStateView view, int signal, int netType, int transport,int cutoffstat,boolean isShow,boolean btenabled,boolean wifienabled,boolean gpsenabled) {
         if (view != null) {
             view.updateSinalDrawable(signal);
             view.updateNetTypeDrawable(netType);
@@ -104,6 +115,7 @@ public class WidgetPhoneStateView extends LinearLayout {
             view.updateBTDrawable(btenabled);
             view.updateWiFiDrawable(wifienabled);
             view.updateGpsDrawable(gpsenabled);
+            view.updateCustoffStat(cutoffstat);
         }
     }
 }

diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml
index 3040ad0..03f8525 100644 (file)
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -20,7 +20,9 @@
         <variable
             name="phoneTransport"
             type="int" />
-
+        <variable
+            name="cutoffstat"
+            type="int" />
         <variable
             name="batteryDrawable"
             type="int" />
@@ -118,6 +120,7 @@
                 app:netTypeDrawable="@{phoneNetType}"
                 app:phoneShow="@{phoneShow}"
                 app:signalDrawable="@{phoneSignal}"
+                app:lockstatDrawable="@{cutoffstat}"
                 app:transportDrawable="@{phoneTransport}"
                 app:wifienabled="@{wifiStatus}" />
 

diff --git a/app/src/main/res/layout/fragment_s123_main.xml b/app/src/main/res/layout/fragment_s123_main.xml
index 16580ab..cc772e9 100644 (file)
--- a/app/src/main/res/layout/fragment_s123_main.xml
+++ b/app/src/main/res/layout/fragment_s123_main.xml
@@ -22,7 +22,9 @@
         <variable
             name="phoneTransport"
             type="int" />
-
+        <variable
+            name="cutoffstat"
+            type="int" />
         <variable
             name="batteryDrawable"
             type="int" />
@@ -133,6 +135,7 @@
                 app:netTypeDrawable="@{phoneNetType}"
                 app:phoneShow="@{phoneShow}"
                 app:signalDrawable="@{phoneSignal}"
+                app:lockstatDrawable="@{cutoffstat}"
                 app:transportDrawable="@{phoneTransport}"
                 app:wifienabled="@{wifiStatus}" />
 

diff --git a/app/src/main/res/layout/widget_phone_state_layout.xml b/app/src/main/res/layout/widget_phone_state_layout.xml
index 937fdda..e0675ff 100644 (file)
--- a/app/src/main/res/layout/widget_phone_state_layout.xml
+++ b/app/src/main/res/layout/widget_phone_state_layout.xml
@@ -24,6 +24,11 @@
         android:layout_height="30dp"
 
        />
+    <ImageView
+        android:id="@+id/lock_status_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        />
     <ImageView
         android:id="@+id/status_wifi"
         android:layout_width="30dp"

diff --git a/app/src/main/res/mipmap-mdpi/connection.png b/app/src/main/res/mipmap-mdpi/connection.png
new file mode 100644 (file)
index 0000000..e0fff0e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/connection.png differ

diff --git a/app/src/main/res/mipmap-mdpi/disconnect.png b/app/src/main/res/mipmap-mdpi/disconnect.png
new file mode 100644 (file)
index 0000000..b0485b4
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/disconnect.png differ

diff --git a/app/src/main/res/mipmap-mdpi/lock_fill.png b/app/src/main/res/mipmap-mdpi/lock_fill.png
new file mode 100644 (file)
index 0000000..aa66242
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/lock_fill.png differ

diff --git a/app/src/main/res/mipmap-mdpi/unlock_fill.png b/app/src/main/res/mipmap-mdpi/unlock_fill.png
new file mode 100644 (file)
index 0000000..fcbf7e5
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/unlock_fill.png differ

diff --git a/app/version_code.properties b/app/version_code.properties
index 41f5346..32865cd 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Dec 31 14:32:35 CST 2020
-VERSION_CODE=188
+#Sat Feb 06 23:56:36 CST 2021
+VERSION_CODE=191