浏览代码

1.修改字体颜色

2.修改密码输入提示。
20241218TB223FC(测试jar包)
wangwanlei 11 个月前
父节点
当前提交
cabe72d70a

+ 5
- 3
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt 查看文件

487
             viewModel.autoAppData.collect{
487
             viewModel.autoAppData.collect{
488
                 it?.let {
488
                 it?.let {
489
                     //连接不为空,并且应用已安装则跳转应用
489
                     //连接不为空,并且应用已安装则跳转应用
490
-                      it.authUrl="com.xhkjedu.xh_control_browser.MainActivit111y"
491
-                      it.appPackage="com.xhkjedu.xh_control_browser"
490
+                     /* it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
491
+                      it.appPackage="com.xhkjedu.xh_control_browser"*/
492
                     LogShow("锁定了吧"+mainLockFlag)
492
                     LogShow("锁定了吧"+mainLockFlag)
493
                     if (!mainLockFlag){
493
                     if (!mainLockFlag){
494
                         if (it.authUrl!=null&&AppUtils.isAppInstalled(this@MainActivity,it.appPackage)){
494
                         if (it.authUrl!=null&&AppUtils.isAppInstalled(this@MainActivity,it.appPackage)){
963
                 location.address=addrStr
963
                 location.address=addrStr
964
                 try {
964
                 try {
965
                     val lastLocation = PadLocationConst.lastLocation
965
                     val lastLocation = PadLocationConst.lastLocation
966
-                    if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)){
966
+                    if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)&&!addrStr.isNullOrBlank()){
967
                         lastLocation.lat=location.lat
967
                         lastLocation.lat=location.lat
968
                         lastLocation.lon=location.lon
968
                         lastLocation.lon=location.lon
969
                         ManageApplication.getDeviceInfo()?.let {
969
                         ManageApplication.getDeviceInfo()?.let {
1549
                                 } catch (e: Exception) {
1549
                                 } catch (e: Exception) {
1550
 
1550
 
1551
                                 }
1551
                                 }
1552
+                            }else{
1553
+                                Toast("密码错误!")
1552
                             }
1554
                             }
1553
                         }
1555
                         }
1554
                         cancelTv.setOnClickListener {
1556
                         cancelTv.setOnClickListener {

+ 2
- 2
app/src/main/res/layout/activity_main.xml 查看文件

152
             android:layout_gravity="bottom|left"
152
             android:layout_gravity="bottom|left"
153
             android:layout_marginLeft="10dp"
153
             android:layout_marginLeft="10dp"
154
             android:layout_marginBottom="10dp"
154
             android:layout_marginBottom="10dp"
155
-            android:textColor="#798CB5"
155
+            android:textColor="#253A70"
156
             android:textSize="8sp" />
156
             android:textSize="8sp" />
157
 
157
 
158
         <LinearLayout
158
         <LinearLayout
177
                 android:layout_width="wrap_content"
177
                 android:layout_width="wrap_content"
178
                 android:layout_height="wrap_content"
178
                 android:layout_height="wrap_content"
179
                 android:text="@string/netset"
179
                 android:text="@string/netset"
180
-                android:textColor="#798CB5"
180
+                android:textColor="#253A70"
181
                 android:textSize="8sp" />
181
                 android:textSize="8sp" />
182
         </LinearLayout>
182
         </LinearLayout>
183
     </FrameLayout>
183
     </FrameLayout>

+ 1
- 0
app/src/main/res/layout/layout_edit_dialog.xml 查看文件

23
         android:layout_marginTop="82dp"
23
         android:layout_marginTop="82dp"
24
         android:background="@null"
24
         android:background="@null"
25
         android:gravity="center_vertical"
25
         android:gravity="center_vertical"
26
+        android:digits="@string/psw_style"
26
         android:hint="@string/inputregioncode"
27
         android:hint="@string/inputregioncode"
27
         android:singleLine="true"
28
         android:singleLine="true"
28
         android:maxLength="20"
29
         android:maxLength="20"

正在加载...
取消
保存