From ac25a7dd6f31c3a8267c4227b07d4fcba9929b2f Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Tue, 30 May 2023 11:10:45 +0800 Subject: [PATCH] desc:topbar icon --- .../safetywatcher/watcher/utils/SimHelper.kt | 46 +++++++++--------- .../safetywatcher/watcher/utils/WifiHelper.kt | 19 +++++--- .../watcher/view/CommonTopBar.kt | 38 ++++++++++----- app/src/main/res/drawable-hdpi/battery_0.png | Bin 0 -> 1170 bytes .../main/res/drawable-hdpi/battery_100.png | Bin 0 -> 1417 bytes app/src/main/res/drawable-hdpi/battery_20.png | Bin 0 -> 1384 bytes app/src/main/res/drawable-hdpi/battery_40.png | Bin 0 -> 1414 bytes app/src/main/res/drawable-hdpi/battery_60.png | Bin 0 -> 1398 bytes app/src/main/res/drawable-hdpi/battery_80.png | Bin 0 -> 1431 bytes app/src/main/res/drawable-hdpi/net_1.png | Bin 0 -> 1960 bytes app/src/main/res/drawable-hdpi/net_2.png | Bin 0 -> 2023 bytes app/src/main/res/drawable-hdpi/net_3.png | Bin 0 -> 2096 bytes app/src/main/res/drawable-hdpi/net_4.png | Bin 0 -> 2153 bytes app/src/main/res/drawable-hdpi/net_5.png | Bin 0 -> 2181 bytes app/src/main/res/drawable-hdpi/wifi_1.png | Bin 0 -> 1724 bytes app/src/main/res/drawable-hdpi/wifi_2.png | Bin 0 -> 1848 bytes app/src/main/res/drawable-hdpi/wifi_3.png | Bin 0 -> 1382 bytes app/src/main/res/drawable/battery.xml | 28 +++++++++++ app/src/main/res/drawable/net.xml | 23 +++++++++ app/src/main/res/drawable/wifi.xml | 7 +++ app/src/main/res/layout/layout_topbar.xml | 22 +++++---- app/src/main/res/values/dimens.xml | 3 ++ app/src/main/res/values/strings.xml | 2 +- buildCommon/commonLibConfig.gradle | 2 +- 24 files changed, 135 insertions(+), 55 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/battery_0.png create mode 100644 app/src/main/res/drawable-hdpi/battery_100.png create mode 100644 app/src/main/res/drawable-hdpi/battery_20.png create mode 100644 app/src/main/res/drawable-hdpi/battery_40.png create mode 100644 app/src/main/res/drawable-hdpi/battery_60.png create mode 100644 app/src/main/res/drawable-hdpi/battery_80.png create mode 100644 app/src/main/res/drawable-hdpi/net_1.png create mode 100644 app/src/main/res/drawable-hdpi/net_2.png create mode 100644 app/src/main/res/drawable-hdpi/net_3.png create mode 100644 app/src/main/res/drawable-hdpi/net_4.png create mode 100644 app/src/main/res/drawable-hdpi/net_5.png create mode 100644 app/src/main/res/drawable-hdpi/wifi_1.png create mode 100644 app/src/main/res/drawable-hdpi/wifi_2.png create mode 100644 app/src/main/res/drawable-hdpi/wifi_3.png create mode 100644 app/src/main/res/drawable/battery.xml create mode 100644 app/src/main/res/drawable/net.xml create mode 100644 app/src/main/res/drawable/wifi.xml diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt index 7002f8c..92b61df 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt @@ -24,16 +24,14 @@ object SimHelper { if (intent?.action.equals("android.intent.action.SIM_STATE_CHANGED")) { val tm = context!!.getSystemService(Service.TELEPHONY_SERVICE) as TelephonyManager mSimState = tm.simState + callbacks.forEach { + it.onEnable(mSimState == TelephonyManager.SIM_STATE_READY) + } } Log.i( this@SimHelper.javaClass.name, - "onReceive action = ${intent?.action}, mSimState = $mSimState, mRssi = $mRssi" + "onReceive action = ${intent?.action}, mSimState = $mSimState" ) - callbacks.forEach { - it.onLevel( - mSimState == TelephonyManager.SIM_STATE_READY, mRssi - ) - } } } @@ -45,22 +43,20 @@ object SimHelper { private fun watchSimRssi(context: Context) { val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager //获取指定卡槽的信号强度 - val info = getNewerSlotSubscriptionInfo(context, 0) - info?.let { - val mTelephonyManagerForSubscriptionId = - tm.createForSubscriptionId(info!!.subscriptionId) - mTelephonyManagerForSubscriptionId.listen(object : PhoneStateListener() { - override fun onSignalStrengthsChanged(signalStrength: SignalStrength) { - super.onSignalStrengthsChanged(signalStrength) - mRssi = signalStrength.level - callbacks.forEach { - it.onLevel( - mSimState == TelephonyManager.SIM_STATE_READY, mRssi - ) - } +// val mTelephonyManagerForSubscriptionId = +// tm.createForSubscriptionId(SubscriptionManager.getDefaultSubscriptionId()) + tm.listen(object : PhoneStateListener() { + override fun onSignalStrengthsChanged(signalStrength: SignalStrength) { + super.onSignalStrengthsChanged(signalStrength) + mRssi = signalStrength.level + callbacks.forEach { + it.onLevel(mRssi) } - }, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) - } + Log.i( + this@SimHelper.javaClass.name, "onSignalStrengthsChanged mRssi = $mRssi" + ) + } + }, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) } private fun watchSimState(context: Context) { @@ -71,7 +67,10 @@ object SimHelper { fun addCallBack(callBack: OnSimLevelCallback) { callbacks.add(callBack) if (mSimState != -1) { - callBack.onLevel(mSimState == TelephonyManager.SIM_STATE_READY, mRssi) + callBack.onEnable(mSimState == TelephonyManager.SIM_STATE_READY) + } + if (mRssi != -1) { + callBack.onLevel(mRssi) } } @@ -85,7 +84,8 @@ object SimHelper { } interface OnSimLevelCallback { - fun onLevel(enable: Boolean, level: Int) + fun onEnable(enable: Boolean) + fun onLevel(level: Int) } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt index d61d4c7..46a28e7 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt @@ -17,19 +17,20 @@ object WifiHelper { if (intent?.action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { val wifiState = intent?.getIntExtra(WifiManager.EXTRA_WIFI_STATE, -1) mWifiState = wifiState!! + callbacks.forEach { + it.onEnable(mWifiState == WifiManager.WIFI_STATE_ENABLED) + } } else if (intent?.action.equals(WifiManager.RSSI_CHANGED_ACTION)) { val rssi = intent?.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -1) mRssi = WifiManager.calculateSignalLevel(rssi!!, 5) + callbacks.forEach { + it.onLevel(mRssi) + } } Log.i( this@WifiHelper.javaClass.name, "onReceive action = ${intent?.action}, wifiState = $mWifiState, mRssi = $mRssi" ) - callbacks.forEach { - it.onLevel( - mWifiState == WifiManager.WIFI_STATE_ENABLED, mRssi - ) - } } } @@ -46,7 +47,10 @@ object WifiHelper { fun addCallBack(callBack: OnWifiLevelCallback) { callbacks.add(callBack) if (mWifiState != -1) { - callBack.onLevel(mWifiState == WifiManager.WIFI_STATE_ENABLED, mRssi) + callBack.onEnable(mWifiState == WifiManager.WIFI_STATE_ENABLED) + } + if (mRssi != -1) { + callBack.onLevel(mRssi) } } @@ -60,6 +64,7 @@ object WifiHelper { } interface OnWifiLevelCallback { - fun onLevel(enable: Boolean, level: Int) + fun onEnable(enable: Boolean) + fun onLevel(level: Int) } } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt index 6a21283..47ff2d2 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt @@ -43,6 +43,11 @@ class CommonTopBar : LinearLayout { } } + // 默认满信号 + mBinding?.battery?.setImageLevel(100) + mBinding?.wifi?.setImageLevel(100) + mBinding?.fourG?.setImageLevel(100) + post { // watch battery watchBattery() @@ -54,7 +59,7 @@ class CommonTopBar : LinearLayout { private val batteryCallback = object : BatteryHelper.OnBatteryLevelCallback { override fun onLevel(level: Int) { Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level") - mBinding?.battery?.visibility = if (level > 80) VISIBLE else GONE + mBinding?.battery?.setImageLevel(level) } } @@ -63,17 +68,20 @@ class CommonTopBar : LinearLayout { } private val wifiCallback = object : WifiHelper.OnWifiLevelCallback { - override fun onLevel(enable: Boolean, level: Int) { - Log.i( - this@CommonTopBar.javaClass.name, - "wifiCallback onEnable = $enable , level = $level" - ) + override fun onEnable(enable: Boolean) { + Log.i(this@CommonTopBar.javaClass.name, "wifiCallback onEnable = $enable") if (enable) { mBinding?.wifi?.visibility = VISIBLE } else { mBinding?.wifi?.visibility = GONE } } + + override fun onLevel(level: Int) { + Log.i(this@CommonTopBar.javaClass.name, "wifiCallback onLevel = $level") + val showLevel = (level + 1) * 20 + mBinding?.wifi?.setImageLevel(showLevel) + } } private fun watchWifi() { @@ -82,17 +90,20 @@ class CommonTopBar : LinearLayout { private val simCallback = object : SimHelper.OnSimLevelCallback { - override fun onLevel(enable: Boolean, level: Int) { - Log.i( - this@CommonTopBar.javaClass.name, - "simCallback onEnable = $enable , level = $level" - ) + override fun onEnable(enable: Boolean) { + Log.i(this@CommonTopBar.javaClass.name, "simCallback onEnable = $enable") if (enable) { mBinding?.fourG?.visibility = VISIBLE } else { mBinding?.fourG?.visibility = GONE } } + + override fun onLevel(level: Int) { + Log.i(this@CommonTopBar.javaClass.name, "simCallback onLevel = $level") + val showLevel = (level + 1) * 20 + mBinding?.fourG?.setImageLevel(showLevel) + } } private fun watchSim() { @@ -138,11 +149,12 @@ class CommonTopBar : LinearLayout { class Option(val type: Int, val title: String) - private var mOpListener:OpClickListener?=null + private var mOpListener: OpClickListener? = null - fun setOpClickListener(opClickListener: OpClickListener){ + fun setOpClickListener(opClickListener: OpClickListener) { mOpListener = opClickListener; } + interface OpClickListener { fun onClick(type: Int, target: View) } diff --git a/app/src/main/res/drawable-hdpi/battery_0.png b/app/src/main/res/drawable-hdpi/battery_0.png new file mode 100644 index 0000000000000000000000000000000000000000..0a05c18f0c62c26eccf5d8838b4e12a4699056e7 GIT binary patch literal 1170 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 XXT2%HLV{jK00000NkvXXu0mjfroyQb literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/battery_20.png b/app/src/main/res/drawable-hdpi/battery_20.png new file mode 100644 index 0000000000000000000000000000000000000000..8fe1d6f58699dd006344c76d65117cdc12dd9ee9 GIT binary patch literal 1384 zcmV-u1(*7XP)001cn1^@s6eR9;h00001b5ch_0Itp) z=>Px)B1uF+RA@u(npcP&WfaGM$KK0}A}aR&H-cRwcC2XZ#yaxbobNJsvU_(okWKD7A6y1@_THKAH~&-SoD<}# zs%iybGhlaM4`6FxO(1}OfvWuP1Ub52KYsz=0B-=ZfPskkWvD$0f~u-KZUGzs>06zd90WSkHfft4X7O5yf9R(Z*YzeFg{0{tk?2To5=p8pnj3HUh4`ve3y(i&81A1ojG-+7<98ZBuT zU}fNY;341+U~WXHyul@`eSzbFWAbmW0S^PO0AHj{7yBNLLpkrUUsi#&8n7*JNc!px zfKP#IfawwOXC2mQz(MJ&l%W#5G3{8#UKHiiXqsX%PwAKQ{Q|4F6!)NS)>oel?4QEt&_U>(9W8eT}7UjWRH2qQ~huBxim0WL^)q=noq zi-`E34r@BFSNf~xfvYowO8aPFzl7DX-3EmfvFMk zdL7oS3CoBmtSP{g86i}e{>&d5ZmFyRB^(hR`*KxPZCqbmaxtP&d;1npLJD4yxR+wK5It8x-wz)GDClBBEmAyx;!F2Z(%j; zB+am{tlKkn__BpHG^}&dXK6{#0C(p5;%5=D&$C0x9&2GO4og#9w`Qfj7MUG9*uv_qEYJGdX9Z?P3u|<+Ox9<% zuttXEJMnXxVhgK`R+%kqrHKO4=1tA*7KOH~QX8vLk=e{BtZ5iH9x*5K#Ym1TFwhJ_Oz9gsr?j>~X@SKy~?tg1GL*;Gzxu&Sz|l;sbrx}jh$`Q4A-H{GL?Le6KM3LKXElz~$;j!001cn1^@s6eR9;h00001b5ch_0Itp) z=>Px)KuJVFRA@u(npdb?RTPH5W$)!h5fyuX^1&As`-@nyfC|Ba58{KpBS>ONG*MAv z3Fw1@8WbyniLu2JQMm|qj9sw>Yb>!I`7Ub@=Z@E#ICJ70;%pc$+?lh_+23Ak?RD1r zgB(>=tpscV>GsKI1x zHddbs9GK5|BXDU%XlWhGx)#v7b_U)6E=w~MltF&81lA$k<5p_oo;afhSE{}*$hOoNGjsxqKOdUQOBrL6U zT1#Wrc^R|xq$h#f@_q5+h*)9<-yO65&u(~5!deUXE-MjFnd+E>4q>H_r5m1|C!z^z zIlYZpw*wCkVf`JJuDE_Jq?u5g9o##FHL+#+t*?DnVCD>AEgLM8^|?b>ONZq<@zc8E z5Y`aZzt83W;WTujfm&9ZlhW?gp#=EnfJcXJxO6uxr{OTb7l*C6VRxP-tjDb$55ltA z?uOm4zQ_#zp+UfEbBV@xL(4Sw5iKEo2+Rj8F^>#kjg47amBl}copz`1&Qklrh*&&? zH5OLA_-A>>;-B59(J_QI7M4~eFl+G3RQ&rdYVd6>{?#qZvWzwOg>}oayJN#biIFdi z7XM0jM{p-K+}*KbG^M4L(xrBHZc13HXG-5tozlAc>~iQEx&dwM8`|CRG@P(+SUS>M zb~RbO_~g`VS(CPd+)vBhIXsT-$IXriTluXS*<`gNeMx%K?Ccwk=}0RAvB|mv;1^RY zq2?;oKiE&S_1a$JvV&KoyM=%1-KVFfa)?Dt~0gdQV!J z8SIiI?P8l4TB)BwkFsIP6m|j*O*PTxsWDZPF*71Gnhq>u)zQFdDKB!8_wr=)*wp=s z0IeU(>fCeCl=A*X#j_!>YwFXKENC2tArHR!-O4`$uVmGeDlytPEy=!_;x=PT(Ui7i zosB$3iJ68OyE*>VP*gl#Gg`ljSX{qTQ7ijHb(M!_?AkG*HKlQAWOd7N5~bXRoRMsM z&5MYyy6@MKD&}b*Fg5Ud0NVf?q$tE)Xw~V}060U7>(_fe2j0wN+z#|N<0%vW0vN7? U!Y+pE2mk;807*qoM6N<$g690L1poj5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/battery_60.png b/app/src/main/res/drawable-hdpi/battery_60.png new file mode 100644 index 0000000000000000000000000000000000000000..af5f1c14b984029fcada916fa4c28bd956735408 GIT binary patch literal 1398 zcmV-+1&R8JP)001cn1^@s6eR9;h00001b5ch_0Itp) z=>Px)FiAu~RA@u(npcQjRTPH5W$)!h5fyuX^1&As`-@nyfC{39fWZfQM-V%jScxU5 z4+<6(MMW?%wnU9+oCtP}*s-Fq8|#s8vi9ZNn{j4t$h}v_v*B`J=A5(l{`bGiS?dpS zR8_SCuo+cWXE8sO?HZT+sKaI3UfuO1?uUh~I0DA&E z0UHCW7Az+qSngS{{sO)OJ^)?>W&zKQ1Xv`a1nMZ@IABX)Mc`N9mjuZd`8J1aJ^znElInc<6uTJ9RZ$ z(k{Ttz_-AI!0o{Nh>&^1L$LM*jt7p(zr6xH1iS=%mNs4NdpWOp)Yp|cz4l@huvP=M z1rAAHy#eqsa5XR^B7U!fbt-UB`YLHC1#d_@*0C2xc^dsN#bWZFXqmGYU=^3*eEMd6 z^+~|~X-zi)mqdh2YccCuKz8j2ya`;IG!!VE{3Z!l3*la@y!K8PuOC?iEQ|=FRnJFN zRqFufr#q6(cZo$ryjKTn2C!H9t7n0$GK7lu(ZGHQR?BvKzH(Rvcn7#OB8*Z!A5~T9 zuTBRp%KhF0OpAzD>tNlIU>OkwYbx+WMhID^Kl4TX95QQ2vxo?$=VU(B#oRAOqe8C+Pyber?i241PxT-2G>6|o0%}}tWM#LL+ zu%-ih1KVV}AhR9=j1rdvQ&?ga{T?#v#6B`hu+9a}%bZJ}b!9}nJsMd0teFYc6$w_q z&CvA?8Z7gy%Oc{_2CNP{Ni(c7>$XfCK5xJp8LYF@XK6`K19#;2;wKTY*bKhYXZ@ee z@XQ2j4dDB%L_7mLY!2Fhl?+QWJR>8b397?HT%UC(@Mr_p(qL(d>(;E)&myyf2O6+O zXO{o2;Tt0^{MHDGoBW%e)8&=)n#>V$I?uypXx1CKXm zIJOyqBB(l0ZEf20Ac9W1{MtvuLAv}gDcFbA;2Jk)^I z4wfcp@y}wX-Rb+X)NbSC#|Er+ufX4&1bVWGsx4@QfBrMn|=lLpk?u?1y!=jHD6@$R1(Z+GYB1WWZy=^Lt3T3eeP zVBb)XrbNVo?zi6k6A6~laMZqG=}2$h(PXtXG&wa})}$3u^h0t~vE7%cwsoWxf!Ji-4)7lrTSCog)IZoyv_sscRT}>?y1rAe4BaM!3k=y^ zzhN03sH$r9tiPK+lqRdu@ZGx4vJ0!?Z&%=lY^=&Q#cXBa-Y={A#Vi*qllyT%?op+X z`m9rc!*ZWupo&HbWh-?!5I7b%B5yKdy+2uI2D>`I)6*4sfBj%qYi-M5P2D_F#BA#W zJEuNN$%5q24H@|6bSnRJ-Xg1>REg1sd8+o!6u0@+T?A&`Eaty{ulsVyUb{J7C5np2 zYliDr9saVYmAz42<)P`jwolLop>Y@l$V$0&IqEBHd(DoBZ#oy!@&_3W1WXP5ZopQ+ zda2Fw6v{~qVl%y%Q@7&&wVp44w=x;G1HC9BmU21&0Hx4m!u^j-qyPW_07*qoM6N<$ Ef=!r_)c^nh literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/battery_80.png b/app/src/main/res/drawable-hdpi/battery_80.png new file mode 100644 index 0000000000000000000000000000000000000000..33a52afb946e64fd66a82ec3d6516afc1bdbe165 GIT binary patch literal 1431 zcmV;I1!($-P)001cn1^@s6eR9;h00001b5ch_0Itp) z=>Px)QAtEWRA@u(npcQjRTPH5W$)!h5fyuX^1&As`-@nyfC^&42l2t)5$rWlQDO<` zgMtM^Yy^@RTcSo(f}mJ1wishYqs9{Jk?+phmwT_1nR|zs?W(Fa0xr*Vk`^FD{OV`)u##aJh8JW- zbc5<}BW})m5SUSe^^7J@(mwnN@?;9awJGXV+j250+=* zd4^&QRt?sOx(*(9I;){j*39ZW=&oSvP!jwrz%z9i4j+c48rBKEFsy}Ho%<}odaltY ztB*Saa18<0*SUj#x(2H~3_Tm#c~D1GGh77B1#B@dsKIIn%Mi5rXR}jv`mt=aFN}y~ zHCXLnwf3`Y&)ED^Xl{%etah+um4MlU@2dG%_uvP>vMpl|-gb49S*kk<7FvuvFxvbp z>W;vjK2FpfCHJewTHU!P!O}fbbVGeg8yd6YNH_dA)u`zs)D1oESPh5N4T~bZZHLI} z&1a-%%bv7GihlArl;|*ItX?upt#4jL=-KFLq{ylwt@fxL;L+3#+Z1U{Ad0NJ0DhtN zHY0yY|ATs>H@A6}dYZ}DUR=P^kftEIBqDl#sZ~|2oBemU4@G3P8mdP&bCxQsj=#MD zWp9O5*`}FIA3+gVoj}i%7+ahM*3jbMvuEz{q?h6S%K!Sa&H;|eb&7#58ZDGfunq@K z29C>%+_6qembrsno|Ea;_teWoN9$T&VsX=SYq~2&7i|i=0Y|2rXzTQt>d%@I5t60} zmbvP9;Ow*)`4E$(mC>?k_&EVT{m885T6#pjnAtW3_Dp}8mIcXS8nW=s?R5T`yhT<& zsTQNn^DU{HnJ9}vtXq>%LVcA-XYSfH zK^qSqhtWX0VTALroU+%Pi1@Da!A-VgH4rd8@cRHe0Gp&Y%eT;L;v9`djO8;-E3V(@ l`3iV1H{&YMO9!i{{{qxVg2F7yi3R`w002ovPDHLkV1jZQsG|S? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/net_1.png b/app/src/main/res/drawable-hdpi/net_1.png new file mode 100644 index 0000000000000000000000000000000000000000..35118708bd49a4e8bd0baa692b888216e90c3f52 GIT binary patch literal 1960 zcmV;Z2UqxsP)Px+Vo5|nRA@u(nhU6Ra$0VQd3LK3cRJ5nwFv{S{Y_uLs1l!5F}GjQ!|)m zydfgu{Sqpa6q=+nDy3qmh@@r-ib&;*isbz=UdEZmX{K57?AEvW-R>=(<4o=Y^TW@9 zv;WKYu6M0>t@W)x7;$9g7l3a9Uk3ts0JuLQ7IkmQOn+M)_!_VsuqCiQ;B`*{e+3=| zUW$ku^}dh#e;4t-BQrk>d>8luusPrYW&*#8hy?>c)&#xhyX_$sg#uo!qAcmlW^ zxFaH7{iq8bb^j;rrXm5lGT@93BVPf|1r7z?25tnd0UnNsB?VS? z4+0J=R_+9D0%k{qEHAU83q)5q95?}R0l%-mKLl0SACw;6>nU;5SVS zR5PufnQH?Z0mjoCfB`>$c{1`1;Ji|+S+z*z*PvHk1@a3SDfV`)>y3kFfs-TR#*$-I zPuEi@{tc*fx~EJnSr#DbJ+x=_7|BfC$Dq}pRVA%^dog5e$dJB$mVsJor97Vn>`?LX z(}b?z<1CPYDs-v1fQ_eR8vnW?(Tl9t!CeijioWTq~4NXhOO0YzcMdiE{Al~o~3 z28g*y@6kXqFA&qgTLQTh_)aHhh)_3h@dmj!=z?0+#P;)uxF<8s_$rxs!T>h#uZoDd znW=F2vJHR(3z(L)IuOX;BEsiQ=*UdhvvI|2FDgo17YM|~=+h=Q7q7aQ?1mlB0Vh^0 zXyxgZOI8BztE6cu(zAAEDiTMP5(?^O;Fs24lLVqMR6yOT0Wn5;KrAgpsT&BwQwlw| zty5tC1pZ*=j)+IA0{Fhbs!TCk-&*d({@`^9fIGa_Le+~F8a4qnUmNX~g zTjg3ZYaG58$fyTZEj7)Us5mjOt+kAw{*jrwq}kmJzE%Cu{9krGUIG48KpvcILYyoR zX;igzJs0#xeLNzpY`Z{=k4=C*sH)g5me%hV4JOXX z0`YoEQJol&`?+}rz_%lIzK8Sm*gW0L|h5#JqR z-Co7;VM>v5;U?EI;-PTZ*Sy&kh5tK{i5MX>UHq4-pXo~K>m@9***nG^h%TuTS=uxp zibVs`kIAV5!~#>7G$ssofz0iS%L*V9@%0b7wl!HJWVgB2_%c$mY%p6jm{S%H$qnNT zqEolImkJ9Lx=44@6gS$I*ofL`E!C4B&nVUmc~YHGZyDY}f#~?b^zf{{j|{ zuXO9RaR*{WZOtVZYcUTu9&Fld!WOhx8FwHCxIipDxpXWPpq*T zmEbBjs6w6w@X{f1>8L6Ue>l%Iv=5gR2U`|As@S3EK zJ&@gN+~$_2`N4Uh)2gc@!ZGud0pirjF`Bc$wvqjq8`BZ-=cxqbI$#&T-Sl=i>l26@ z&*R3($gzUsuF2->qh zXRi%xt!#esaIP|Hr?ES+YM}dr9!Js65FImH2zr6arE57(Yp&&Qt=95^z51{Nq(9uu zOs{oe_Ux*i*I85wdeF)O)yiJq-D&KB9x#yUp}Cgv+;;qX6Dz-5@budg7b^XJo8@5B zSZP3fi4T&Mw#B36?8ALwSE}1LTwdFTsR9*Px+p-DtRRA@u(nhDHZWf6v-QBhG`Q9*Fua0w!!C>V{18gT(N5)_q1Q9z6$MN25H zP-6@+io3KXN-zomSzLfXgb<@3qOsI!6$&w;RKa3bS|~c?xy*NSdb!u|-){F$`Xx7i za{qJB`QDj#-kERa1S3{v?hL#VcqtITHNdYT;_mKGGSmM(26z#$C-7omC&24&27Uu9 z0R9;fIqG>E`@NfZz{<==18)T02J8m7feV1|M#P!{Adds~2HpVd0X!Rc0_w*cn=e+8Zbyb5>| zus!g5;H!EzB35r|&kO^ig+C3vwJhv2rO6q<=Obce0g+N41dapr;NO6Af$ssg0gtbk z@&9kBjq8;!0ZTS@y!3%&=0hq-PXvwu)&chbPp(aT9XPe)k!Jy40Nx9%0?r4%1N=53 z?k%u-_dUR&<(12U9|1Q;gkIics|!RbydU@^;0DgCzwZVf1$+~j-C`s&Rj983uLG6> zp99WrVxXF7^~`)C@HD`9`VU~huil&t)kT$q`vmoa8sJgGdPHw5$ZqO5Ub{7q>U2=`*1QrZQg z;a3XepnB-R<$6`;>OyQn6r||=&S1VeB9>;R>ZX^pywv(kM4X$MQtFVB-KPSI!mf4i zi-B)dg)j~fbCc}RKzd#vrh^p%`5Lf)CufLI8n}6b+#g6mt!iRBDI%`QOf$YpW}YyB z4g7f#u`Dwc4j;A)@U8-;C9Mtwa(zU2zbUQEbU)9inC(SHsp}enxEVQZa&z;li^*=- z`a5uZ#e!CzUAg38z%MFkT8i|notcWn;iZIvx(N8T_1Bm{G=>T&tr`$xqzA;(LX^@# z5Po!_pO@7~V1EXFYUYlJ1yunYAh0S^%+^1yeDbeyyPkPRc|~5UhE@o_9utTj(SQOm z?@2B5T@Q!~;6|Glq>&%JqX2xYKp8uhEq8P*E`5$HwR>jq^~TC8K1AcZptAhGf$sxn z0gGGGoC>#!T6)$v+z`m98&xee%b2J*F|e(*jGz9>Oetx0H-o>V{?YiacU`vwR}_$I z$4!Xi0@01Cmeg}YKa=ATVP)F|VthOg*sp3Uz0?30E2@gc}&RSaD z-#wT(#|7dIBkb{yTPK=g>EiUHg&;p;@HYE2%s${QYlY`eB{ z<-dT1qfqJ`51h&^1}K1UA#u_SU}pEd6Cd2xWi>|`%p;x-6%UWP0#rCWi}>l!*$cE* z7P!l~%BW6bcVg8*_Xjodm%0`aKp>2T1>0@cc1-|aN^Ku1Kk_iK7+)H0r1$GEuB_W(@wqCdHJV@?N4O6?*LxkL zD64_Iw!MrX5XTlhAhuzA&+5%(72mOPD05ABb9E!H^}Q^Ir=HdvOY61Y4bDC)$=cHr zh}N^8YpK7%0H;7}B(L?J0uzXUhrQ(HwVsQ-uS+0n?*lYc{MNHUmO%gj002ovPDHLk FV1mR|!+`(* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/net_3.png b/app/src/main/res/drawable-hdpi/net_3.png new file mode 100644 index 0000000000000000000000000000000000000000..388d08c2e859c067a07d2a41fc9f25f0309b233a GIT binary patch literal 2096 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/net_5.png b/app/src/main/res/drawable-hdpi/net_5.png new file mode 100644 index 0000000000000000000000000000000000000000..43415f03ac5d98e5ad336f390dd90e88f267ab08 GIT binary patch literal 2181 zcmV;02zvL4P)Px-KS@MERA@uhng^_HRS|~2K?DH-QBax!3L*%Kf)o*@M-fzv22>P9uuxQ*7@Cw2 zL+>bvKtK@bq6jJyVnJ$nGXAR%FKCy^?^?V%K~oTT;QaLc&-n~{J^Tfy1)m4rGN#1mw@|$+kig<7e~Y+GrHmN zem@?NWq=<8p99`hKu!Smh=?cK%`)?iz(;}a0viK!0FMFB19JlN)$g^)@xVo|mu02{ zl9_KVOYB{4;=W%6jsfi+sq1wdJz&;&|ED8Js*c^BUI2-smaBW1qTwt~C7l1F9 zRsH~+15Aqutvu6K7l^L#72x}T8#t@}ejb<`I2PEe#Ykq#P)7hC2Ob3W2TpBdAe(vW znfX>=alm+b0x;m8eLXGmVc@`GtMh7;(yu`;y$WPcEmGE7tG;g>+z0F&5oZ@2%X+$= zMDZU$rqeyO)XOspA~Pit@9#aIj)+%!7RgNA$Dq}pWhGDd_hlhtLksEK`x&UkR?_o+ zz$z6VJ4M8~nQ354$EyQcLl9m9x&!#9797U4GIREdy%maRWXBtQzP2|gKLhMmF5t-@ zEK=ZGb?Tn*VFl!w4v>8-X&UG|M#OoUDSH`X#>IklYMz{6E-jZej*PzvtvYZ?$owW4 z@9`JlN`ZW~9{R;Hy{vP2F_u3Nr1`=B8O)bQ#DkeByJ;m)Uf23zM4XwKntZdO-9-RN zVX?aR1;BBo5QYJwdf2mo_#BrB_bP!L1+3S}8M>Bk;N}f-T}2o4R84F@iipcH(~K{Z znI{Zj1ONDlcq}s|4y~~$uxSC)s;UElToV!AZ$c|Gjafb8W5uc}4lO-ZAZ|vVHo3WZ z*~MfxX#ETLLB)cnyjSHCeOD8kG?gN~)6PsuV#{JeL7fl$RQ)w15cg@!>J27Uf%vRx z0#RDL3(yS&;Uz10tyGu5rUJh;b4SFKQUIS4Sm(ySseJP9QUh9Mld_8XOEwhjl|urN zSPlYYOhu_c1azxFq)0c~te_itX&nh*+X7|mC|e%soVf1ujbghc0OiZH$}1*359htb zG>-zO0jKmHTuE~xzLl9P7ZG)Vn2e_m6pbA%wTCfLabjSrwTz#!m6^Jv+1(8O{`#Q# zzt(j<4E(Wx{A1XJI4lqYUDnd|+|cjz@raPSyFiSOrGa%yTWO^RK>yWBipi@gHhQA7 z?;akg*94)`zd-@AZjmVxR=YkViuiFBUPrC-2^W!`d9zedYWF{_QIgtQ7T&Z z^UzGP{#L42fU3!Qx~;rq;;uCj-yP?K`G2HH<((ah-L#6ac|+x_3nRkfY}Npo$RT8= z6{R`I#M_p|+3CP9fScNZ4CPuA+03xtErDrI;DB<_eMLN(Y=8X4CrR+?>4CNI}A_gFS`fjra!a`P;=NEJXPOzW9@s)N#{ zQ}f4Y1IbLO^b^%d5r}fzn%xs_HT`Gr1U~-j-l&G{<;2Smzi2*q=6W?YggT14Ss7? ze(IsIuE}7fwTl? z{a})F9_X~{gorRtG)f(LAWog^@Hq=?jcmtR+eO6RCKC{goizbZye(&a0WnXKh(Qs+8@bbZLE1%T!g}8}!IJe!;;_ z>&`o{bSBsZ;^v$SZZ&{@_i6p75|%cjmGNHPdc>xig;j4pQs4Fc6@T9aVqeSJ#qU~8 z_Fl%xOy?tq447EmCXh2~P}8-@?ZEbZK(vCH-S2(*gKrE57( zYp&%8TdlQo4R2ak-c#PKj~E;+XpNm}MD0D5{0@3_EkXAfF*Ef9=lkX;zh|SuS3pj! zMuiHy?Lp6RVr6$mwe21ReTzVRbHU58ul{Tv@!c#3o5o7JiCuDO`s=_NHOH_sqHEe2 z8Jl~QQubla5AAEIl%4$kvRXoqcihD>f@<1BG7hbGZmI^|UnAo2&K}-bGfT&Ly1H#8 z-v{eWbsg&KryJHJ);7LF85;zz8OqdmeJ{(Qq#JN^TFuh+HRI;Y^r2F_O==48k$&;le&rmOq3400000NkvXX Hu0mjf!@&{` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/wifi_1.png b/app/src/main/res/drawable-hdpi/wifi_1.png new file mode 100644 index 0000000000000000000000000000000000000000..66b59881ac8d4625435b9fafaa1a369548352ee1 GIT binary patch literal 1724 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 + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/net.xml b/app/src/main/res/drawable/net.xml new file mode 100644 index 0000000..d2f45b6 --- /dev/null +++ b/app/src/main/res/drawable/net.xml @@ -0,0 +1,23 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/wifi.xml b/app/src/main/res/drawable/wifi.xml new file mode 100644 index 0000000..2b61f58 --- /dev/null +++ b/app/src/main/res/drawable/wifi.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_topbar.xml b/app/src/main/res/layout/layout_topbar.xml index e6d001e..7806f65 100644 --- a/app/src/main/res/layout/layout_topbar.xml +++ b/app/src/main/res/layout/layout_topbar.xml @@ -15,7 +15,7 @@ @@ -52,24 +52,26 @@ + android:src="@drawable/battery"/> + android:src="@drawable/wifi" + android:visibility="gone"/> + android:src="@drawable/net" + android:visibility="gone"/> 50px 186px 90px + 33px + 37px + 27px \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d752ae9..ce1f488 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,7 +14,7 @@ 传感器设置 云平台 网络参数设置 - 传感器回复出厂设置 + 恢复出厂设置 同步传感器数据 同步报警数据 同步视频 diff --git a/buildCommon/commonLibConfig.gradle b/buildCommon/commonLibConfig.gradle index 5ef6240..2892488 100644 --- a/buildCommon/commonLibConfig.gradle +++ b/buildCommon/commonLibConfig.gradle @@ -11,7 +11,7 @@ project.ext { ] versions = [ - compileSdkVersion : 33, + compileSdkVersion : 31, buildToolsVersion : "33.0.3", minSdkVersion : 24, targetSdkVersion : 28,