From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 22 Sep 2021 08:04:35 +0000 (+0800)
Subject: adjust theme.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4e7b4373c83d5e8f77309efa0f6adf6cbdaf0eb5;p=IcBlood.git

adjust theme.
---

diff --git a/app/release/ICL02Blood_V94_202109171032_release.apk b/app/release/ICL02Blood_V97_202109221429_release.apk
similarity index 51%
rename from app/release/ICL02Blood_V94_202109171032_release.apk
rename to app/release/ICL02Blood_V97_202109221429_release.apk
index 28f06bd..ca91ab3 100644
Binary files a/app/release/ICL02Blood_V94_202109171032_release.apk and b/app/release/ICL02Blood_V97_202109221429_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 371ec6f..b8a5962 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":94,"versionName":"202109171032","enabled":true,"outputFile":"ICL02Blood_V94_202109171032_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V94_202109171032_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":97,"versionName":"202109221429","enabled":true,"outputFile":"ICL02Blood_V97_202109221429_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V97_202109221429_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/blood/Gh301Activity.java b/app/src/main/java/com/ic/blood/Gh301Activity.java
index 580d2f8..eb69d53 100644
--- a/app/src/main/java/com/ic/blood/Gh301Activity.java
+++ b/app/src/main/java/com/ic/blood/Gh301Activity.java
@@ -40,8 +40,9 @@ public class Gh301Activity extends AppCompatActivity {
         //persist.sys.health.display.all的值不为空，那么就显示所有，没有选项
         //如果persist.sys.health.display.all为空，那么就显示列表
         //进去之后，Instance可以判断功能项，有的话就显示，没有的的话就不显示
+        //相关说明可以查看http://icfota.snicker.com.cn:8888/www/index.php?m=doc&f=view&docID=12
         String displayTypeList1 = SystemUtils
-                .getSystemPropertiesString("persist.sys.health.display.List1",
+                .getSystemPropertiesString("persist.sys.health.display.list1",
                         "");
         //如果List1为空，或者两个都为空，那么就显示默认的
         if (TextUtils.isEmpty(displayTypeList1)) {
diff --git a/app/src/main/java/com/ic/blood/TestActivity.java b/app/src/main/java/com/ic/blood/TestActivity.java
deleted file mode 100644
index a105da3..0000000
--- a/app/src/main/java/com/ic/blood/TestActivity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ic.blood;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-
-import java.text.SimpleDateFormat;
-
-
-public class TestActivity extends Activity {
-    /**
-     * 主路径
-     */
-    private static final String MAIN_DIR = Environment.getExternalStorageDirectory() + "/ChenJian/CsdnBlog/LogUtil";
-
-    /**
-     * 保存Log的文件
-     */
-    private static final String LOG_FILE = MAIN_DIR + "/log.txt";
-
-    private final static String LOG_FOR_QA = "[log4qa] ";
-    private final static String LOG_FOR_DADIAN = "[log4dadian]";
-
-
-
-    private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        simpleDateFormat.format()
-        LogUtil.d(LOG_FOR_QA, simpleDateFormat.format(time) + " Some place call acquire..." + Log.getStackTraceString(new Throwable()));
-        LogManager.getInstance().init(LOG_FILE);
-        LogUtil.d(LOG_FOR_QA, "发发恭子的博客");
-        LogUtil.e(LOG_FOR_DADIAN, "http://blog.csdn.net/qq_296216078");
-    }
-}
diff --git a/app/src/main/res/layout/fragment_blood.xml b/app/src/main/res/layout/fragment_blood.xml
index e3c0263..f539ec3 100644
--- a/app/src/main/res/layout/fragment_blood.xml
+++ b/app/src/main/res/layout/fragment_blood.xml
@@ -80,7 +80,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="20dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="80dp"
+            android:layout_marginTop="60dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd23062..488f5ef 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,12 +1,13 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:background">@android:color/black</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/black</item>
     </style>
 
     <style name="bloodTextStyle">
diff --git a/app/version_code.properties b/app/version_code.properties
index e7fa18f..db4875b 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Sep 17 10:32:13 CST 2021
-VERSION_CODE=94
+#Wed Sep 22 14:29:50 CST 2021
+VERSION_CODE=97