Browse Source

新增65寸守护之影版本

weizhengliang 8 months ago
parent
commit
4b1eb268ae

+ 4 - 0
app/build.gradle

@@ -29,6 +29,10 @@ android {
             //65寸黄金睡眠
             applicationId "com.example.informationkanban.s65_hjsm"
         }
+        else if ("s65_shzy" == project.rootProject.ext.type) {
+            //65寸守护之影
+            applicationId "com.example.informationkanban.s65_shzy"
+        }
         else {
             applicationId "com.example.informationkanban"
         }

+ 5 - 1
app/src/main/java/com/example/informationkanban/MainActivity.java

@@ -59,6 +59,8 @@ public class MainActivity 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();
         }
 
         if (TextUtils.isEmpty(url)) {
@@ -127,7 +129,9 @@ public class MainActivity extends AppCompatActivity {
         String myUrl;
 
         //例如:http://cbd.wdklian.com?token=123456
-        if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
+        if (BuildConfig.type.equalsIgnoreCase("s65_shzy")) {
+            myUrl = NetFunctionConfig.getWdklS65Url();
+        } else if (BuildConfig.type.equalsIgnoreCase("s64_ldjc")) {
             myUrl = NetFunctionConfig.getCBDS64Url() + MAC;
         } else {
             //都要带token

+ 11 - 1
app/src/main/java/com/example/informationkanban/utils/NetFunctionConfig.java

@@ -31,6 +31,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_MODE = "KEY_MODE";
     private static final String KEY_PART_ID = "KEY_PART_ID";
@@ -126,7 +127,7 @@ public class NetFunctionConfig {
 
     public static String getCBDS64Url() {
         //64寸律动检测
-        return getSP().getString(KEY_CBD_URL, "http://cbd.s64.wdklian.com/#/?token=");
+        return getSP().getString(KEY_CBD_S64_URL, "http://cbd.s64.wdklian.com/#/?token=");
         //return getSP().getString(KEY_CBD_S64_URL, "");
     }
 
@@ -134,6 +135,15 @@ public class NetFunctionConfig {
         getEditor().putString(KEY_CBD_S64_URL, url).apply();
     }
 
+    public static String getWdklS65Url() {
+        //65寸守护之影
+        return getSP().getString(KEY_WDKL_S65_URL, "http://board.sleep.wdklian.com");
+    }
+
+    public static void setWdklS65Url(String url) {
+        getEditor().putString(KEY_WDKL_S65_URL, url).apply();
+    }
+
 
     private static SharedPreferences getSP() {
         return MyApplication.getInstance().getSharedPreferences(INFORMATION_KAN_BAN_KEY, Context.MODE_PRIVATE);

BIN
app/src/main/res/mipmap-hdpi/wdkl_logo.png


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

@@ -5,6 +5,8 @@
     <!--<string name="app_name">CBD黄金睡眠</string>-->
     <!--s64寸律动检测-->
     <string name="app_name">CBD律动检测</string>
+    <!--s65寸守护之影-->
+    <!--<string name="app_name">守护之影</string>-->
 
     <string name="setting_language">语言设置</string>
     <string name="setting_change_server">修改服务器地址</string>

+ 2 - 0
app/src/main/s64/AndroidManifest.xml

@@ -24,6 +24,8 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
 
+    <!--android:icon="@mipmap/wdkl_logo"-->
+    <!--android:icon="@mipmap/cbd_logo"-->
     <application
         android:name=".application.MyApplication"
         android:allowBackup="true"

+ 1 - 1
build.gradle

@@ -13,7 +13,7 @@ buildscript {
         // in the individual module build.gradle files
     }
 
-    //CBD看板类型:s32_ldj=32寸律动家,s32_hjsm=32寸黄金睡眠,s64_ldjc=64寸律动检测,s65_hjsm=65寸黄金睡眠
+    //CBD看板类型:s32_ldj=32寸律动家,s32_hjsm=32寸黄金睡眠,s64_ldjc=64寸律动检测,s65_hjsm=65寸黄金睡眠,s65_shzy=65寸守护之影
     ext.type = "s64_ldjc"
 }