observe health and temperature data.

diff --git a/app/release/ICLoopPageLauncher_V18_202106282240_release.apk b/app/release/ICLoopPageLauncher_V19_202107091744_release.apk
similarity index 54%
rename from app/release/ICLoopPageLauncher_V18_202106282240_release.apk
rename to app/release/ICLoopPageLauncher_V19_202107091744_release.apk
index d6d4db3..dea3650 100644 (file)
Binary files a/app/release/ICLoopPageLauncher_V18_202106282240_release.apk and b/app/release/ICLoopPageLauncher_V19_202107091744_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 066c024..3193165 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 1,
       "versionName": "1.0",
-      "outputFile": "ICLoopPageLauncher_V18_202106282240_release.apk"
+      "outputFile": "ICLoopPageLauncher_V19_202107091744_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/launcher/view/MainPageView.java b/app/src/main/java/com/ic/launcher/view/MainPageView.java
index 26ec38b..a48145d 100644 (file)
--- a/app/src/main/java/com/ic/launcher/view/MainPageView.java
+++ b/app/src/main/java/com/ic/launcher/view/MainPageView.java
@@ -20,6 +20,10 @@ public class MainPageView extends LinearLayout {
     private TextView dateView;
     private TextView timeView;
     private TextView weekView;
+    private TextView envTempView;
+    private TextView heartRateView;
+    private TextView bloodOxygenView;
+    private TextView bodyTempView;
 
     public MainPageView(@NonNull Context context) {
         this(context, null);
@@ -51,12 +55,27 @@ public class MainPageView extends LinearLayout {
         mainPagerPresenter.weekValue.observe(lifecycleOwner, weekValue -> {
             weekView.setText(weekValue);
         });
+        mainPagerPresenter.bodyTempValue.observe(lifecycleOwner, bodyTempValue -> {
+            bodyTempView.setText(bodyTempValue);
+        });
+        mainPagerPresenter.envTempValue.observe(lifecycleOwner, envTempValue -> {
+            envTempView.setText(envTempValue);
+        });
+        mainPagerPresenter.oxygenValue.observe(lifecycleOwner, oxygenValue -> {
+            bloodOxygenView.setText(oxygenValue);
+        });
+        mainPagerPresenter.heartRate.observe(lifecycleOwner, heartRate -> {
+            heartRateView.setText(heartRate);
+        });
     }
 
     private void initView() {
         dateView = findViewById(R.id.date_tv);
         timeView = findViewById(R.id.time_tv);
         weekView = findViewById(R.id.week_date_tv);
-        // ICLogger.d("init view..." + getChildCount());
+        envTempView = findViewById(R.id.out_temp_tv);
+        heartRateView = findViewById(R.id.heart_rate_tv);
+        bloodOxygenView = findViewById(R.id.blood_oxygen_tv);
+        bodyTempView = findViewById(R.id.body_temp_tv);
     }
 }

diff --git a/app/src/main/res/layout/item_main_page.xml b/app/src/main/res/layout/item_main_page.xml
index 3b72054..b385257 100644 (file)
--- a/app/src/main/res/layout/item_main_page.xml
+++ b/app/src/main/res/layout/item_main_page.xml
@@ -53,8 +53,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
             android:layout_weight="1"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView
@@ -77,8 +77,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
             android:layout_weight="1"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView
@@ -100,8 +100,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
             android:layout_weight="1"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView
@@ -123,8 +123,8 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
             android:layout_weight="1"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b76303d..dcd3ef7 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
     <string name="app_package_name_photo" translatable="false">com.eqc.gallery</string>
     <string name="app_package_name_sms" translatable="false">com.ic.icmms</string>
     <string name="app_package_name_record" translatable="false">com.ic.record</string>
-    <string name="app_package_name_sign" translatable="false">com.ic.sign</string>
+    <string name="app_package_name_sign" translatable="false">com.ic.signin</string>
     <string name="app_package_name_settings" translatable="false">com.ic.setting</string>
 
     <string name="no_application_tips_text">未找到相关应用.</string>

diff --git a/app/version_code.properties b/app/version_code.properties
index 41d4b09..6d25bdc 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jun 28 22:40:21 CST 2021
-VERSION_CODE=18
+#Fri Jul 09 17:44:12 CST 2021
+VERSION_CODE=19