修改不同app名称及包名，升级版本到1.1.5

app/build.gradle

@@ -13,11 +13,21 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
     defaultConfig {
-        if ("s64" == type) {
+        if ("s32_ldj" == project.rootProject.ext.type) {
+            //32寸律动家
+            applicationId "com.example.informationkanban"
+        }
+        else if ("s32_hjsm" == project.rootProject.ext.type) {
+            //32寸黄金睡眠
+            applicationId "com.example.informationkanban.s32_hjsm"
+        }
+        else if ("s64_ldjc" == project.rootProject.ext.type) {
+            //64寸律动检测
             applicationId "com.example.informationkanban.s64"
         }
-        else if ("s65" == type) {
-            applicationId "com.example.informationkanban.s65"
+        else if ("s65_hjsm" == project.rootProject.ext.type) {
+            //65寸黄金睡眠
+            applicationId "com.example.informationkanban.s65_hjsm"
         }
         else {
             applicationId "com.example.informationkanban"
@@ -26,7 +36,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 1
-        versionName "1.1.4_${project.rootProject.ext.type}"
+        versionName "1.1.5_${project.rootProject.ext.type}"
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,9 +62,9 @@ android {
             jniLibs.srcDirs = ['libs']
         }
 
-        println 'config ext.type ===== ' + type
+        println 'config ext.type ===== ' + project.rootProject.ext.type
 
-        if ("s64" == type) {
+        if ("s64_ldjc" == 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

@@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
         MAC = GetInformationUtils.getIMEI(this);
 
         String url = NetFunctionConfig.getCBDUrl();
-        if (BuildConfig.type.equalsIgnoreCase("s64")) {
+        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             url = NetFunctionConfig.getCBDS64Url();
         }
 
@@ -94,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
         String myUrl = NetFunctionConfig.getCBDUrl();
 
         //例如：http://cbd.wdklian.com?token=123456
-        if (BuildConfig.type.equalsIgnoreCase("s64")) {
+        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             myUrl = NetFunctionConfig.getCBDS64Url() + 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.GetInformationUtils;
 import com.example.informationkanban.utils.LocaleMangerUtils;
 import com.example.informationkanban.utils.NetFunctionConfig;
 import com.tencent.smtt.export.external.interfaces.GeolocationPermissionsCallback;
@@ -41,6 +42,7 @@ public class TBSMainActivity extends AppCompatActivity {
     private com.tencent.smtt.sdk.WebView webView;
 
     private long clickTime = 0;
+    private String MAC = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,7 +63,14 @@ public class TBSMainActivity extends AppCompatActivity {
 
         init();
 
-        if (TextUtils.isEmpty(NetFunctionConfig.getCBDUrl())) {
+        MAC = GetInformationUtils.getIMEI(this);
+
+        String url = NetFunctionConfig.getCBDUrl();
+        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
+            url = NetFunctionConfig.getCBDS64Url();
+        }
+
+        if (TextUtils.isEmpty(url)) {
             //url为空则需要手动配置
             UrlConfigDialogHelper.showDialog(TBSMainActivity.this);
         } else {
@@ -106,6 +115,9 @@ public class TBSMainActivity extends AppCompatActivity {
 
         //String myUrl = "192.168.1.196:8080";
         String myUrl = NetFunctionConfig.getCBDUrl();
+        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
+            myUrl = NetFunctionConfig.getCBDS64Url() + MAC;
+        }
 
         //Toast.makeText(TBSMainActivity.this, "fetch: " + myUrl, Toast.LENGTH_LONG).show();
 

app/src/main/java/com/example/informationkanban/dialog/UrlConfigDialogHelper.java

@@ -44,7 +44,7 @@ public class UrlConfigDialogHelper {
         });
 
         save.setOnClickListener(v -> {
-            if (BuildConfig.type.equalsIgnoreCase("s64")) {
+            if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
                 NetFunctionConfig.setCBDS64Url(url_text.getText().toString());
             } else {
                 NetFunctionConfig.setCBDUrl(url_text.getText().toString());

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

@@ -3,6 +3,7 @@ package com.example.informationkanban.utils;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.example.informationkanban.BuildConfig;
 import com.example.informationkanban.application.MyApplication;
 
 public class NetFunctionConfig {
@@ -100,10 +101,23 @@ public class NetFunctionConfig {
     }
 
     public static String getCBDUrl() {
-        //return getSP().getString(KEY_CBD_URL, "http://cbd.s32.wdklian.com");
-        return getSP().getString(KEY_CBD_URL, "http://cbd.sleep32.wdklian.com");  //32寸黄金睡眠看板(维鼎床垫)
+        //return getSP().getString(KEY_CBD_URL, "http://cbd.s32.wdklian.com");  //32寸律动家
+        //return getSP().getString(KEY_CBD_URL, "http://cbd.sleep32.wdklian.com");  //32寸黄金睡眠看板(维鼎床垫)
         //return getSP().getString(KEY_CBD_URL, "http://cbd.wdklian.com");  //65寸黄金睡眠看板
         //return getSP().getString(KEY_CBD_URL, "");
+
+        if (BuildConfig.type.equalsIgnoreCase("s32_ldj")) {
+            //32寸律动家
+            return getSP().getString(KEY_CBD_URL, "http://cbd.s32.wdklian.com");
+        } else if (BuildConfig.type.equalsIgnoreCase("s32_hjsm")) {
+            //32寸黄金睡眠
+            return getSP().getString(KEY_CBD_URL, "http://cbd.sleep32.wdklian.com");
+        } else if (BuildConfig.type.equalsIgnoreCase("s65_hjsm")) {
+            //65寸黄金睡眠
+            return getSP().getString(KEY_CBD_URL, "http://cbd.wdklian.com");
+        } else {
+            return getSP().getString(KEY_CBD_URL, "");
+        }
     }
 
     public static void setCBDUrl(String url) {
@@ -111,8 +125,9 @@ public class NetFunctionConfig {
     }
 
     public static String getCBDS64Url() {
-        //return getSP().getString(KEY_CBD_URL, "http://cbd.s64.wdklian.com/#/?token=");
-        return getSP().getString(KEY_CBD_S64_URL, "");
+        //64寸律动检测
+        return getSP().getString(KEY_CBD_URL, "http://cbd.s64.wdklian.com/#/?token=");
+        //return getSP().getString(KEY_CBD_S64_URL, "");
     }
 
     public static void setCBDS64Url(String url) {

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

@@ -1,10 +1,10 @@
 <resources>
-    <!--s32寸app名称-->
+    <!--s32寸律动家-->
     <!--<string name="app_name">CBD律动家</string>-->
-    <!--s32,s65寸维鼎床垫app名称-->
-    <string name="app_name">CBD黄金睡眠</string>
-    <!--s64寸app名称-->
-    <!--<string name="app_name">CBD律动检测</string>-->
+    <!--s32,s65寸黄金睡眠(维鼎床垫)-->
+    <!--<string name="app_name">CBD黄金睡眠</string>-->
+    <!--s64寸律动检测-->
+    <string name="app_name">CBD律动检测</string>
 
     <string name="setting_language">语言设置</string>
     <string name="setting_change_server">修改服务器地址</string>

build.gradle

@@ -13,8 +13,8 @@ buildscript {
         // in the individual module build.gradle files
     }
 
-    //CBD看板类型：s32=32寸看板，s64=64寸看板，s65=65寸黄金睡眠看板
-    ext.type = "s32"
+    //CBD看板类型：s32_ldj=32寸律动家，s32_hjsm=32寸黄金睡眠，s64_ldjc=64寸律动检测，s65_hjsm=65寸黄金睡眠
+    ext.type = "s64_ldjc"
 }
 
 allprojects {