update bg

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 208123b..3c7772a 100644 (file)
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 610ece4..7312fde 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 20,
-      "versionName": "202102011414",
-      "outputFile": "ICL02Temperature_V20_202102011414_release.apk"
+      "versionCode": 21,
+      "versionName": "202105311617",
+      "outputFile": "ICL02Temperature_V21_202105311617_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/temperature/utils/ServiceUtil.kt b/app/src/main/java/com/ic/temperature/utils/ServiceUtil.kt
deleted file mode 100644 (file)
index d6158cc..0000000
--- a/app/src/main/java/com/ic/temperature/utils/ServiceUtil.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ic.temperature.utils
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-
-object ServiceUtil {
-
-    fun startServiceUtil(context: Context, serviceAction: String?, packageName: String?) {
-        val intent = getExplicitIntent(context, Intent(serviceAction))
-        if (intent != null) {
-            intent.setPackage(packageName)
-            context.startService(intent)
-        }
-    }
-
-    fun bindServiceUtil(
-        context: Context,
-        action: String?,
-        connection: ServiceConnection?,
-        pck: String?
-    ) {
-        val targetIntent = getExplicitIntent(context, Intent(action))
-        if (targetIntent != null) {
-            targetIntent.setPackage(pck)
-            context.bindService(targetIntent, connection!!, Context.BIND_AUTO_CREATE)
-        }
-    }
-
-    fun unBindServiceUtil(context: Context, connection: ServiceConnection?) {
-        try {
-            if (connection != null) {
-                context.unbindService(connection)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun getExplicitIntent(context: Context, impl: Intent): Intent? {
-        val resolveInfo = context.packageManager.queryIntentServices(impl, 0)
-        if (resolveInfo.size != 1) return null
-        val intent = Intent(impl)
-        val info = resolveInfo[0].serviceInfo ?: return null
-        intent.component = ComponentName(info.packageName, info.name)
-        return intent
-    }
-}
\ No newline at end of file

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 938d7dc..158e043 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/qs_background"
         tools:context=".AnimalHeatActivity">
 
         <!--只有体温的时候显示，也就是只支持体温，不支持腕温和环境温度-->
@@ -93,11 +92,11 @@
             app:amount="5"
             app:animationDirection="left"
             app:duration="@android:integer/config_mediumAnimTime"
-            app:endColor="@color/teal_A200"
+            app:endColor="#2492F0"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:startColor="@color/lime_A400" />
+            app:startColor="#195180" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline10"

diff --git a/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml b/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml
index f0b7849..f85a93b 100644 (file)
--- a/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml
+++ b/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml
@@ -46,7 +46,7 @@
             android:layout_width="70dp"
             android:layout_height="70dp"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_wrist"
+            android:src="@mipmap/writst_temp_icon"
             app:layout_constraintBottom_toTopOf="@+id/guideline15"
             app:layout_constraintEnd_toStartOf="@+id/guideline11"
             app:layout_constraintStart_toStartOf="@+id/guideline14" />
@@ -80,7 +80,7 @@
             android:layout_height="70dp"
             android:layout_marginBottom="32dp"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_human"
+            android:src="@mipmap/body_temp_icon"
             app:layout_constraintBottom_toTopOf="@+id/guideline12"
             app:layout_constraintEnd_toStartOf="@+id/guideline11" />
 

diff --git a/app/src/main/res/layout/stub_view_just_body_temp.xml b/app/src/main/res/layout/stub_view_just_body_temp.xml
index 69f1a8e..4c29782 100644 (file)
--- a/app/src/main/res/layout/stub_view_just_body_temp.xml
+++ b/app/src/main/res/layout/stub_view_just_body_temp.xml
@@ -32,7 +32,7 @@
             android:layout_height="80dp"
             android:layout_marginStart="8dp"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_human"
+            android:src="@mipmap/body_temp_icon"
             app:layout_constraintBottom_toTopOf="@+id/guideline2"
             app:layout_constraintStart_toStartOf="@+id/guideline4" />
 

diff --git a/app/src/main/res/layout/stub_view_normal_temp.xml b/app/src/main/res/layout/stub_view_normal_temp.xml
index b798807..0e63aa2 100644 (file)
--- a/app/src/main/res/layout/stub_view_normal_temp.xml
+++ b/app/src/main/res/layout/stub_view_normal_temp.xml
@@ -38,9 +38,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@mipmap/qs_background"
-        tools:context=".AnimalHeatActivity">
+        android:background="@mipmap/temperature_bg"
+        android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline"
@@ -56,7 +55,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginEnd="20dp"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_human"
+            android:src="@mipmap/body_temp_icon"
             app:layout_constraintEnd_toStartOf="@+id/guideline7"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -140,7 +139,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginEnd="20dp"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_wrist"
+            android:src="@mipmap/writst_temp_icon"
             android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}"
             app:layout_constraintEnd_toStartOf="@+id/guideline7"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
@@ -151,7 +150,7 @@
             android:layout_height="50dp"
             android:layout_marginEnd="20dp"
             android:background="@android:color/transparent"
-            android:src="@mipmap/outtemp"
+            android:src="@mipmap/evn_temp_icon"
             android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toTopOf="@+id/guideline6"
             app:layout_constraintEnd_toStartOf="@+id/guideline7"

diff --git a/app/src/main/res/mipmap-mdpi/body_temp_icon.png b/app/src/main/res/mipmap-mdpi/body_temp_icon.png
new file mode 100644 (file)
index 0000000..fdc5c83
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/body_temp_icon.png differ

diff --git a/app/src/main/res/mipmap-mdpi/evn_temp_icon.png b/app/src/main/res/mipmap-mdpi/evn_temp_icon.png
new file mode 100644 (file)
index 0000000..a33fac1
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/evn_temp_icon.png differ

diff --git a/app/src/main/res/mipmap-mdpi/qs_background.png b/app/src/main/res/mipmap-mdpi/qs_background.png
deleted file mode 100644 (file)
index 1bc9fbd..0000000
Binary files a/app/src/main/res/mipmap-mdpi/qs_background.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-mdpi/temperature_bg.png b/app/src/main/res/mipmap-mdpi/temperature_bg.png
new file mode 100644 (file)
index 0000000..6124dce
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/temperature_bg.png differ

diff --git a/app/src/main/res/mipmap-mdpi/writst_temp_icon.png b/app/src/main/res/mipmap-mdpi/writst_temp_icon.png
new file mode 100644 (file)
index 0000000..35c2d75
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/writst_temp_icon.png differ

diff --git a/app/version_code.properties b/app/version_code.properties
index eb67e12..610f5a5 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Feb 01 14:14:46 CST 2021
-VERSION_CODE=20
+#Mon May 31 16:17:09 CST 2021
+VERSION_CODE=21