From: TrillGates Date: Wed, 9 Mar 2022 06:47:34 +0000 (+0800) Subject: 补充AIDL接口. X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=HEAD;p=IcTemperature.git 补充AIDL接口. --- diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3c7772a..7643783 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,22 +1,6 @@ - - diff --git a/app/release/ICL02Temperature_V30_202203091441_release.apk b/app/release/ICL02Temperature_V30_202203091441_release.apk new file mode 100644 index 0000000..3be77b3 Binary files /dev/null and b/app/release/ICL02Temperature_V30_202203091441_release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 638f3dd..5a1e52a 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,9 +10,9 @@ { "type": "SINGLE", "filters": [], - "versionCode": 27, - "versionName": "202202231730", - "outputFile": "ICL02Temperature_V27_202202231730_release.apk" + "versionCode": 30, + "versionName": "202203091441", + "outputFile": "ICL02Temperature_V30_202203091441_release.apk" } ] } \ 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..fec7fe4 100644 --- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl +++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl @@ -4,12 +4,9 @@ package com.ic.work; import com.ic.work.domain.Temperature; interface ITempSensorCallback { - //获取到了温度数据，这个是最终数据 - oneway void onTemperatureGet(in Temperature temperature); - //温度数据更新中 - oneway void onTemperatureUpdating(in Temperature temperature); - //正在获取数据 - oneway void onGetingData(); - //等待中 - oneway void onWaiting(); + void onTemperatureTestError(in String message,in int code); + void onTemperatureGet(in Temperature temperature); + void onTemperatureUpdating(in Temperature temperature); + void onGettingData(); + void onWaiting(); } \ No newline at end of file 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 cd8baa1..fef0657 100644 --- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt +++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt @@ -15,11 +15,9 @@ import com.ic.temperature.R import com.ic.temperature.utils.Constants import com.ic.temperature.utils.IcLog import com.ic.temperature.utils.SystemUtils -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) { @@ -81,6 +79,11 @@ class TemperatureRepository(context: Context) { } inner class Callback4Remote : ITempSensorCallback.Stub() { + override fun onTemperatureTestError(message: String?, code: Int) { + IcLog.d(TAG, "测试错误...$code = $message") + + } + /** * bodyOrWristTemp：体温或者腕温（当不支持腕温的时候，就是体温） * maybeBodyTemp：可能是体温（如果支持腕温的时候） @@ -117,17 +120,16 @@ class TemperatureRepository(context: Context) { ) } - override fun onGetingData() { + override fun onGettingData() { //正在获取 IcLog.d(TAG, "正在获取 ...") - if (mUiRefreshHandler != null) { - val customname: String = SystemUtils.getSystemProperties("persist.sys.customname") - if (!customname.equals("Gator")) { - mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE) - } + val customname: String = SystemUtils.getSystemProperties("persist.sys.customname") + if (!customname.equals("Gator")) { + mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE) } } + override fun onWaiting() { // IcLog.d(TAG, "任务正在等待...") @@ -157,19 +159,8 @@ 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() - } - } + Toast.makeText(mContext, mContext.getString(R.string.background_wait), Toast.LENGTH_SHORT) + .show() } /** diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d70808f..32363f7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -12,7 +12,7 @@ "--.- " App发生异常 - 后台正在测试心率，直接监听测试结果... + 后台正在测试体温，直接监听测试结果… 后台测试服务繁忙，请稍后再试！ 提醒 确认 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 0e9a557..06ca701 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -12,7 +12,7 @@ 未配戴設備 App发生异常 - 後臺正在測試心率，直接監聽測試結果... + 後臺正在測試体温，直接監聽測試結果... 後臺測試服務繁忙，請稍後再試！ 提醒 確認 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0e9a557..06ca701 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -12,7 +12,7 @@ 未配戴設備 App发生异常 - 後臺正在測試心率，直接監聽測試結果... + 後臺正在測試体温，直接監聽測試結果... 後臺測試服務繁忙，請稍後再試！ 提醒 確認 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0977932..6de39e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ "--.- " App发生异常 - 后台正在测试心率，直接监听测试结果... + 后台正在测试体温，直接监听测试结果… 后台测试服务繁忙，请稍后再试！ 提醒 确认 diff --git a/app/version_code.properties b/app/version_code.properties index 53be052..00368b7 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Aug 03 15:02:28 CST 2021 -VERSION_CODE=29 +#Wed Mar 09 14:41:41 CST 2022 +VERSION_CODE=30