From: kfl_614 Date: Mon, 30 Nov 2020 07:17:09 +0000 (+0800) Subject: adjust temperature data dispatch logic. X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=78a5f981905fad092effd4b469d4d9faa714c553;p=launcher4.git adjust temperature data dispatch logic. --- diff --git a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java index 891454e..26e4d49 100644 --- a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java +++ b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java @@ -82,6 +82,9 @@ public class AnimalHeatActivity extends AppCompatActivity implements private ActivityAnimalHeatBinding heatBinding; + //是否有配戴，如果没有配戴，就不更新UI了。 + private boolean mHasWear = false; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -94,6 +97,7 @@ public class AnimalHeatActivity extends AppCompatActivity implements //接收到了佩戴的广播去获取数据 //true表示没佩戴了，false表示有佩戴 boolean isAntiOff = SystemUtils.getSystemPropertiesBoolean("persist.sys.ic_antioff", true); + this.mHasWear = !isAntiOff; IcLog.i(TAG, "isAntiOff == > " + isAntiOff); //如果已经佩戴了，就去获取数据 if (!isAntiOff && mService == null) { @@ -181,7 +185,11 @@ public class AnimalHeatActivity extends AppCompatActivity implements IcLog.i(TAG, "tempOut -- > " + tempOut); //这里有个瞬间过大的bug，人腕温不可能大于45度的。 currentTestType = type; - // + if (!mHasWear) { + //没有配戴，不对数据进行更新 + IcLog.d(TAG, "has not wear device."); + return; + } switch (type) { case STATE_TESTING: if (heatBinding.getDisableWristTemp()) { @@ -236,12 +244,7 @@ public class AnimalHeatActivity extends AppCompatActivity implements mService = ITempRemoteService.Stub.asInterface(service); //把回调接口设置给对方 mService.registerCallback(tempInterface); - //调用开始查询温度 - mService.onStartQueryTemp(); - //展示Loading，也 就是进度条那个 - heatBinding.setShowLoading(true); - //设置UI正在检测中 - heatBinding.setCheckTips(tipsCheck); + getRemoteData(); } catch (Exception e) { e.printStackTrace(); } @@ -313,27 +316,35 @@ public class AnimalHeatActivity extends AppCompatActivity implements if (state == STATE_ANTI_OFF) { heatBinding.setCheckTips(getString(R.string.no_wearing_device_tips_text)); //脱落了，给出提示 + //停止Loading + heatBinding.setShowLoading(false); } else if (state == STATE_ANTI_ON && mService == null) { bindWorkService(AnimalHeatActivity.this); } - if (state == STATE_ANTI_ON && currentTestType == STATE_TEST_END) { + mHasWear = state == STATE_ANTI_ON; + if (mHasWear) { //判断状态，如果已经检测完了，就显示检测完成 // 按客户需求，马上进来显示检测完成，看起来不爽 //那就再次检测吧，底层做了处理，多次调用测试也没关系，如果判断到繁忙的话会不处理的。 //heatBinding.setCheckTips(getString(R.string.activity_temp_tips_end)); - + getRemoteData(); } } }; private void getRemoteData() { - + IcLog.d(TAG, "getRemoteData..."); if (mService == null) { return; } try { + //调用开始查询温度 mService.onStartQueryTemp(); + //展示Loading，也 就是进度条那个 + heatBinding.setShowLoading(true); + //设置UI正在检测中 + heatBinding.setCheckTips(tipsCheck); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index f9f53aa..4f05436 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -146,4 +146,5 @@ MEASURING COMPLETE TEMPOut + Not wearing a device diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 487d6ac..718df72 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -100,4 +100,5 @@ Fri Sat Sun + Not wearing a device diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3e80625..a876eb7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -139,4 +139,5 @@ QRコード 体温 言語 + 未着用設備 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 985fdee..73c5f23 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -100,4 +100,5 @@ Пт Сб Вс + неопределённое оборудование  diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 7c6b8e0..c53046d 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -137,4 +137,5 @@ ℃ การวัดอุณหภูมิ ดำเนินการ + อุปกรณ์ที่ไม่ติดตั้ง diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d75e659..5c47436 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,8 +1,8 @@ - 爱健康 + 爱健康 心率监控 - 应用程序启动失败 + 应用程序启动失败 手表 @@ -144,4 +144,5 @@ 正在测量 测量完成 环境 + 未配戴设备 \ 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 f5bdd2e..11c9dca 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -130,4 +130,5 @@ Fri Sat Sun + 未配戴設備 \ 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 aaf407f..1279cd7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -130,4 +130,6 @@ Fri Sat Sun + + 未配戴設備 \ No newline at end of file