1.修改字体颜色

2.修改密码输入提示。

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -487,8 +487,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             viewModel.autoAppData.collect{
                 it?.let {
                     //连接不为空，并且应用已安装则跳转应用
-                      it.authUrl="com.xhkjedu.xh_control_browser.MainActivit111y"
-                      it.appPackage="com.xhkjedu.xh_control_browser"
+                     /* it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
+                      it.appPackage="com.xhkjedu.xh_control_browser"*/
                     LogShow("锁定了吧"+mainLockFlag)
                     if (!mainLockFlag){
                         if (it.authUrl!=null&&AppUtils.isAppInstalled(this@MainActivity,it.appPackage)){
@@ -963,7 +963,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 location.address=addrStr
                 try {
                     val lastLocation = PadLocationConst.lastLocation
-                    if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)){
+                    if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)&&!addrStr.isNullOrBlank()){
                         lastLocation.lat=location.lat
                         lastLocation.lon=location.lon
                         ManageApplication.getDeviceInfo()?.let {
@@ -1549,6 +1549,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                                 } catch (e: Exception) {
 
                                 }
+                            }else{
+                                Toast("密码错误!")
                             }
                         }
                         cancelTv.setOnClickListener {

app/src/main/res/layout/activity_main.xml

@@ -152,7 +152,7 @@
             android:layout_gravity="bottom|left"
             android:layout_marginLeft="10dp"
             android:layout_marginBottom="10dp"
-            android:textColor="#798CB5"
+            android:textColor="#253A70"
             android:textSize="8sp" />
 
         <LinearLayout
@@ -177,7 +177,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/netset"
-                android:textColor="#798CB5"
+                android:textColor="#253A70"
                 android:textSize="8sp" />
         </LinearLayout>
     </FrameLayout>

app/src/main/res/layout/layout_edit_dialog.xml

@@ -23,6 +23,7 @@
         android:layout_marginTop="82dp"
         android:background="@null"
         android:gravity="center_vertical"
+        android:digits="@string/psw_style"
         android:hint="@string/inputregioncode"
         android:singleLine="true"
         android:maxLength="20"