From 20da5abf1c03f7416bb6cccd8f6a5846f82e55f8 Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Mon, 23 Aug 2021 11:35:34 +0800
Subject: [PATCH] update s123 translation.

---
 .idea/jarRepositories.xml                     |   5 +
 app/build.gradle                              |   6 +-
 app/proguard-rules.pro                        |  40 ++++++-
 app/src/main/AndroidManifest.xml              |   6 +-
 app/src/main/java/com/ic/temperature/App.kt   |  14 +++
 .../java/com/ic/temperature/MainActivity.kt   |  13 ++-
 .../repository/TemperatureRepository.kt       |  61 +++++++++++
 .../com/ic/temperature/utils/Constants.kt     |   1 -
 .../viewmodel/TemperatureViewModel.kt         |  19 +++-
 .../widget/CustomDialogStrategy.java          | 103 ++++++++++++++++++
 .../widget/CustomMaterialDialog.java          |  27 +++++
 app/src/main/res/mipmap-mdpi/warn.png         | Bin 0 -> 464 bytes
 app/src/main/res/values-en/dimens.xml         |   3 +-
 app/src/main/res/values-en/strings.xml        |   6 +
 app/src/main/res/values-ja/strings.xml        |   6 +
 app/src/main/res/values-th/strings.xml        |   8 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   6 +
 app/src/main/res/values-zh-rHK/strings.xml    |   6 +
 app/src/main/res/values-zh-rTW/strings.xml    |   6 +
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/strings.xml           |   6 +
 app/src/main/res/values/themes.xml            |   2 +-
 build.gradle                                  |   2 +
 23 files changed, 337 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java
 create mode 100644 app/src/main/java/com/ic/temperature/widget/CustomMaterialDialog.java
 create mode 100644 app/src/main/res/mipmap-mdpi/warn.png

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..2370474 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fe2fdb5..b17a693 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,5 +133,9 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.github.silvestrpredko:dot-progress-bar:1.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0-RC1'
+    implementation ('com.squareup.okhttp3:logging-interceptor:4.10.0-RC1') {
+        exclude group: 'com.squareup.okio', module: 'okio'
+    }
+    implementation 'com.github.xuexiangjys:XUI:1.1.7'
+    implementation files('libs/ICLoger-release.aar')
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e314ca4..4c3a668 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -24,4 +24,42 @@
 -keep class com.android.** { *; }
 -keep class android.** { *; }
 
--dontwarn android.**
\ No newline at end of file
+-dontwarn android.**
+
+
+-keep class com.ic.iclooger.CrashHandler
+-keep class com.ic.iclooger.ICLogger
+
+-keepclassmembers class com.ic.iclooger.StorageUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keepclassmembers class com.ic.iclooger.SystemUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keep class com.facebook.** { *; }
+-keep class com.mediatek.** { *; }
+-keep class org.apache.** { *; }
+-keep class okio.Okio.** { *; }
+-keep class java.nio.** { *; }
+-keep class com.android.** { *; }
+-keep class android.** { *; }
+-keep class android.ddm.** { *; }
+-keep class com.alibaba.fastjson.** { *; }
+-keep class com.eqc.watch.launcher.WatchApplication { *; }
+#-keep class com.enqualcomm.support.EqcAlgorithmNative { *; }
+
+-dontwarn com.facebook.**
+-dontwarn com.mediatek.**
+-dontwarn java.nio.**
+-dontwarn com.alibaba.fastjson.**
+-dontwarn android.**
+-dontwarn com.android.**
+-dontwarn rx.internal.**
+
+-keep class com.ic.** { *; }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f8964b..f693ae6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".App"
@@ -13,7 +15,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:theme="@style/AppTheme"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/ic/temperature/App.kt b/app/src/main/java/com/ic/temperature/App.kt
index 3c1f144..bdde41d 100644
--- a/app/src/main/java/com/ic/temperature/App.kt
+++ b/app/src/main/java/com/ic/temperature/App.kt
@@ -2,6 +2,10 @@ package com.ic.temperature
 
 import android.app.Application
 import android.content.Context
+import com.ic.iclooger.CrashHandler
+import com.ic.iclooger.ICLogger
+import com.xuexiang.xui.XUI
+
 
 class App : Application() {
 
@@ -9,6 +13,16 @@ class App : Application() {
         instance = this
     }
 
+    override fun onCreate() {
+        super.onCreate()
+        val crashHandler = CrashHandler.getInstance()
+        crashHandler.init(applicationContext, getString(R.string.program_abnormal))
+        ICLogger.init(applicationContext, "IcTemperature")
+
+        XUI.init(this)
+        XUI.debug(true)
+    }
+
     companion object {
         private var instance: App? = null
 
diff --git a/app/src/main/java/com/ic/temperature/MainActivity.kt b/app/src/main/java/com/ic/temperature/MainActivity.kt
index 01b7ad0..3e6b4d6 100644
--- a/app/src/main/java/com/ic/temperature/MainActivity.kt
+++ b/app/src/main/java/com/ic/temperature/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.os.PowerManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
+import com.ic.iclooger.ICLogger
 import com.ic.temperature.databinding.ActivityMainBinding
 import com.ic.temperature.utils.DisplayType
 import com.ic.temperature.utils.ICViewModelFactory
@@ -45,6 +46,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
         initObserver()
         initWakeLock()
+        viewModel.setActivity(this)
     }
 
     private var wakeLock: PowerManager.WakeLock? = null
@@ -114,7 +116,6 @@ class MainActivity : AppCompatActivity() {
                 binding.wristTemp = it
             }
             mEnvTemp.observe(that) {
-                println("env temp is == > $it")
                 //环境温度
                 binding.envTemp = it
             }
@@ -126,6 +127,16 @@ class MainActivity : AppCompatActivity() {
                 println("mShowLoading == > $it")
                 //显示Loading
                 binding.showLoading = it
+                //如果没有Loading就是检查完了
+                //10秒钟后灭屏幕
+                if (!it) {
+                    binding.dotProgressBar.postDelayed({
+                        if (wakeLock != null) {
+                            ICLogger.d("release wake Lock...")
+                            wakeLock?.release()
+                        }
+                    }, 1000 * 10)
+                }
             }
             mDisableWristTemp.observe(that) {
                 println("mDisableWristTemp == > $it")
diff --git a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
index 8af8f8f..10d7cce 100644
--- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
+++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
@@ -1,15 +1,24 @@
 package com.ic.temperature.repository
 
+import android.app.Activity
+import android.app.Dialog
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
+import android.os.Handler
 import android.os.IBinder
+import android.os.Looper
+import android.os.Message
+import android.widget.Toast
+import com.ic.temperature.R
 import com.ic.temperature.utils.Constants
 import com.ic.temperature.utils.IcLog
+import com.ic.temperature.widget.CustomDialogStrategy
 import com.ic.work.ITempSensorCallback
 import com.ic.work.ITempSensorService
 import com.ic.work.domain.Temperature
+import com.xuexiang.xui.widget.dialog.DialogLoader
 
 class TemperatureRepository(context: Context) {
 
@@ -19,10 +28,17 @@ class TemperatureRepository(context: Context) {
 
     private var mContext: Context = context
 
+    private var mActivity: Activity? = null
+
     private var mService: ITempSensorService? = null
 
     private var mCallback: ITemRepositoryCallback? = null
 
+    private var dialog: Dialog? = null
+
+    fun setActivity(mContext: Activity?) {
+        mActivity = mContext
+    }
 
     fun release() {
         try {
@@ -85,6 +101,9 @@ class TemperatureRepository(context: Context) {
                         + temperature.envTemp
             )
             //最后的结果
+            if (dialog != null) {
+                dialog!!.dismiss();
+            }
             mCallback?.onTempFinal(temperature.wristTemp, temperature.bodyTemp, temperature.envTemp)
         }
 
@@ -99,10 +118,52 @@ class TemperatureRepository(context: Context) {
 
         override fun onGetingData() {
             //正在获取
+            IcLog.d(TAG, "正在获取 ...")
+            if (mUiRefreshHandler != null) {
+                mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE)
+            }
         }
 
         override fun onWaiting() {
             //
+            IcLog.d(TAG, "任务正在等待...")
+            //updateTipsInfo(mTipsSpares.get(top), mTipsSpares.get(bottom));
+            //让UI显示保持安静，准备测试的玩意
+            if (mUiRefreshHandler != null) {
+                mUiRefreshHandler.sendEmptyMessage(WAITING_TASK_TYPE)
+            }
+        }
+    }
+
+    private val RUNING_TASK_TYPE = 0x01
+    private val WAITING_TASK_TYPE = 0x02
+    private val mUiRefreshHandler: Handler = object : Handler(Looper.getMainLooper()) {
+        override fun handleMessage(msg: Message) {
+            super.handleMessage(msg)
+            when (msg.what) {
+                RUNING_TASK_TYPE -> Toast.makeText(
+                    mContext,
+                    mContext.getString(R.string.background_test),
+                    Toast.LENGTH_SHORT
+                ).show()
+                WAITING_TASK_TYPE -> showDialog()
+            }
+        }
+    }
+
+    private fun showDialog() {
+        val mDialogLoader = DialogLoader.getInstance().setIDialogStrategy(CustomDialogStrategy())
+        dialog = mDialogLoader.showTipDialog(
+            mActivity,
+            R.mipmap.warn,
+            mContext.getString(R.string.dialog_warn),
+            mContext.getString(R.string.background_wait),
+            mContext.getString(R.string.dialog_confirm)
+        ) { dialogInterface, i ->
+            dialogInterface?.dismiss()
+            if (mActivity != null) {
+                mActivity!!.onBackPressed()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/ic/temperature/utils/Constants.kt b/app/src/main/java/com/ic/temperature/utils/Constants.kt
index a530971..7d23b69 100644
--- a/app/src/main/java/com/ic/temperature/utils/Constants.kt
+++ b/app/src/main/java/com/ic/temperature/utils/Constants.kt
@@ -2,7 +2,6 @@ package com.ic.temperature.utils
 
 object Constants {
     const val ACTION_ANTI_OFF0: String = "com.ic.ACTION_ANTIOFF"
-
     //integer  eventID =1 脱落, eventID =0 佩戴
     const val KEY_ANTI_EVENT = "eventID"
     const val STATE_ANTI_ON = 0
diff --git a/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt b/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
index d29d657..6e3d68c 100644
--- a/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
+++ b/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
@@ -1,9 +1,12 @@
 package com.ic.temperature.viewmodel
 
+import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.media.AudioManager
+import android.media.AudioManager.FX_FOCUS_NAVIGATION_DOWN
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
@@ -21,7 +24,7 @@ import com.ic.temperature.utils.Constants.STATE_ANTI_ON
 import java.lang.ref.WeakReference
 
 class TemperatureViewModel() : ViewModel() {
-    
+
     lateinit var mContext: Context
 
     private val repository by lazy {
@@ -89,6 +92,10 @@ class TemperatureViewModel() : ViewModel() {
         checkWristWear()
     }
 
+    fun setActivity(context: Activity?) {
+        repository.setActivity(context)
+    }
+
     /**
      * 是否支持腕温检测
      */
@@ -275,7 +282,12 @@ class TemperatureViewModel() : ViewModel() {
 
     inner class WristWearStateReceiver : BroadcastReceiver() {
 
+        private var audioManager: AudioManager? = null;
+
         override fun onReceive(context: Context, intent: Intent?) {
+            if (audioManager == null) {
+                audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager?
+            }
             //如果来了佩戴的广播，判断到没有绑定远程服务的话，那么就绑定吧
             val state = intent!!.getIntExtra(KEY_ANTI_EVENT, STATE_ANTI_NONE)
             IcLog.i(TAG, "on AntiStateChange....$state")
@@ -283,7 +295,10 @@ class TemperatureViewModel() : ViewModel() {
                 IcLog.i(TAG, "state error === > $state")
                 return
             }
-
+            //播放按键音
+            if (audioManager != null) {
+                audioManager?.playSoundEffect(FX_FOCUS_NAVIGATION_DOWN)
+            }
             if (state == STATE_ANTI_OFF) {
                 mCheckTips.value = context!!.getString(R.string.no_wearing_device_tips_text)
                 //脱落了，给出提示
diff --git a/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java b/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java
new file mode 100644
index 0000000..c8dc950
--- /dev/null
+++ b/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java
@@ -0,0 +1,103 @@
+package com.ic.temperature.widget;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+
+import androidx.annotation.NonNull;
+
+import com.ic.temperature.R;
+import com.xuexiang.xui.widget.dialog.materialdialog.DialogAction;
+import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog;
+import com.xuexiang.xui.widget.dialog.strategy.IDialogStrategy;
+import com.xuexiang.xui.widget.dialog.strategy.InputCallback;
+import com.xuexiang.xui.widget.dialog.strategy.InputInfo;
+
+/**
+ * @author: k.liang
+ * @date: 2021/7/17
+ */
+public class CustomDialogStrategy implements IDialogStrategy {
+
+    @SuppressLint("ResourceType")
+    @Override
+    public Dialog showTipDialog(Context context, int icon, String title, String content, String submitText, DialogInterface.OnClickListener listener) {
+        MaterialDialog.Builder builder = new MaterialDialog.Builder(context);
+        builder.backgroundColor(Color.parseColor("#F2F2F2"));
+        builder.title(title);
+        builder.titleColor(Color.BLACK);
+        builder.content(content);
+        builder.contentColor(Color.BLACK);
+        builder.positiveText(submitText);
+        builder.positiveColor(Color.BLACK);
+        builder.onPositive(new MaterialDialog.SingleButtonCallback() {
+            @Override
+            public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                if (listener != null) {
+                    listener.onClick(dialog, which.ordinal());
+                } else {
+                    dialog.dismiss();
+                }
+            }
+        });
+        builder.cancelable(false);
+        builder.autoDismiss(false);
+        CustomMaterialDialog customMaterialDialog = new CustomMaterialDialog(builder);
+        customMaterialDialog.setTitleSize(24);
+        customMaterialDialog.setContentSize(22);
+        customMaterialDialog.setButtonSize(24);
+        customMaterialDialog.show();
+        return customMaterialDialog;
+    }
+
+    @Override
+    public Dialog showTipDialog(Context context, String title, String content, String submitText) {
+        return new CustomMaterialDialog.Builder(context)
+                .title(title)
+                .content(content)
+                .positiveText(submitText)
+                .show();
+    }
+
+    @Override
+    public Dialog showConfirmDialog(Context context, String title, String content, String submitText, DialogInterface.OnClickListener submitListener, String cancelText, DialogInterface.OnClickListener cancelListener) {
+        return null;
+    }
+
+    @Override
+    public Dialog showConfirmDialog(Context context, String content, String submitText, DialogInterface.OnClickListener submitListener, String cancelText, DialogInterface.OnClickListener cancelListener) {
+        return null;
+    }
+
+    @Override
+    public Dialog showConfirmDialog(Context context, String content, String submitText, DialogInterface.OnClickListener submitListener, String cancelText) {
+        return null;
+    }
+
+    @Override
+    public Dialog showInputDialog(Context context, int icon, String title, String content, InputInfo inputInfo, InputCallback inputCallback, String submitText, DialogInterface.OnClickListener submitListener, String cancelText, DialogInterface.OnClickListener cancelListener) {
+        return null;
+    }
+
+    @Override
+    public Dialog showContextMenuDialog(Context context, String title, String[] items, DialogInterface.OnClickListener listener) {
+        return null;
+    }
+
+    @Override
+    public Dialog showContextMenuDialog(Context context, String title, int itemsId, DialogInterface.OnClickListener listener) {
+        return null;
+    }
+
+    @Override
+    public Dialog showSingleChoiceDialog(Context context, String title, String[] items, int selectedIndex, DialogInterface.OnClickListener listener, String submitText, String cancelText) {
+        return null;
+    }
+
+    @Override
+    public Dialog showSingleChoiceDialog(Context context, String title, int itemsId, int selectedIndex, DialogInterface.OnClickListener listener, String submitText, String cancelText) {
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/ic/temperature/widget/CustomMaterialDialog.java b/app/src/main/java/com/ic/temperature/widget/CustomMaterialDialog.java
new file mode 100644
index 0000000..294c55c
--- /dev/null
+++ b/app/src/main/java/com/ic/temperature/widget/CustomMaterialDialog.java
@@ -0,0 +1,27 @@
+package com.ic.temperature.widget;
+
+import com.xuexiang.xui.widget.dialog.materialdialog.DialogAction;
+import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog;
+
+/**
+ * @author: k.liang
+ * @date: 2021/7/17
+ */
+public class CustomMaterialDialog extends MaterialDialog {
+
+    protected CustomMaterialDialog(Builder builder) {
+        super(builder);
+    }
+
+    public void setTitleSize(float size){
+        getTitleView().setTextSize(size);
+    }
+
+    public void setContentSize(float size){
+        getContentView().setTextSize(size);
+    }
+
+    public void setButtonSize(float size){
+        getActionButton(DialogAction.POSITIVE).setTextSize(size);
+    }
+}
diff --git a/app/src/main/res/mipmap-mdpi/warn.png b/app/src/main/res/mipmap-mdpi/warn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fe74ce8a98dae13628e6e7db2a51f9ce3570fc2
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004(Nkl<ZScUCZ
z!Ht735KIZiG(ZU{ff7<eN}z;v;0N;hnG#Y$O5llLEx80r;2w5z<^X#QIUc98<WH3K
z4zoMs_38A#b}S|gJ2qjBC70ce12!CRaC_u{Lk9TdfP&Rn{!U_>bR_O3m;H5rVqq9p
z`ks(@vNOQv_T;K99Ic@w1BDHy+9LVO3CXKh6LP>R{9kR70A!#aVQTf`XH2YA<Z|TD
zU81zg?ly~){WTVsLw6y3eU$n|0P!*qO2K4*CUv;d_Za}9T7o{|Ookw@c@M<;CIsH6
zk!m*08~~woPPzdA+H5^!Ppr=X<$#d`j(cJkFEJ(z+j<C7ZIKka=8T+Xt@aSvpWgte
z>RDmW2SC2@d^u4}=z9mefCCEhL7tovZ%nZYz}@>~DxLOI=7hK%C&+2T)+Rc}kuD?K
ztp0UODjj)BBDmV5j#k29=8~o(=Lw<OR%xIK)XzXzb6Ei~l~Tk9(nm6%iQt!6`MpN;
zMcO~|cCbd1q>jdK(vK~t5U~JeaK8ywV|nO{>G0>-pIcv}uH)Q~*2uU30000<MNUMn
GLSTaXiqdod

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-en/dimens.xml b/app/src/main/res/values-en/dimens.xml
index b2198e8..fee2a5e 100644
--- a/app/src/main/res/values-en/dimens.xml
+++ b/app/src/main/res/values-en/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
+
     <dimen name="status_bar_height_dm">48dp</dimen>
 
     <dimen name="viewpager_next_item_visible">26dp</dimen>
@@ -10,4 +10,5 @@
     <dimen name="app_current_item_horizontal_margin">42dp</dimen>
 
     <dimen name="app_list_name_text_size">62sp</dimen>
+    <dimen name="temperature_left_text_size">22sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c679936..8919a6e 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -10,4 +10,10 @@
     <string name="no_wearing_device_tips_text">Not wearing a device</string>
     <string name="activity_temp_tips_wear_too_short">Wear to short\nMay be not right</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">Application Error</string>
+
+    <string name="background_test">Program is exist in backstage，wait...</string>
+    <string name="background_wait">Have other tests in background,Please try again later!</string>
+    <string name="dialog_warn">Warn</string>
+    <string name="dialog_confirm">Yes</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3582ac4..a6ed9ea 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -10,4 +10,10 @@
     <string name="activity_temp_unit">℃</string>
     <string name="activity_temp_tips_wear_too_short">時間が短すぎる\n結果に影響を与える可能性があります</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">Error</string>
+
+    <string name="background_test">舞台裏では心拍数を調べています…</string>
+    <string name="background_wait">測定できません、しばらく置いてからお試しください！</string>
+    <string name="dialog_warn">注意</string>
+    <string name="dialog_confirm">確認</string>
 </resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 50d8971..9424a69 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Temperature</string>
+    <string name="app_name">เทมเพอแรนส์</string>
     <string name="activity_temp_str">คน</string>
     <string name="activity_temp_wrist_str">ข้อมือ</string>
     <string name="activity_temp_unit">℃</string>
@@ -10,4 +10,10 @@
     <string name="activity_temp_outside">สภาพแวดล้อม</string>
     <string name="activity_temp_tips_wear_too_short">เวลาสวมใส่สั้นเกินไป\nอาจส่งผลต่อผลลัพธ์</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">ผิดพลาด</string>
+
+    <string name="background_test">กำลังทดสอบอัตราการเต้นของหัวใจ ที่หลังเวที…</string>
+    <string name="background_wait">บริการตรวจสอบเบื้องหลังไม่ว่า งโปรดลองอีกครั้งในภายหลัง</string>
+    <string name="dialog_warn">เตือนความจำ</string>
+    <string name="dialog_confirm">ยืนยัน</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9a0e737..d70808f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,4 +10,10 @@
     <string name="activity_temp_tips_end">测量完成</string>
     <string name="activity_temp_tips_wear_too_short">佩戴时间过短\n可能影响结果</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">App发生异常</string>
+
+    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
+    <string name="dialog_warn">提醒</string>
+    <string name="dialog_confirm">确认</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 8fb4c98..0e9a557 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -10,4 +10,10 @@
     <string name="activity_temp_tips_wear_too_short">佩戴時間過短\n可能影響結果</string>
     <string name="temperature_default_text">"--.- "</string>
     <string name="no_wearing_device_tips_text">未配戴設備</string>
+    <string name="program_abnormal">App发生异常</string>
+
+    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
+    <string name="dialog_warn">提醒</string>
+    <string name="dialog_confirm">確認</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8fb4c98..0e9a557 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -10,4 +10,10 @@
     <string name="activity_temp_tips_wear_too_short">佩戴時間過短\n可能影響結果</string>
     <string name="temperature_default_text">"--.- "</string>
     <string name="no_wearing_device_tips_text">未配戴設備</string>
+    <string name="program_abnormal">App发生异常</string>
+
+    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
+    <string name="dialog_warn">提醒</string>
+    <string name="dialog_confirm">確認</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b2198e8..2afd261 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,4 +10,5 @@
     <dimen name="app_current_item_horizontal_margin">42dp</dimen>
 
     <dimen name="app_list_name_text_size">62sp</dimen>
+    <dimen name="temperature_left_text_size">26sp</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 b69119a..0977932 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,10 @@
     <string name="activity_temp_tips_end">测量完成</string>
     <string name="activity_temp_tips_wear_too_short">佩戴时间过短\n可能影响结果</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">App发生异常</string>
+
+    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
+    <string name="dialog_warn">提醒</string>
+    <string name="dialog_confirm">确认</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 228432a..2a43f82 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="XUITheme.Phone">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 55e96ce..d037aa1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.0"
@@ -18,6 +19,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
-- 
2.17.1