32寸看板修改url，更新logo，修改app名称，其他优化

app/build.gradle

@@ -55,11 +55,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     //implementation 'com.blankj:utilcode:1.9.8'
 
@@ -91,5 +91,5 @@ dependencies {
     /**
      *   突破方法数限制
      */
-    compile 'com.android.support:multidex:1.0.2'
+    compile 'com.android.support:multidex:1.0.3'
 }

app/src/main/AndroidManifest.xml

@@ -51,6 +51,7 @@
 
         <activity android:name=".MainActivity"
             android:screenOrientation="nosensor"
+            android:theme="@style/NoTitleFullscreen"
             android:launchMode="singleTask">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />

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

@@ -22,15 +22,10 @@ import android.webkit.WebViewClient;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.example.informationkanban.application.MyApplication;
 import com.example.informationkanban.common.Constant;
 import com.example.informationkanban.common.MessageEvent;
 import com.example.informationkanban.dialog.UrlConfigDialogHelper;
 import com.example.informationkanban.tcp.TcpClient;
-import com.example.informationkanban.tcp.dto.TcpModel;
-import com.example.informationkanban.tcp.enums.TcpAction;
-import com.example.informationkanban.utils.AppUtil;
 import com.example.informationkanban.utils.GetInformationUtils;
 import com.example.informationkanban.utils.LocaleMangerUtils;
 import com.example.informationkanban.utils.NetFunctionConfig;
@@ -47,7 +42,7 @@ public class MainActivity extends AppCompatActivity {
 
     private int hours = 8;
     private int freeTimes = 0;
-    private long clickTime = 0;
+    private long backClickTime = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -218,11 +213,11 @@ public class MainActivity extends AppCompatActivity {
 
             long currentTime = System.currentTimeMillis();
             // 3秒内连按两次后退按钮，退出应用
-            if (currentTime - clickTime < 3000) {
+            if (currentTime - backClickTime < 3000) {
                 finish();
             } else {
                 Toast.makeText(getApplicationContext(), "再按一次返回键退出", Toast.LENGTH_SHORT).show();
-                clickTime = currentTime;
+                backClickTime = currentTime;
             }
 
             return true;

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

@@ -2,12 +2,17 @@ package com.example.informationkanban.dialog;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 
 import com.example.informationkanban.R;
+import com.example.informationkanban.utils.AppUtil;
 import com.example.informationkanban.utils.NetFunctionConfig;
 
 public class UrlConfigDialogHelper {
@@ -40,11 +45,29 @@ public class UrlConfigDialogHelper {
             if (alertDialog != null) {
                 alertDialog.dismiss();
             }
+
+            AppUtil.restartApp(activity);
         });
 
         alertDialog = builder.create();
-        alertDialog.setCanceledOnTouchOutside(true);
-        alertDialog.setCancelable(true);
+        alertDialog.setCanceledOnTouchOutside(false);
+        alertDialog.setCancelable(false);
         alertDialog.show();
+
+        try {
+            //默认隐藏软键盘
+            AppUtil.hideInputKeyboard(activity, alertDialog.getWindow().getDecorView().getWindowToken());
+
+            Window window = alertDialog.getWindow();
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+        } catch (Exception e) {
+            //
+        }
     }
 }

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

@@ -4,7 +4,10 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.IBinder;
 import android.text.TextUtils;
+import android.util.Log;
+import android.view.inputmethod.InputMethodManager;
 
 import com.example.informationkanban.InitActivity;
 import com.example.informationkanban.MainActivity;
@@ -179,4 +182,15 @@ public class AppUtil {
             e.printStackTrace();
         }
     }
+
+    //隐藏软键盘
+    public static void hideInputKeyboard(Context context, IBinder token) {
+        try {
+            Log.d("keyboard", "hide input keyboard ===== ");
+            InputMethodManager mInputKeyBoard = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            mInputKeyBoard.hideSoftInputFromWindow(token, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -99,7 +99,7 @@ public class NetFunctionConfig {
     }
 
     public static String getCBDUrl() {
-        return getSP().getString(KEY_CBD_URL, "");
+        return getSP().getString(KEY_CBD_URL, "http://cbd.s32.wdklian.com");
     }
 
     public static void setCBDUrl(String url) {

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">CBD律动健康</string>
+    <string name="app_name">CBD律动家</string>
     <!--<string name="app_name">输液看板</string>-->
 
     <string name="setting_language">语言设置</string>

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

@@ -23,4 +23,10 @@
         <item name="android:icon">@drawable/ic_search</item>
     </style>
 
+    <style name="NoTitleFullscreen" parent="AppTheme">
+        <item name="android:windowFullscreen">true</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
 </resources>