新增微循环看板类型，发版本时注意修改app名称和logo

app/build.gradle

@@ -35,6 +35,10 @@ android {
             //守护之影睡眠看板
             //applicationId "com.example.informationkanban.s65_shzy_sleep"
         }
+        else if ("s64_wxh" == project.rootProject.ext.type) {
+            //微循环看板
+            applicationId "com.example.informationkanban.wxh"
+        }
         else {
             applicationId "com.example.informationkanban"
         }
@@ -70,7 +74,9 @@ android {
 
         println 'config ext.type ===== ' + project.rootProject.ext.type
 
-        if ("s64_ldjc" == project.rootProject.ext.type || "s65_shzy" == project.rootProject.ext.type) {
+        if ("s64_ldjc" == project.rootProject.ext.type
+                || "s65_shzy" == project.rootProject.ext.type
+                || "s64_wxh" == project.rootProject.ext.type) {
             main.manifest.srcFile 'src/main/s64/AndroidManifest.xml'
         } else {
             main.manifest.srcFile 'src/main/AndroidManifest.xml'

app/src/main/java/com/example/informationkanban/MainActivity.java

@@ -73,6 +73,8 @@ public class MainActivity extends AppCompatActivity {
             url = NetFunctionConfig.getCBDS64Url();
         } else if (BuildConfig.type.equalsIgnoreCase("s65_shzy")) {
             url = NetFunctionConfig.getWdklS65Url();
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_wxh")) {
+            url = NetFunctionConfig.getWxhUrl();
         }
 
         if (TextUtils.isEmpty(url)) {
@@ -145,6 +147,8 @@ public class MainActivity extends AppCompatActivity {
             myUrl = NetFunctionConfig.getWdklS65Url();
         } else if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             myUrl = NetFunctionConfig.getCBDS64Url() + MAC;
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_wxh")) {
+            myUrl = NetFunctionConfig.getWxhUrl();
         } else {
             //都要带token
             myUrl = NetFunctionConfig.getCBDUrl() + MAC;

app/src/main/java/com/example/informationkanban/TBSMainActivity.java

@@ -27,6 +27,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.example.informationkanban.dialog.UrlConfigDialogHelper;
+import com.example.informationkanban.utils.AppUtil;
 import com.example.informationkanban.utils.GetInformationUtils;
 import com.example.informationkanban.utils.LocaleMangerUtils;
 import com.example.informationkanban.utils.NetFunctionConfig;
@@ -68,6 +69,10 @@ public class TBSMainActivity extends AppCompatActivity {
         String url = NetFunctionConfig.getCBDUrl();
         if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             url = NetFunctionConfig.getCBDS64Url();
+        } else if (BuildConfig.type.equalsIgnoreCase("s65_shzy")) {
+            url = NetFunctionConfig.getWdklS65Url();
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_wxh")) {
+            url = NetFunctionConfig.getWxhUrl();
         }
 
         if (TextUtils.isEmpty(url)) {
@@ -114,12 +119,19 @@ public class TBSMainActivity extends AppCompatActivity {
         initJavaScriptInterface();
 
         //String myUrl = "192.168.1.196:8080";
-        String myUrl = NetFunctionConfig.getCBDUrl();
-        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
+        String myUrl;
+        if (BuildConfig.type.equalsIgnoreCase("s65_shzy")) {
+            myUrl = NetFunctionConfig.getWdklS65Url();
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             myUrl = NetFunctionConfig.getCBDS64Url() + MAC;
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_wxh")) {
+            myUrl = NetFunctionConfig.getWxhUrl();
+        } else {
+            //都要带token
+            myUrl = NetFunctionConfig.getCBDUrl() + MAC;
         }
 
-        //Toast.makeText(TBSMainActivity.this, "fetch: " + myUrl, Toast.LENGTH_LONG).show();
+        Toast.makeText(TBSMainActivity.this, "正在加载数据，请稍后...", Toast.LENGTH_LONG).show();
 
         webView.loadUrl(myUrl);
 

app/src/main/java/com/example/informationkanban/utils/NetFunctionConfig.java

@@ -32,6 +32,7 @@ public class NetFunctionConfig {
     private static final String KEY_CBD_URL = "KEY_CBD_URL";
     private static final String KEY_CBD_S64_URL = "KEY_CBD_S64_URL";
     private static final String KEY_WDKL_S65_URL = "KEY_WDKL_S65_URL";
+    private static final String KEY_WDKL_WXH_URL = "KEY_WDKL_WXH_URL";
 
     private static final String KEY_MODE = "KEY_MODE";
     private static final String KEY_PART_ID = "KEY_PART_ID";
@@ -149,6 +150,15 @@ public class NetFunctionConfig {
         getEditor().putString(KEY_WDKL_S65_URL, url).apply();
     }
 
+    public static String getWxhUrl() {
+        //微循环看板
+        return getSP().getString(KEY_WDKL_WXH_URL, "http://board.microcirculation.wdklian.com");
+    }
+
+    public static void setWxhUrl(String url) {
+        getEditor().putString(KEY_WDKL_WXH_URL, url).apply();
+    }
+
 
     private static SharedPreferences getSP() {
         return MyApplication.getInstance().getSharedPreferences(INFORMATION_KAN_BAN_KEY, Context.MODE_PRIVATE);

app/src/main/res/values-es/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">CBD</string>
+    <string name="app_name">Board</string>
 
     <string name="setting_language">Configuración de idioma</string>
     <string name="setting_change_server">Configuración del servidor</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -9,6 +9,7 @@
     <!--<string name="app_name">守护之影</string>-->
 
     <!--<string name="app_name">守护之影睡眠看板</string>-->
+    <!--<string name="app_name">微循环看板</string>-->
 
     <string name="setting_language">语言设置</string>
     <string name="setting_change_server">修改服务器地址</string>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">CBD</string>
+    <string name="app_name">Board</string>
 
     <string name="setting_language">Language set</string>
     <string name="setting_change_server">Change server</string>

build.gradle

@@ -14,6 +14,7 @@ buildscript {
     }
 
     //CBD看板类型：s32_ldj=32寸律动家，s32_hjsm=32寸黄金睡眠，s64_ldjc=64寸律动检测，s65_hjsm=65寸黄金睡眠，s65_shzy=65寸守护之影
+    //微循环看板:s64_wxh
     ext.type = "s64_ldjc"
 }