From f5f50a12255cbb39578fa5c5eaeaf6dd6fe8fa22 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Thu, 15 Jul 2021 15:29:09 +0800 Subject: [PATCH] listen wear state. --- .../presenter/StatusBarBasePresenter.java | 15 +++++++++++++++ .../launcher/presenter/StatusBarPresenter.java | 7 ------- .../java/com/ic/launcher/view/MarqueeView.java | 7 +++++-- .../main/res/mipmap-mdpi/top_icon_new_msg.png | Bin 1337 -> 499 bytes 4 files changed, 20 insertions(+), 9 deletions(-) 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 76d139e..e400456 100644 --- a/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java @@ -35,6 +35,8 @@ public class StatusBarBasePresenter extends BasePresenter { public MutableLiveData isServerConnected = new MutableLiveData<>(); //网络类型 public MutableLiveData networkTypeValue = new MutableLiveData<>(); + //未佩戴状态 + public MutableLiveData wearState = new MutableLiveData<>(); private Handler handler; private TelephonyManager mTelephony; @@ -115,12 +117,25 @@ public class StatusBarBasePresenter extends BasePresenter { getSignalStrength(); queryPhoneNetworkTypeResId(mTelephony); } + //获取佩戴状态 + getWearState(); getConnectionState(); handler.postDelayed(this, 3000); } }); } + private void getWearState() { + boolean isAntiOff = SystemUtils.getSystemPropertiesBoolean("persist.sys.ic_antioff", + false); + if (isAntiOff) { + //未佩戴 + wearState.postValue(Boolean.FALSE); + } else { + wearState.postValue(Boolean.TRUE); + } + } + private int mOldSimCardState = -1; private boolean querySimCardState() { 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 a540245..04ceed4 100644 --- a/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java @@ -32,8 +32,6 @@ public class StatusBarPresenter extends StatusBarBasePresenter { public MutableLiveData gpsState = new MutableLiveData<>(); //蓝牙状态 public MutableLiveData btState = new MutableLiveData<>(); - //未佩戴状态 - public MutableLiveData wearState = new MutableLiveData<>(); //未读预警消息 public MutableLiveData warningReadState = new MutableLiveData<>(); //开启闹钟提示 @@ -65,7 +63,6 @@ public class StatusBarPresenter extends StatusBarBasePresenter { getGpsState(); getBtState(); //需要监听的 - getWearState(); getUnReadMsgState(); getAlarmState(); getWarningMsgReadState(); @@ -169,10 +166,6 @@ public class StatusBarPresenter extends StatusBarBasePresenter { // msgUnReadState.postValue(true); } - private void getWearState() { - // wearState.postValue(true); - } - private void getBtState() { //蓝牙 IntentFilter btFilter = new IntentFilter(); diff --git a/app/src/main/java/com/ic/launcher/view/MarqueeView.java b/app/src/main/java/com/ic/launcher/view/MarqueeView.java index 247928b..3145be3 100644 --- a/app/src/main/java/com/ic/launcher/view/MarqueeView.java +++ b/app/src/main/java/com/ic/launcher/view/MarqueeView.java @@ -41,7 +41,7 @@ public class MarqueeView extends ViewGroup { public int bottom = 0; } - private int margin = 0; + private int margin = 1; @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { @@ -57,7 +57,10 @@ public class MarqueeView extends ViewGroup { item.measure(widthSpec, heightMeasureSpec); //ICLogger.d("item.getMeasuredWidth() == > " + item.getMeasuredWidth()); //设置孩子的位置,从0开始 - item.setTag(new Position(totalWidth, 0, totalWidth + item.getMeasuredWidth(), item.getMeasuredHeight())); + item.setTag(new Position(totalWidth, + 0, + totalWidth + item.getMeasuredWidth(), + item.getMeasuredHeight())); totalWidth += item.getMeasuredWidth() + margin * 2; } int parentWidth = MeasureSpec.makeMeasureSpec(totalWidth, MeasureSpec.EXACTLY); diff --git a/app/src/main/res/mipmap-mdpi/top_icon_new_msg.png b/app/src/main/res/mipmap-mdpi/top_icon_new_msg.png index 07612a7e3b446d5d7a2f9d628e60c065d06d088e..88dd329a0a615962012eb0c6d72511f5b4f79d75 100644 GIT binary patch literal 499 zcmVOhR0ZadYrLCk%to;5etz2xa z4KbBL?1CYLq@8fW>~dLl_wL?%b&GYH1DA8&XU?3Nxg(lnY7&} zNcvk8Err_5#(_^jf0o3E)(tQ!=}Y()1z!W-fZ)J6u$z$sIbhH=gX9ZIzoTFS3cyd` zwQtN7J#5qoGkXf`1CN0-;E!KwLQ>02J^Z}>9J7BFQSki=JN{PE57(;??3;Ul17Iu;Ze~-! zCJ@eS0eMN`UH@C%H;x>5=t=Uj8r;lgfDNDv_zcWT3dvfshQaP_ufw00!_92Yp&cQC zBrR5|fJ9)2hsF{zb=cu~&)RU)HeglKQnj*640iZ{!=ID^RwOOgs`XT0hlgJN0eAy^ z1=b~fjB7Bd!Eu0F33XCvqH;>^6000F5Nkl{sAH&&fwup98Y-puxdSi_*fl@>y&X(iNAM@`EATV$i{B$+TLrWu zun%w`Z~(9uuruKO$q@cF;P(XcEieLX0=7meMJA>L7XTLnr{-_(Z$F8EWJplMz?;BA zK?!J2;3!}Ya3gR6um$)W5WNh^l;In6`~mz1?2^$q6!6|_z$3sa0UZXM2HXc+or}K# zJPWMMIR95n$%@w@8I7v|*Z&lF92gSNNx)gay!_k@EKbx?`9VbdG$=Lo{Zh(7z&XH` zz~#V^z?Z=Dz=r}lJ%QW<9N|r1eTM2Y;AvnQ?q zug@571Qr1=0Ba&bA&zU5QuMX+fa`$s(@vJ9B;1_(HEgE-a0PTOa7Qw8e?%-QrI-O` z-7LWGhH(k-I~rUxRz9rQ*i zMbo?_Cq5-TYI#!bZZ~Q9jpuhu!ODn$%;Fyth+!X!2up=?yGf&PB4Bp61Iico2L$5+ zGNvfk0xtotM16@G$UXL>Q94jlLOb0CJJJz%99;q4+2lHiczGCe0j6j&|`7uwX2^=o?Te z#q2QCG_)&Hq&op>NAa7!>Ow#9zP@9*v2dD|ucqUF-K1y`K*wjDyDW>MCiV{C0+xcq zv!D6`*pTd)L9(R}t!_B}4-Lj!MJ?_6kmW*=?hZJybw_4g+yza0O;QHDXId+0e=A}O zsEet!i_#3uOzYLsh;R<)x3id?z{eD|nlSAvAe~hoF=G_5b?(Is!FnA#`>DOt^tMEV zbGVpoP0dW-xA_z70y_yso`6hyH8%=KzwoL~{a~7(VYoH3M%v%c^07D~WTJJHQq+?y zSWssI+Q-M~)Mlny(@F&XRkL(dK<>_3W?j)s43p`sUi6&h;|0^uiLJ0<*A8@i^{57& z@4F1QJ(0H1t7T^-LwBbRe9%92Pj#W8EsO};gT6;8#gMx}YuCYmEr*-61u-KH=LP|} zum$kmMl7XuT^2%9c2z|9@<1cYkmjnU{In&JK?}ES>{CXKJHAQBWFYJ^HvY zON>2`qSu$60UiTBks%*2Z56goY%Aak9)tdQSgaF|R`&_U(D&=*9Lm6OsZ%{_xE>T; z*c3D^_sj1J+8y{`Wu%^^{OlK0eXjyC(~QQ5ZAtSeEmHzeLmsL9Ue99{P(4=-0!W5j v%kVqT*2Yn~cc!0GqXX0yj*g-K9YcQs@9qKSBGR9W00000NkvXXu0mjfz@l+f -- 2.17.1