Browse Source

1.登录时先验证是否存在用户信息,不存在则重新调用登录.

master
wangwanlei 11 months ago
parent
commit
397f5e5df8

+ 19
- 24
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

@@ -58,13 +58,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
58 58
 
59 59
     private var mMyInstallReceiver: AppInstallReceiver? = null
60 60
     private var dataList: ArrayList<AppInfo> = arrayListOf()
61
-
61
+    private var userBean: UserBean? = null
62 62
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
63 63
 
64 64
     override fun initData() {
65
-        var user = spUtils.get("user")
66
-        if (user.isNullOrBlank()) {
67
-            startIntentActivity(LoginActivity().javaClass)
65
+        val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
66
+        if (json==null){
67
+            loginOut()
68
+            return
69
+        }else{
70
+            userBean = json as UserBean
68 71
         }
69 72
         val getAppList1 = AppUtils.GetAppList(this)
70 73
         dataList.addAll(getAppList1)
@@ -75,9 +78,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
75 78
         mBinding.btn.setOnClickListener {
76 79
             startIntentActivity(ManageActivity().javaClass)
77 80
         }
78
-        mBinding.resetbtn.setOnClickListener {
79
-            UIEvent("2005").post()
80
-        }
81 81
         registerAppInstallReceiver()
82 82
         /*
83 83
          使用情况权限
@@ -109,7 +109,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
109 109
                 loginOut()
110 110
             }
111 111
         }
112
-        viewModel.updateInfoData.observe(this){
112
+        viewModel.updateInfoData.observe(this) {
113 113
             //TODO 需要编写更新代码
114 114
         }
115 115
         startWorkManager()
@@ -120,13 +120,17 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
120 120
     }
121 121
 
122 122
     override fun initView() {
123
+        userBean?.let {
124
+          mBinding.usernameTv.text=it.username
125
+
126
+        }
123 127
         mBinding.loginoutIv.setOnClickListener {
124 128
             showEditDialog()
125 129
         }
126 130
         mBinding.codeenterCv.setOnClickListener {
127 131
             //如果密码一致,则解锁
128 132
             spUtils.setParam(Const.DISABLEPAD, false)
129
-            useStrategy()
133
+            useTimeStrategy()
130 134
             if (mBinding.mainLlayout.visibility == View.GONE) {
131 135
                 Toast(getString(R.string.apptimestoptips))
132 136
             }
@@ -139,10 +143,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
139 143
 
140 144
     override fun onResume() {
141 145
         super.onResume()
142
-        AppSocketService.lastPkgName = ""/*getAppInfo()*/
143 146
         viewModel.updateStrategy()
144 147
         viewModel.uploadAppStrategy()
145
-        useStrategy()
148
+        viewModel.postDevicesetDetail("1")
149
+        useTimeStrategy()
146 150
         updatePadInfo()
147 151
         updateMcApp()
148 152
         getLocation()
@@ -233,8 +237,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
233 237
         })
234 238
     }
235 239
 
236
-    private fun useStrategy() {
237
-        //获得sputils中的数据设置状态,以及策略
240
+    private fun useTimeStrategy() {
241
+        //获得sputils中的平板锁定策略
238 242
         try {
239 243
             //如果存储的是锁定则锁定
240 244
             var block = false
@@ -410,16 +414,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
410 414
         return true
411 415
     }
412 416
 
413
-    fun millisecondsToHMS(milliseconds: Long): String {
414
-        val seconds = milliseconds / 1000
415
-        val hours = seconds / 3600
416
-        val minutes = (seconds % 3600) / 60
417
-        val remainingSeconds = seconds % 60
418
-
419
-        return String.format("%02d:%02d:%02d", hours, minutes, remainingSeconds)
420
-    }
421
-
422
-
423 417
     fun isServiceON(context: Context, className: String?): Boolean {
424 418
         val activityManager = context.getSystemService(ACTIVITY_SERVICE) as ActivityManager
425 419
         val runningServices = activityManager.getRunningServices(100)
@@ -496,6 +490,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
496 490
     }
497 491
 
498 492
     private fun loginOut() {
493
+        WorkManager.getInstance(this).cancelAllWork()
499 494
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
500 495
         startIntentActivity(LoginActivity().javaClass)
501 496
         finish()
@@ -514,7 +509,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
514 509
     private fun startWorkManager() {
515 510
         WorkManager.getInstance(this).cancelAllWork()
516 511
         // 周期性任务时间最少15分钟 所以除以实际周期的时间  看需要加入几个任务
517
-        val taskList = arrayListOf(0,5, 10)
512
+        val taskList = arrayListOf(0, 5, 10)
518 513
         for (taskNo in taskList) {
519 514
             val request = PeriodicWorkRequest
520 515
                 // 最少15分钟 PeriodicWorkRequest

+ 7
- 10
app/src/main/res/layout/activity_main.xml View File

@@ -22,15 +22,9 @@
22 22
                 android:layout_width="100dp"
23 23
                 android:layout_height="100dp"
24 24
                 android:text="管理页面"
25
-                android:visibility="visible" />
26
-
27
-            <Button
28
-                android:id="@+id/resetbtn"
29
-                android:layout_width="100dp"
30
-                android:layout_height="100dp"
31
-                android:text="重启"
32 25
                 android:visibility="gone" />
33 26
 
27
+
34 28
             <LinearLayout
35 29
                 android:layout_width="match_parent"
36 30
                 android:layout_height="wrap_content"
@@ -40,6 +34,7 @@
40 34
                 android:orientation="horizontal">
41 35
 
42 36
                 <TextView
37
+                    android:id="@+id/username_tv"
43 38
                     android:layout_width="wrap_content"
44 39
                     android:layout_height="wrap_content"
45 40
                     android:text="姓名"
@@ -48,13 +43,15 @@
48 43
 
49 44
                 <ImageView
50 45
                     android:id="@+id/loginout_iv"
51
-                    android:layout_width="16dp"
46
+                    android:layout_width="30dp"
52 47
                     android:layout_height="12dp"
53
-                    android:layout_marginLeft="2dp"
48
+                    android:paddingLeft="4dp"
49
+                    android:paddingRight="10dp"
54 50
                     android:src="@drawable/icon_fanhui" />
55 51
             </LinearLayout>
56 52
 
57 53
             <TextView
54
+                android:id="@+id/userschool_iv"
58 55
                 android:layout_width="wrap_content"
59 56
                 android:layout_height="wrap_content"
60 57
                 android:layout_marginLeft="21dp"
@@ -75,8 +72,8 @@
75 72
             android:id="@+id/lock_llayout"
76 73
             android:layout_width="match_parent"
77 74
             android:layout_height="match_parent"
78
-            android:gravity="center_horizontal"
79 75
             android:background="@drawable/main_bg"
76
+            android:gravity="center_horizontal"
80 77
             android:orientation="vertical">
81 78
 
82 79
             <ImageView

Loading…
Cancel
Save