From 841ed264dc3997b6a3464aff0c92e2d431ee147f Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 29 May 2023 17:15:34 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=91=8A=E8=AD=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   4 ++
 .../safetywatcher/watcher/CloudActivity.kt    |   9 ++-
 .../safetywatcher/watcher/HomeActivity.kt     |   8 ++-
 .../safetywatcher/watcher/SettingActivity.kt  |  13 +++--
 .../safetywatcher/watcher/WarnDataActivity.kt |  42 ++++++++++++++
 .../watcher/base/BaseActivity.kt              |  31 +++++++++--
 .../watcher/base/NoOptionsActivity.kt         |  14 +++++
 .../safetywatcher/watcher/utils/SimHelper.kt  |   2 +-
 .../watcher/view/CommonTopBar.kt              |  52 ++++++++++++++++++
 app/src/main/res/layout/activity_cloud.xml    |   1 +
 app/src/main/res/layout/activity_warndata.xml |   6 ++
 app/src/main/res/layout/layout_topbar.xml     |  21 ++++---
 app/src/main/res/mipmap-hdpi/op_bg.png        | Bin 0 -> 596 bytes
 app/src/main/res/mipmap-mdpi/op_bg.png        | Bin 0 -> 357 bytes
 app/src/main/res/mipmap-xhdpi/op_bg.png       | Bin 0 -> 765 bytes
 app/src/main/res/mipmap-xxhdpi/op_bg.png      | Bin 0 -> 1446 bytes
 app/src/main/res/values/dimens.xml            |   2 +
 app/src/main/res/values/strings.xml           |   2 +
 18 files changed, 186 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt
 create mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/base/NoOptionsActivity.kt
 create mode 100644 app/src/main/res/layout/activity_warndata.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/op_bg.png
 create mode 100644 app/src/main/res/mipmap-mdpi/op_bg.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/op_bg.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/op_bg.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bcfa1cb..e001ab0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,10 @@
             android:name=".watcher.CloudActivity"
             android:exported="false"
             android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.WarnDataActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
         <activity
             android:name=".MainActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/CloudActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/CloudActivity.kt
index e50f924..8d5aacf 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/CloudActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/CloudActivity.kt
@@ -1,14 +1,19 @@
 package com.yinuo.safetywatcher.watcher
 
 import android.view.View
+import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityCloudBinding
-import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 
-class CloudActivity : BaseActivity() {
+class CloudActivity : NoOptionsActivity() {
     private val mBinding: ActivityCloudBinding by lazy {
         ActivityCloudBinding.inflate(layoutInflater)
     }
 
+    override fun getTopBarTitle(): String? {
+        return getString(R.string.cloud)
+    }
+
     override fun generateContentView(): View {
         return mBinding.root
     }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/HomeActivity.kt
index 4c5b1e7..3120255 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/HomeActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/HomeActivity.kt
@@ -5,17 +5,21 @@ import android.os.Build
 import android.view.View
 import androidx.annotation.RequiresApi
 import com.yinuo.safetywatcher.databinding.ActivityHomeBinding
-import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 import com.yinuo.safetywatcher.watcher.utils.BatteryHelper
 import com.yinuo.safetywatcher.watcher.utils.SimHelper
 import com.yinuo.safetywatcher.watcher.utils.WifiHelper
 
-class HomeActivity : BaseActivity() {
+class HomeActivity : NoOptionsActivity() {
 
     private val mBinding: ActivityHomeBinding by lazy {
         ActivityHomeBinding.inflate(layoutInflater)
     }
 
+    override fun getTopBarTitle(): String? {
+        return null;
+    }
+
     override fun generateContentView(): View {
         return mBinding.root
     }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
index 95f4545..2e920a7 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
@@ -4,25 +4,30 @@ import android.content.Intent
 import android.view.View
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivitySettingBinding
-import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 
-class SettingActivity : BaseActivity() {
+class SettingActivity : NoOptionsActivity() {
 
     private val mBinding: ActivitySettingBinding by lazy {
         ActivitySettingBinding.inflate(layoutInflater)
     }
 
+    override fun getTopBarTitle(): String? {
+        return getString(R.string.setting)
+    }
+
     override fun generateContentView(): View {
         return mBinding.root
     }
 
     override fun initView() {
-        setTitle(getString(R.string.setting))
         mBinding.apply {
             itemTime.setOnClickListener { }
             itemLight.setOnClickListener { }
             itemQuery.setOnClickListener { }
-            itemWraning.setOnClickListener { }
+            itemWraning.setOnClickListener {
+                startActivity(Intent(this@SettingActivity, WarnDataActivity::class.java))
+            }
             itemSensor.setOnClickListener { }
             itemCloud.setOnClickListener {
                 startActivity(Intent(this@SettingActivity, CloudActivity::class.java))
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt
new file mode 100644
index 0000000..dece239
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt
@@ -0,0 +1,42 @@
+package com.yinuo.safetywatcher.watcher
+
+import android.util.Log
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
+import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+
+class WarnDataActivity : BaseActivity() {
+
+    private val mBinding: ActivityWarndataBinding by lazy {
+        ActivityWarndataBinding.inflate(layoutInflater)
+    }
+
+    override fun onOptionClick(type: Int, target: View) {
+        Log.i("cyy", "type = $type")
+        if (0 == type) {
+
+        } else if (1 == type) {
+
+        }
+    }
+
+    override fun getOptions(): List<CommonTopBar.Option>? {
+        val ops = mutableListOf<CommonTopBar.Option>()
+        ops.add(CommonTopBar.Option(0, getString(R.string.search)))
+        ops.add(CommonTopBar.Option(1, getString(R.string.export)))
+        return ops
+    }
+
+    override fun getTopBarTitle(): String? {
+        return getString(R.string.warn_data)
+    }
+
+    override fun generateContentView(): View {
+        return mBinding.root
+    }
+
+    override fun initView() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
index 0ce017b..1e946e5 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import com.yinuo.safetywatcher.databinding.ActivityBaseBinding
+import com.yinuo.safetywatcher.watcher.view.CommonTopBar
 
 abstract class BaseActivity : AppCompatActivity() {
 
@@ -16,12 +17,32 @@ abstract class BaseActivity : AppCompatActivity() {
         setContentView(baseBinding.root)
         baseBinding.container.addView(generateContentView())
         initView()
+        setTopBar()
     }
 
-    open abstract fun generateContentView(): View
-    abstract fun initView()
-
-    fun setTitle(title: String) {
-        baseBinding.topBar.setTitle(title)
+    private fun setTopBar() {
+        val title = getTopBarTitle()
+        title?.let {
+            baseBinding.topBar.setTitle(it)
+        }
+        val options = getOptions()
+        options?.let {
+            baseBinding.topBar.setOptions(it)
+            baseBinding.topBar.setOpClickListener(object : CommonTopBar.OpClickListener {
+                override fun onClick(type: Int, target: View) {
+                    onOptionClick(type, target)
+                }
+            })
+        }
     }
+
+    abstract fun onOptionClick(type: Int, target: View)
+
+    abstract fun getOptions(): List<CommonTopBar.Option>?
+
+    abstract fun getTopBarTitle(): String?
+
+    abstract fun generateContentView(): View
+
+    abstract fun initView()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/NoOptionsActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/NoOptionsActivity.kt
new file mode 100644
index 0000000..445632d
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/NoOptionsActivity.kt
@@ -0,0 +1,14 @@
+package com.yinuo.safetywatcher.watcher.base
+
+import android.view.View
+import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+
+abstract class NoOptionsActivity : BaseActivity() {
+    override fun getOptions(): List<CommonTopBar.Option>? {
+        return null
+    }
+
+    override fun onOptionClick(type: Int, target: View) {
+
+    }
+}
\ No newline at end of file
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..bf4a914 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
@@ -45,7 +45,7 @@ object SimHelper {
     private fun watchSimRssi(context: Context) {
         val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         //获取指定卡槽的信号强度
-        val info = getNewerSlotSubscriptionInfo(context, 0)
+        val info = getNewerSlotSubscriptionInfo(context, 1)
         info?.let {
             val mTelephonyManagerForSubscriptionId =
                 tm.createForSubscriptionId(info!!.subscriptionId)
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 d2bb3df..6a21283 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
@@ -2,10 +2,17 @@ package com.yinuo.safetywatcher.watcher.view
 
 import android.app.Activity
 import android.content.Context
+import android.graphics.Color
 import android.util.AttributeSet
 import android.util.Log
+import android.util.TypedValue
+import android.view.Gravity
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.LinearLayout
+import android.widget.Space
+import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.LayoutTopbarBinding
 import com.yinuo.safetywatcher.watcher.utils.BatteryHelper
@@ -97,6 +104,51 @@ class CommonTopBar : LinearLayout {
         mBinding?.title?.text = title
     }
 
+    //------------------------options----------------------------------------
+
+    private val opLayoutParams by lazy {
+        LinearLayout.LayoutParams(132, 55)
+    }
+    private val opSpaceLayoutParams by lazy {
+        LinearLayout.LayoutParams(60, 1)
+    }
+
+    private val opClickListener by lazy {
+        OnClickListener {
+            mOpListener?.onClick(it.tag as Int, it)
+        }
+    }
+
+    fun setOptions(list: List<Option>) {
+        list.forEachIndexed { index, option ->
+            val opView = TextView(context)
+            opView.text = option.title
+            opView.gravity = Gravity.CENTER
+            opView.setTextColor(Color.WHITE)
+            opView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 30f)
+            opView.tag = option.type
+            opView.background = AppCompatResources.getDrawable(context, R.mipmap.op_bg)
+            opView.setOnClickListener(opClickListener)
+            mBinding?.opsContainer?.addView(opView, opLayoutParams)
+            if (index != list.size - 1) {
+                mBinding?.opsContainer?.addView(Space(context), opSpaceLayoutParams)
+            }
+        }
+    }
+
+    class Option(val type: Int, val title: String)
+
+    private var mOpListener:OpClickListener?=null
+
+    fun setOpClickListener(opClickListener: OpClickListener){
+        mOpListener = opClickListener;
+    }
+    interface OpClickListener {
+        fun onClick(type: Int, target: View)
+    }
+
+    //------------------------options----------------------------------------
+
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         BatteryHelper.removeCallback(batteryCallback)
diff --git a/app/src/main/res/layout/activity_cloud.xml b/app/src/main/res/layout/activity_cloud.xml
index 4e92f38..6a1895e 100644
--- a/app/src/main/res/layout/activity_cloud.xml
+++ b/app/src/main/res/layout/activity_cloud.xml
@@ -12,6 +12,7 @@
         android:background="@drawable/cloud_sync_btn_bg"
         android:gravity="center"
         android:text="@string/sync_sensor_txt"
+        android:layout_marginTop="@dimen/_186dp"
         android:textColor="@color/white"
         android:textSize="@dimen/_30dp" />
 
diff --git a/app/src/main/res/layout/activity_warndata.xml b/app/src/main/res/layout/activity_warndata.xml
new file mode 100644
index 0000000..41d2ef1
--- /dev/null
+++ b/app/src/main/res/layout/activity_warndata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ 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 083675a..e6d001e 100644
--- a/app/src/main/res/layout/layout_topbar.xml
+++ b/app/src/main/res/layout/layout_topbar.xml
@@ -30,6 +30,13 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/ops_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/_90dp"
+        android:orientation="horizontal" />
+
     <Space
         android:layout_width="0dp"
         android:layout_height="1px"
@@ -38,34 +45,34 @@
     <TextClock
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/_30dp"
+        android:format12Hour="hh.mm a"
+        android:format24Hour="HH.mm a"
         android:textColor="@color/white"
-        android:format24Hour ="HH.mm a"
-        android:format12Hour ="hh.mm a"/>
+        android:textSize="@dimen/_30dp" />
 
     <ImageView
         android:id="@+id/battery"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/_40dp"
-        android:src="@mipmap/ic_setting"/>
+        android:src="@mipmap/ic_setting" />
 
     <ImageView
         android:id="@+id/wifi"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/_40dp"
-        android:src="@mipmap/ic_setting"/>
+        android:src="@mipmap/ic_setting" />
 
     <ImageView
         android:id="@+id/four_g"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/_40dp"
-        android:src="@mipmap/ic_setting"/>
+        android:src="@mipmap/ic_setting" />
 
     <Space
         android:layout_width="@dimen/_36dp"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/op_bg.png b/app/src/main/res/mipmap-hdpi/op_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..00fea8b86dfbd389fc10f5cbd3e040830cc6fab7
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq003hE001cn1^@s6A^4Y{00001b5ch_0Itp)
z=>Px%4oO5oRCr$Po3UyXQ5c2Ke`jZ1NF9BIkOb^v5sAnyNLEPUL&PVDg^dt*!6H6^
zzJnGP0U;JHT9{5q-oZ^BSZ8+rU+yJYr%0EW`-5kyDQ4zBoNvy|E$$Jtj{8pzmg?Wt
zrWE=dCR+$th9R`C;rTTj5GWL95Sv&N-j#Q{-+z97aenzkxjb1PyxuSiZ$l^_85E`p
zz^*Zww_fdlKtg~ZK(+oVqI)Mtua4uj3C8;1&4yX?2_pAk1aNDwkqBV+OGI}f5Q(3r
z`FwT=30nklYZ(3xN<c7yR!?PRFxoCd_fVTUgA$I64uqmatvZy|{`f-(#WT}}&SY{x
zLIKt0V}vmk$TEM{nMkCu0)w5&T7MjuO^a1kPD%gyY>P0sd~)&@5QY;F>0`xY_@O}<
zepoOWj#v-|VR&-Dkrw_l2*Z&Bj-)UdgyF~mM^cy!!f@n(BPmP<VK{QYkrXC_FdRAH
zND7ld7>*opB!$T!3`Y()lEP#Vh9d_YNntVw!;u4yq;N-}9~dU9{n1nqxYsr-l#9K#
z+=ZT%LK?o<g}(B5v|X0$XXHeZ`WbaKWOFGeg%pd}T+&IW(;KqWmlMXK(^u@A9KAeV
z^fK1^;|Bl^*mnKbblPp#Y68snPQUE`NFiyDj%CYgHhUO4*iAif!Ce+<ZWNBeFpWKM
io#TDC*ZbD)f&T%IKH0M@>&Y1a0000<MNUMnLSTZJKmauW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/op_bg.png b/app/src/main/res/mipmap-mdpi/op_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..380e88466c86f9b6fbed0fe74831c43cb3aab76e
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^PCzWf!3HF+UdYS`QjEnx?oJHr&dIz4vgJKp977`9
z-_G3Vci2I|C4Ca#iTWe!GzBNgYKka4jaPDPbv(Gvp(%dh0!CG?E{&C(_Z=JbBugd+
zvnbYl&025aeXsQ6v$Es+j05}MCEm>6YROW-kW^lL|4HZ%rVpE<UVW<#vte~>(>%LM
zu!DQ@1>b-}S8sp$GwJT0H`@;!UsiMaqiD$ymDR^os-`*4zM<mNBp|P1<$H44V<9o0
z&tB6MlW)d!L}`j2YQ2#swVneAJM80C?ny!5|Ju}D?mM8+<;~H%I(K#IXQob?&fQck
zcs1F~^}=%bdrT|%^WBf9{66@m$i2by^yIJn^Hj9gd(LySN!D|{bhajH&e~QE<+H0A
w7bu>rWw3tMvAuDh>RzWEv+c#dD}G`AE0~(O!e`?HV7M`Oy85}Sb4q9e097ZLumAu6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/op_bg.png b/app/src/main/res/mipmap-xhdpi/op_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c794530c396b991d4ab56b7ec4898127bedf429
GIT binary patch
literal 765
zcmeAS@N?(olHy`uVBq!ia0vp^EkJC}!3HGHN<FFpQjEnx?oJHr&dI!FU|`zr>Eakt
z5%+fP-aO$zk(Tq32i|G?3|3N1<UDH1&v5%<BZn7bJ_94Cmy%LT=0uM}(g8Q!KCpb_
z4w!vR$ir~ItZdmKxh-lgYK4>UYR<U2Bj&yA{h2?P#O~a2Jonu4ixF$(<86wSKfbAI
zi7(o|IW25{`TBJiRSfzz=)e1@*Zt(|yKmR8AAb1k$Afo&AGD_3+LbAI{%mdIu~lYO
zUs#mfp8ZR>5dHd$-aN)6+stL^aWih-UA#J*wU8;g`QEwO&FYcw66HJ6Zru{$IkI)y
z?O)dxY~Qwv|Hv1^#A|xXS6;os*|MJJSO2YhJ9Y)G@2%%K`{kTNY{tp6?KhXt{dJPN
z?qkvGYa5TmO}%pY6PL;d?ajCE`OGgnQ?rw)E@fc})5Wh#w|qT#_T2PqlNf5562D!X
zo%wqCzmi4og;EpdFbis!zWkuBpzy=G#Y#Zng2m6HEG+fy0qjgnQtJC>G(31O@XEo#
z;qeo3VSzugPO=;v8FT(5F*WUXUct=B*gHAi$KgXcN2!9sg2GSToE-o77V@#MnE2Hh
zG9J9Ic%`wS;n+!iHF_Cdq)>89q`qH+J$bHEd)Fo=tLo(!Y+ui4J-2d=!@{S!F5&7o
zr}=L*;<`LJ=X0Xw)}z7BXOFM&S%0+0rAO`ded)^|Ijng1N3>0i61{n9!T%j=D<!99
zZQU@l{(0)3iIM)()?G2X^VlyjQg?~Bf>PYR_wVmnn*=^zFMRgSqSsq)w0)i#Eyn-(
z_>naS7AofaoPJsSZ0qII(~fN2yRzo_nKfZ=rf+>^@0lQ!IREp?nrT08pL`KrelKL-
a{W<<uFF!gmw-lJ389ZJ6T-G@yGywpr7;J(7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/op_bg.png b/app/src/main/res/mipmap-xxhdpi/op_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6976d274e42b34d5627ddc7145ca391929aa898f
GIT binary patch
literal 1446
zcmeAS@N?(olHy`uVBq!ia0vp^$ACDPgAGU?F{oGzq!^2X+?^QKos)UVz`&Z|>Eakt
z5%+eMe|AW@NZb9-yLZmiS*jbFao1zwxgM3D3}TZxcVsVgeI2zhc59Y-tI=dW&$K(&
z?C)}x$vW-I2<JNH@t48SLV3y~r)ZD=9PdhucJ2>;cjSoMq>2Nsr{<I^2&ld1`Cfaj
z(y07h&w&DI+12k~w;XhC`k|;G&k)4&#g~Eg@L@^C#=S}x7@rs}_|Ev(Rj^L)$W?al
z?qL78Qin~^4+@rk^jlTr=IY-%VcO?4SuIM>_V0PM^JlrxjcO((0hW%IdmE43$n89p
z6aMAadhV_EWmX4dk81eGSS*xU&rp=`_n=7P`{iepD{7gfwbyGioZBXzReam_d0CRj
zN~2;;73cV4Yd-%velT63@xNx{1QCJF>EXAyCqIw-cYeQXPt{(zXYZDTvp)2xJ9R{w
z^NV%k9}#cC^>b}*{mseB$|`=jy(4g)$-d^6&r=rNzux%wpZ9|A|C}Emz2@|Gb?<NU
zqZ(mS^6H)s-RIdAX4(jy@LyfBws=wLYP0#@-**<KEZS+W^^R%RePxj{wZ?l-Rgd0Z
z)O`5u(e>d~NmJBkO<rZ?YoqdDZbL`S?Ol;`Cw}FBf9W=p<TKUC_t_8k?sr&ty7h*w
zTKn<k?w6KqShDf;T&~}f8B~_MNShm|*=M@i)9ONp<k1Il6C6B(j%>{f?V5V*tHQ~`
zt34qe2W%N9vIK6H4w{u=!}3I7|L-St>KqHo=bG)8TiU-QB-4h~z(q^NfoV3&yr)SY
zZa3cH5US{8IQqbA!T~cD4Yun|K%%^XC5PolSK{L%Q;eBJ4&OWwdEKoc>4t^j(;kMS
z1!e`;whAtgF!S@VRCX|&!#k%mmqnwkS2*|_M*vScb9$^a<EU0rf@!COKO>Lj>$AI5
zHb^(7LnAJvvx~*Ufu+H2Qqs~wTaTg`Q)LmM0)Gb;$188zM2^q8sv?_lWX)?iE=E`)
z;OqDAU*ehQseJT7)P#l>k-KY*wH7CTt(`mJp4bV41K%ZMc+a!2aK-8!dAIS;T((nF
z-FzD*&wJdM%TmO|<g-mIt9PD+yV|VZi;tx`+*6Yi`rz&GpG&Ci{oOVHZVD^!-)mp@
zaB^c~iCvoP{+Jtgbb<M4L3Xx!)b@Qd>;Ikl*yOtN(jJb9#j7srDu{h|cTjN<)Zd<e
z?Og7b`!z>j+%5c+5>#bV6sj_3nan@2Bgv1S2gPLXFZ^D7=4@`=jP0R4a*|VnmR4G-
zwCYzxJuM9VQ*zFKe$us{`}PLda-W#yz3FzxM!sbx_x^}1n$BRkp^jhw>95F{b$Pos
ze%d9ZbnbrinzMP=%iIk=eW*_UTFz}$5d|z%RCJ%`Jy{;{dU>SC()rhy*YD!|bb09?
z_5EVfoAbOw(yVv=I-K7fy#M``;&4MVxh?+`A3RWW{KGL}af68BFENqkzswVSfAuva
xh-&?3sFJ^6-Sr_@ah+X6)SRkMtJeKzx;cNvqT3%Ie*_l144$rjF6*2UngE%?jZFXm

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 633bd0c..4d326f2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -27,4 +27,6 @@
     <dimen name="_340dp">340px</dimen>
     <dimen name="_100dp">100px</dimen>
     <dimen name="_50dp">50px</dimen>
+    <dimen name="_186dp">186px</dimen>
+    <dimen name="_90dp">90px</dimen>
 </resources>
\ 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 8f51427..898e5de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,8 @@
     <string name="sync_once_txt">一键同步</string>
 
 
+    <string name="search">搜索</string>
+    <string name="export">导出</string>
     <string-array name="excel_column">
         <item>时间</item>
         <item>属性</item>