From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 26 Oct 2021 08:19:16 +0000 (+0800)
Subject: 修改了弹窗，修改了AIDL接口对不上的问题，修改了主题。
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=3650963ec9f86815a3a70a20d18d89e74c8f0de2;p=IcTemperature.git

修改了弹窗，修改了AIDL接口对不上的问题，修改了主题。
---

diff --git a/app/build.gradle b/app/build.gradle
index b17a693..523f052 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -126,7 +126,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
@@ -136,6 +136,5 @@ dependencies {
     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/src/main/aidl/com/ic/work/ITempSensorCallback.aidl b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
index c43619e..4f43311 100644
--- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
@@ -4,12 +4,14 @@ package com.ic.work;
 import com.ic.work.domain.Temperature;
 
 interface ITempSensorCallback {
+    //测试出错，比如说主办温度过高
+   void onTemperatureTestError(in String message,in int code);
     //获取到了温度数据，这个是最终数据
-   oneway void onTemperatureGet(in Temperature temperature);
+   void onTemperatureGet(in Temperature temperature);
    //温度数据更新中
-   oneway void onTemperatureUpdating(in Temperature temperature);
+   void onTemperatureUpdating(in Temperature temperature);
    //正在获取数据
-   oneway void onGetingData();
+   void onGettingData();
    //等待中
-   oneway void onWaiting();
+   void onWaiting();
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/temperature/App.kt b/app/src/main/java/com/ic/temperature/App.kt
index bdde41d..2fbd9e9 100644
--- a/app/src/main/java/com/ic/temperature/App.kt
+++ b/app/src/main/java/com/ic/temperature/App.kt
@@ -4,7 +4,7 @@ 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() {
@@ -18,9 +18,6 @@ class App : Application() {
         val crashHandler = CrashHandler.getInstance()
         crashHandler.init(applicationContext, getString(R.string.program_abnormal))
         ICLogger.init(applicationContext, "IcTemperature")
-
-        XUI.init(this)
-        XUI.debug(true)
     }
 
     companion object {
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 10d7cce..50173f1 100644
--- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
+++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
@@ -2,23 +2,21 @@ 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.content.*
 import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
 import android.os.Message
+import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import com.ic.iclooger.ICLogger
 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) {
 
@@ -80,6 +78,11 @@ class TemperatureRepository(context: Context) {
     }
 
     inner class Callback4Remote : ITempSensorCallback.Stub() {
+        override fun onTemperatureTestError(message: String?, code: Int) {
+            IcLog.d(TAG, "message ==> $message code ==> $code")
+            //UI上做出提示
+        }
+
         /**
          * bodyOrWristTemp：体温或者腕温（当不支持腕温的时候，就是体温）
          * maybeBodyTemp：可能是体温（如果支持腕温的时候）
@@ -116,12 +119,10 @@ class TemperatureRepository(context: Context) {
             )
         }
 
-        override fun onGetingData() {
+        override fun onGettingData() {
             //正在获取
             IcLog.d(TAG, "正在获取 ...")
-            if (mUiRefreshHandler != null) {
-                mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE)
-            }
+            mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE)
         }
 
         override fun onWaiting() {
@@ -129,9 +130,7 @@ class TemperatureRepository(context: Context) {
             IcLog.d(TAG, "任务正在等待...")
             //updateTipsInfo(mTipsSpares.get(top), mTipsSpares.get(bottom));
             //让UI显示保持安静，准备测试的玩意
-            if (mUiRefreshHandler != null) {
-                mUiRefreshHandler.sendEmptyMessage(WAITING_TASK_TYPE)
-            }
+            mUiRefreshHandler.sendEmptyMessage(WAITING_TASK_TYPE)
         }
     }
 
@@ -152,19 +151,28 @@ class TemperatureRepository(context: Context) {
     }
 
     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()
+        //弹窗提示，确定后才重置设备
+        val builder = AlertDialog.Builder(mContext)
+        builder.setMessage(mContext.getString(R.string.background_wait))
+            .setPositiveButton(mContext.getString(R.string.confirm_text)) { dialog, id ->
+                dialog.dismiss()
+                //删除内容
+                if (mActivity != null) {
+                    mActivity!!.onBackPressed()
+                }
             }
-        }
+        val alertDialog = builder.create()
+        alertDialog.show()
+        val yesBtn = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
+        val noBtn = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE)
+        yesBtn.textSize = 24.0f
+        noBtn.textSize = 24.0f
+        ICLogger.d("yesBtn==> $yesBtn")
+        ICLogger.d("noBtn==> $noBtn")
+        val viewById = alertDialog.findViewById<TextView>(android.R.id.message)
+        viewById!!.setPadding(10, 10, 10, 10)
+        viewById!!.textSize = 24.0f
+
     }
 
     /**
diff --git a/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java b/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java
deleted file mode 100644
index c8dc950..0000000
--- a/app/src/main/java/com/ic/temperature/widget/CustomDialogStrategy.java
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644
index 294c55c..0000000
--- a/app/src/main/java/com/ic/temperature/widget/CustomMaterialDialog.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8919a6e..531d3d2 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -12,8 +12,9 @@
     <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_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>
+    <string name="confirm_text">确定</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..ebfcee0
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="confirm_text">确定</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a6ed9ea..6ce9c51 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -12,8 +12,9 @@
     <string name="temperature_default_text">"--.- "</string>
     <string name="program_abnormal">Error</string>
 
-    <string name="background_test">舞台裏では心拍数を調べています…</string>
+    <string name="background_test">バックグラウンドで体温測定をしています…</string>
     <string name="background_wait">測定できません、しばらく置いてからお試しください！</string>
     <string name="dialog_warn">注意</string>
     <string name="dialog_confirm">確認</string>
+    <string name="confirm_text">确定</string>
 </resources>
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
new file mode 100644
index 0000000..ebfcee0
--- /dev/null
+++ b/app/src/main/res/values-night/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="confirm_text">确定</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..ebfcee0
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="confirm_text">确定</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 9424a69..6bf635e 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -16,4 +16,5 @@
     <string name="background_wait">บริการตรวจสอบเบื้องหลังไม่ว่า งโปรดลองอีกครั้งในภายหลัง</string>
     <string name="dialog_warn">เตือนความจำ</string>
     <string name="dialog_confirm">ยืนยัน</string>
+    <string name="confirm_text">确定</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 d70808f..fe3d5cd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -12,8 +12,9 @@
     <string name="temperature_default_text">"--.- "</string>
     <string name="program_abnormal">App发生异常</string>
 
-    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_test">后台正在测试体温，直接监听测试结果…</string>
     <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">确认</string>
+    <string name="confirm_text">确定</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 0e9a557..d9e1f70 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -12,8 +12,9 @@
     <string name="no_wearing_device_tips_text">未配戴設備</string>
     <string name="program_abnormal">App发生异常</string>
 
-    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_test">後臺正在測試体温，直接監聽測試結果…</string>
     <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">確認</string>
+    <string name="confirm_text">确定</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 0e9a557..d9e1f70 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -12,8 +12,9 @@
     <string name="no_wearing_device_tips_text">未配戴設備</string>
     <string name="program_abnormal">App发生异常</string>
 
-    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_test">後臺正在測試体温，直接監聽測試結果…</string>
     <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">確認</string>
+    <string name="confirm_text">确定</string>
 </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 0977932..66d8e13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,8 +12,9 @@
     <string name="temperature_default_text">"--.- "</string>
     <string name="program_abnormal">App发生异常</string>
 
-    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_test">后台正在测试体温，直接监听测试结果…</string>
     <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">确认</string>
+    <string name="confirm_text">确定</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 2a43f82..7014b45 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="XUITheme.Phone">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>