update status bar.

diff --git a/app/release/ICLoopPageLauncher_V13_202106231708_release.apk b/app/release/ICLoopPageLauncher_V13_202106231708_release.apk
deleted file mode 100644 (file)
index 123a63b..0000000
Binary files a/app/release/ICLoopPageLauncher_V13_202106231708_release.apk and /dev/null differ

diff --git a/app/release/ICLoopPageLauncher_V14_202106232048_release.apk b/app/release/ICLoopPageLauncher_V14_202106232048_release.apk
new file mode 100644 (file)
index 0000000..cc1a041
Binary files /dev/null and b/app/release/ICLoopPageLauncher_V14_202106232048_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a69e194..7ec5ca2 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 1,
       "versionName": "1.0",
-      "outputFile": "ICLoopPageLauncher_V13_202106231708_release.apk"
+      "outputFile": "ICLoopPageLauncher_V14_202106232048_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/launcher/MainActivity.java b/app/src/main/java/com/ic/launcher/MainActivity.java
index b280afb..253ce4d 100644 (file)
--- a/app/src/main/java/com/ic/launcher/MainActivity.java
+++ b/app/src/main/java/com/ic/launcher/MainActivity.java
@@ -33,7 +33,7 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        looperPage.setCurrentItem(mainPageAdapter.getItemCount() / 2, false);
+        looperPage.setCurrentItem(mainPageAdapter.getItemCount() / 2, true);
     }
 
     private void initPresenter() {

diff --git a/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java b/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java
index 1174bcd..1af964d 100644 (file)
--- a/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java
+++ b/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java
@@ -29,7 +29,7 @@ public class MainPageAdapter extends RecyclerView.Adapter<MainPageAdapter.InnerH
 
     private OnItemClickListener mItemClickListener = null;
 
-    private List<AppItem> appItemList = new ArrayList<>();
+    private final List<AppItem> appItemList = new ArrayList<>();
 
     public static int TYPE_MAIN = 0x1;
     public static int TYPE_APP_ITEM = 0x2;
@@ -82,7 +82,7 @@ public class MainPageAdapter extends RecyclerView.Adapter<MainPageAdapter.InnerH
             itemTitle.setText(appItem.getTitleResId());
             ImageView iconView = itemView.findViewById(R.id.app_icon_iv);
             iconView.setImageResource(appItem.getIconResId());
-            itemView.setOnClickListener(v -> {
+            iconView.setOnClickListener(v -> {
                 if (mItemClickListener != null) {
                     mItemClickListener.onItemClick(appItem);
                 }

diff --git a/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java b/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
index 3b050a4..e66e081 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
@@ -52,7 +52,6 @@ public class StatusBarBasePresenter extends BasePresenter {
         mContext.registerReceiver(batteryLevReceiver, batteryFilter);
     }
 
-
     private final BroadcastReceiver batteryLevReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent batteryStatus) {
@@ -123,10 +122,8 @@ public class StatusBarBasePresenter extends BasePresenter {
         });
     }
 
-
     private int mOldSimCardState = -1;
 
-
     private boolean querySimCardState() {
 
         if (mTelephony == null) {

diff --git a/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java b/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java
index 98309c8..439af37 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java
@@ -67,31 +67,31 @@ public class StatusBarPresenter extends StatusBarBasePresenter {
     }
 
     private void checkHasMissCall() {
-       // missCallState.postValue(true);
+        // missCallState.postValue(true);
     }
 
     private void getSilentState() {
-       // silentState.postValue(true);
+        // silentState.postValue(true);
     }
 
     private void checkIcTalkMsg() {
-      //  icTalkMsgState.postValue(true);
+        //  icTalkMsgState.postValue(true);
     }
 
     private void getWarningMsgReadState() {
-       // warningReadState.postValue(true);
+        // warningReadState.postValue(true);
     }
 
     private void getAlarmState() {
-       // alarmState.postValue(true);
+        // alarmState.postValue(true);
     }
 
     private void getUnReadMsgState() {
-      //  msgUnReadState.postValue(true);
+        //  msgUnReadState.postValue(true);
     }
 
     private void getWearState() {
-       // wearState.postValue(true);
+        // wearState.postValue(true);
     }
 
     private void getBtState() {
@@ -99,6 +99,11 @@ public class StatusBarPresenter extends StatusBarBasePresenter {
         IntentFilter btFilter = new IntentFilter();
         btFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         mContext.registerReceiver(mBtReceiver, btFilter);
+        //先获取当前的状态
+        BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (defaultAdapter != null) {
+            btState.postValue(defaultAdapter.isEnabled());
+        }
     }
 
 

diff --git a/app/src/main/java/com/ic/launcher/view/SignalView.java b/app/src/main/java/com/ic/launcher/view/SignalView.java
index 7d9dbd6..45f2d24 100644 (file)
--- a/app/src/main/java/com/ic/launcher/view/SignalView.java
+++ b/app/src/main/java/com/ic/launcher/view/SignalView.java
@@ -64,14 +64,14 @@ public class SignalView extends View {
     private void retestSize() {
         ICLogger.d("showText ==>  " + showText);
         //不同size
-        if (isNoNetwork || showText.equals(getContext().getString(R.string.no_sim_service))) {
+        if (noSimCard || showText.equals(getContext().getString(R.string.no_sim_service))) {
             textPaint.setTextSize(no_sim_card_size);
         } else {
             textPaint.setTextSize(type_size);
         }
         textWidth = textPaint.measureText(showText);
         //如果没有信号的时候，宽度则为文字的宽度
-        if (isNoNetwork) {
+        if (noSimCard) {
             totalWidth = (int) textWidth;
         } else {
             totalWidth = width;
@@ -92,7 +92,7 @@ public class SignalView extends View {
 
     private int currentPic = R.mipmap.top_no_sim_card;
 
-    private boolean isNoNetwork = false;
+    private boolean noSimCard = false;
 
 
     private void updateBitMap() {
@@ -100,15 +100,13 @@ public class SignalView extends View {
     }
 
     public void updateNetworkType(String text) {
-        if (!TextUtils.isEmpty(text) && currentPic == R.mipmap.top_no_sim_card) {
-            currentPic = R.mipmap.top_signal_0;
+        //得有sim卡才显示
+        if (this.noSimCard) {
+            return;
         }
-
         if (TextUtils.isEmpty(text)) {
             text = getContext().getString(R.string.no_sim_service);
         }
-
-        this.isNoNetwork = false;
         if (!showText.equals(text)) {
             showText = text;
             retestSize();
@@ -117,9 +115,13 @@ public class SignalView extends View {
     }
 
     public void updateLev(int lev) {
+        //如果没有sim卡返回
+        if (this.noSimCard) {
+            return;
+        }
         this.lastLev = lev;
         ICLogger.d("update level..." + lev);
-        if (lev < 0 || lev > 5 || isNoNetwork) {
+        if (lev < 0 || lev > 5 || noSimCard) {
             return;
         }
         //根据信号去显示对应的图标
@@ -133,7 +135,7 @@ public class SignalView extends View {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         ICLogger.d("onMeasure...");
         int size = MeasureSpec.getSize(heightMeasureSpec);
-        setMeasuredDimension(totalWidth, isNoNetwork ? size : targetHeight);
+        setMeasuredDimension(totalWidth, noSimCard ? size : targetHeight);
     }
 
     private PaintFlagsDrawFilter mPaintFlagsFilter = new PaintFlagsDrawFilter(0,
@@ -168,7 +170,6 @@ public class SignalView extends View {
         }
     }
 
-    private boolean hasSimCard = false;
 
     /**
      * 更新是否有sim卡
@@ -178,7 +179,7 @@ public class SignalView extends View {
     public void updateSimCardState(Boolean hasSimCard) {
         if (hasSimCard == null || !hasSimCard) {
             //没有sim card
-            this.hasSimCard = false;
+            this.noSimCard = true;
             //如果没有sim卡,显示没有sim卡的图标
             //显示图片图标
             this.currentPic = R.mipmap.top_no_sim_card;
@@ -188,7 +189,7 @@ public class SignalView extends View {
             updateBitMap();
             invalidate();
         } else {
-            this.hasSimCard = true;
+            this.noSimCard = false;
         }
     }
 }

diff --git a/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java b/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java
index 9adefa8..e94deda 100644 (file)
--- a/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java
+++ b/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java
@@ -1,7 +1,6 @@
 package com.ic.launcher.view;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
@@ -11,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 
+import com.ic.iclooger.ICLogger;
 import com.ic.launcher.R;
 import com.ic.launcher.presenter.MainPagePresenter;
 import com.ic.launcher.presenter.StatusBarPresenter;
@@ -35,9 +35,7 @@ public class SimpleStatusBarView extends FrameLayout {
                 R.layout.item_simple_status_bar, this
         );
         signalView = findViewById(R.id.signal_view);
-        signalView.noNetwork();
         timeText = findViewById(R.id.simple_status_bar_time_tv);
-
     }
 
     public void initViewModel(LifecycleOwner lifecycleOwner) {
@@ -47,13 +45,21 @@ public class SimpleStatusBarView extends FrameLayout {
             timeText.setText(timeValue);
         });
         statusBarPresenter.networkTypeValue.observe(lifecycleOwner, type -> {
-            //ICLogger.d("type == > " + type);
-            if (TextUtils.isEmpty(type)) {
-                signalView.noNetwork();
+            signalView.updateNetworkType(type);
+        });
+        statusBarPresenter.signalLev.observe(lifecycleOwner, lev -> {
+            ICLogger.d("lev == > " + lev);
+            //信号强度
+            if (lev == null) {
+                signalView.updateLev(0);
             } else {
-                signalView.updateNetworkType(type);
+                signalView.updateLev(lev);
             }
         });
+        statusBarPresenter.hasSimCardValue.observe(lifecycleOwner, hasSimCard -> {
+            ICLogger.d("hasSimCard == > " + hasSimCard);
+            signalView.updateSimCardState(hasSimCard);
+        });
         statusBarPresenter.signalLev.observe(lifecycleOwner, lev -> {
             //ICLogger.d("lev == > " + lev);
             //信号强度
@@ -64,6 +70,4 @@ public class SimpleStatusBarView extends FrameLayout {
             }
         });
     }
-
-
 }

diff --git a/app/src/main/java/com/ic/launcher/view/StatusBarView.java b/app/src/main/java/com/ic/launcher/view/StatusBarView.java
index 81e5192..6fbe1cf 100644 (file)
--- a/app/src/main/java/com/ic/launcher/view/StatusBarView.java
+++ b/app/src/main/java/com/ic/launcher/view/StatusBarView.java
@@ -1,7 +1,6 @@
 package com.ic.launcher.view;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -52,7 +51,6 @@ public class StatusBarView extends FrameLayout {
 
     private void initView() {
         signalView = findViewById(R.id.signal_view);
-        signalView.noNetwork();
         batteryView = findViewById(R.id.right_battery_view);
         batteryValueTv = findViewById(R.id.battery_value);
         wifiView = findViewById(R.id.top_icon_wifi);
@@ -72,43 +70,43 @@ public class StatusBarView extends FrameLayout {
         statusBarPresenter = StatusBarPresenter.getInstance(getContext());
         statusBarPresenter.alarmState.observe(lifecycleOwner, isAlarmOpen -> {
             //设置闹钟图标显示还是隐藏
-            alarmView.setVisibility(isAlarmOpen ? VISIBLE : GONE);
+            alarmView.setVisibility(isAlarmOpen == Boolean.TRUE ? VISIBLE : GONE);
         });
         statusBarPresenter.btState.observe(lifecycleOwner, isOpen -> {
             //蓝牙是否显示
-            btView.setVisibility(isOpen ? VISIBLE : GONE);
+            btView.setVisibility(isOpen == Boolean.TRUE ? VISIBLE : GONE);
         });
         statusBarPresenter.gpsState.observe(lifecycleOwner, isOpen -> {
             //GPS定位是否打开
-            locationView.setVisibility(isOpen ? VISIBLE : GONE);
+            locationView.setVisibility(isOpen == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.icTalkMsgState.observe(lifecycleOwner, hasIcTalkMsg -> {
             //是否有微聊消息
-            icTalkView.setVisibility(hasIcTalkMsg ? VISIBLE : GONE);
+            icTalkView.setVisibility(hasIcTalkMsg== Boolean.TRUE ? VISIBLE : GONE);
         });
         statusBarPresenter.isWifiOpen.observe(lifecycleOwner, isWifiOpen -> {
             //wifi是否打开
-            wifiView.setVisibility(isWifiOpen ? VISIBLE : GONE);
+            wifiView.setVisibility(isWifiOpen == Boolean.TRUE ? VISIBLE : GONE);
         });
         statusBarPresenter.missCallState.observe(lifecycleOwner, hasMiss -> {
             //是否有未接电话
-            phoneView.setVisibility(hasMiss ? VISIBLE : GONE);
+            phoneView.setVisibility(hasMiss == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.wearState.observe(lifecycleOwner, hasWear -> {
             //是否有穿戴
-            wearView.setVisibility(hasWear ? VISIBLE : GONE);
+            wearView.setVisibility(hasWear == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.msgUnReadState.observe(lifecycleOwner, hasRead -> {
             //消息是否有读
-            newMsgView.setVisibility(hasRead ? VISIBLE : GONE);
+            newMsgView.setVisibility(hasRead == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.warningReadState.observe(lifecycleOwner, hasRead -> {
             //警告消息是否有没阅读
-            warningMsgUnReadView.setVisibility(hasRead ? VISIBLE : GONE);
+            warningMsgUnReadView.setVisibility(hasRead == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.silentState.observe(lifecycleOwner, isSilent -> {
             //是不是静音状态
-            silentIconView.setVisibility(isSilent ? VISIBLE : GONE);
+            silentIconView.setVisibility(isSilent == Boolean.TRUE? VISIBLE : GONE);
         });
         statusBarPresenter.batteryLev.observe(lifecycleOwner, lev -> {
             //电量还有多少
@@ -121,12 +119,7 @@ public class StatusBarView extends FrameLayout {
             }
         });
         statusBarPresenter.networkTypeValue.observe(lifecycleOwner, type -> {
-            ICLogger.d("type == > " + type);
-            if (TextUtils.isEmpty(type)) {
-                signalView.noNetwork();
-            } else {
-                signalView.updateNetworkType(type);
-            }
+            signalView.updateNetworkType(type);
         });
         statusBarPresenter.signalLev.observe(lifecycleOwner, lev -> {
             ICLogger.d("lev == > " + lev);

diff --git a/app/src/main/res/layout/item_simple_status_bar.xml b/app/src/main/res/layout/item_simple_status_bar.xml
index 075dc4d..9107f9f 100644 (file)
--- a/app/src/main/res/layout/item_simple_status_bar.xml
+++ b/app/src/main/res/layout/item_simple_status_bar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,21 +7,19 @@
     <com.ic.launcher.view.SignalView
         android:id="@+id/signal_view"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        android:layout_height="wrap_content" />
 
 
     <TextView
         android:id="@+id/simple_status_bar_time_tv"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
         android:text="12:12"
         android:textColor="@color/white"
         android:textSize="22sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        android:textStyle="bold" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/item_status_bar.xml b/app/src/main/res/layout/item_status_bar.xml
index 8524c06..caae608 100644 (file)
--- a/app/src/main/res/layout/item_status_bar.xml
+++ b/app/src/main/res/layout/item_status_bar.xml
@@ -16,6 +16,7 @@
         android:id="@+id/mar_queue_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="90dp"
         android:layout_toRightOf="@id/signal_view">

diff --git a/app/src/main/res/mipmap-mdpi/top_icon_bt.png b/app/src/main/res/mipmap-mdpi/top_icon_bt.png
index c9655e0..b03a343 100644 (file)
Binary files a/app/src/main/res/mipmap-mdpi/top_icon_bt.png and b/app/src/main/res/mipmap-mdpi/top_icon_bt.png differ

diff --git a/app/src/main/res/mipmap-mdpi/top_icon_location.png b/app/src/main/res/mipmap-mdpi/top_icon_location.png
index 2079168..fe4fbe1 100644 (file)
Binary files a/app/src/main/res/mipmap-mdpi/top_icon_location.png and b/app/src/main/res/mipmap-mdpi/top_icon_location.png differ

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12081cf..3fe0e20 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,10 +27,10 @@
     <string name="app_package_name_contact">com.ic.iccontact</string>
     <string name="app_package_name_camera">com.ic.camera</string>
     <string name="app_package_name_photo">com.eqc.gallery</string>
-    <string name="app_package_name_sms">com.ic.sms</string>
+    <string name="app_package_name_sms">com.ic.icmms</string>
     <string name="app_package_name_record">com.ic.record</string>
     <string name="app_package_name_sign">com.ic.sign</string>
-    <string name="app_package_name_settings">com.ic.settings</string>
+    <string name="app_package_name_settings">com.ic.setting</string>
 
     <string name="no_application_tips_text">未找到相关应用.</string>
     <string name="monday">星期一</string>

diff --git a/app/version_code.properties b/app/version_code.properties
index 956160e..99ac15f 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 23 17:08:39 CST 2021
-VERSION_CODE=13
+#Wed Jun 23 20:48:07 CST 2021
+VERSION_CODE=14