修改64寸看板包名及版本名称，修改32寸界面跟随系统自动旋转，修改32寸和64寸使用不同url，修改32寸和64寸不同app名称，升级版本到1.1.1

app/build.gradle

@@ -13,11 +13,16 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
     defaultConfig {
-        applicationId "com.example.informationkanban"
+        if ("s64" == type) {
+            applicationId "com.example.informationkanban.s64"
+        } else {
+            applicationId "com.example.informationkanban"
+        }
+
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 1
-        versionName "1.1.0_s32"
+        versionName "1.1.1_${project.rootProject.ext.type}"
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <activity android:name=".InitActivity"
-            android:screenOrientation="nosensor"
+            android:screenOrientation="sensor"
             android:launchMode="singleTask">
             <!--<intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />
@@ -46,11 +46,11 @@
         </activity>
 
         <activity android:name=".XwalkMainActivity"
-            android:screenOrientation="nosensor"
+            android:screenOrientation="sensor"
             android:launchMode="singleTask"/>
 
         <activity android:name=".MainActivity"
-            android:screenOrientation="nosensor"
+            android:screenOrientation="sensor"
             android:theme="@style/NoTitleFullscreen"
             android:launchMode="singleTask">
             <intent-filter android:priority="10">
@@ -60,7 +60,7 @@
         </activity>
 
         <activity android:name=".TBSMainActivity"
-            android:screenOrientation="nosensor"
+            android:screenOrientation="sensor"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:launchMode="singleTask">
         </activity>

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

@@ -76,7 +76,12 @@ public class MainActivity extends AppCompatActivity {
 
         MAC = GetInformationUtils.getIMEI(this);
 
-        if (TextUtils.isEmpty(NetFunctionConfig.getCBDUrl())) {
+        String url = NetFunctionConfig.getCBDUrl();
+        if (BuildConfig.type.equalsIgnoreCase("s64")) {
+            url = NetFunctionConfig.getCBDS64Url();
+        }
+
+        if (TextUtils.isEmpty(url)) {
             //url为空则需要手动配置
             UrlConfigDialogHelper.showDialog(MainActivity.this);
         } else {
@@ -158,6 +163,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         Toast.makeText(MainActivity.this, "fetch: " + myUrl, Toast.LENGTH_LONG).show();
+        Log.e(TAG, "load url: " + myUrl);
 
         webView.loadUrl(myUrl);
         //系统默认会通过手机浏览器打开网页，为了能够直接通过WebView显示网页，则必须设置

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

@@ -109,7 +109,7 @@ public class NetFunctionConfig {
     }
 
     public static String getCBDS64Url() {
-        //return getSP().getString(KEY_CBD_URL, "http://cbd.s64.wdklian.com?token=");
+        //return getSP().getString(KEY_CBD_URL, "http://cbd.s64.wdklian.com/#/?token=");
         return getSP().getString(KEY_CBD_S64_URL, "");
     }
 

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

@@ -1,6 +1,8 @@
 <resources>
-    <string name="app_name">CBD律动家</string>
-    <!--<string name="app_name">输液看板</string>-->
+    <!--s32寸app名称-->
+    <!--<string name="app_name">CBD律动家</string>-->
+    <!--s64寸app名称-->
+    <string name="app_name">CBD律动检测</string>
 
     <string name="setting_language">语言设置</string>
     <string name="setting_change_server">修改服务器地址</string>

build.gradle

@@ -14,7 +14,7 @@ buildscript {
     }
 
     //CBD看板类型：s32=32寸看板，s64=64寸看板
-    ext.type = "s32"
+    ext.type = "s64"
 }
 
 allprojects {