1.区分平板禁用和非可用时段禁用

app/src/main/java/com/xhly/manageapp/service/websocket/AppSocket.kt

@@ -94,13 +94,13 @@ class AppSocket : SocketClient() {
 
             Const.CODE2002.toString() -> {
                 Toast.makeText(context, "限制使用", Toast.LENGTH_LONG).show()
-                spUtils.setParam(Const.DISABLEAPP, true)
+                spUtils.setParam(Const.DISABLEPAD, true)
                 goMainActivity()
             }
 
             Const.CODE2003.toString() -> {
                 Toast.makeText(context, "解除限制", Toast.LENGTH_LONG).show()
-                spUtils.setParam(Const.DISABLEAPP, false)
+                spUtils.setParam(Const.DISABLEPAD, false)
                 goMainActivity()
             }
 

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

@@ -60,7 +60,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             startIntentActivity(LoginActivity().javaClass)
         }
         val getAppList1 = AppUtils.GetAppList(this)
-        spUtils.get(Const.DISABLEAPP)
         dataList.addAll(getAppList1)
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
@@ -99,7 +98,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             showEditDialog()
         }
         mBinding.stoptv.setOnClickListener {
-            spUtils.setParam(Const.DISABLEAPP, false)
+            spUtils.setParam(Const.DISABLEPAD, false)
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
@@ -124,7 +123,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun useStrategy() {
         //获得sputils中的数据设置状态,以及策略
         try {
-            var param = spUtils.getParam(Const.DISABLEAPP, false)
+            var param = spUtils.getParam(Const.DISABLEPAD, false)
             if (param as Boolean) {
                 mBinding.stoptv.visibility = View.VISIBLE
             } else {

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

@@ -6,67 +6,85 @@
     android:orientation="vertical"
     android:paddingTop="30dp">
 
-    <TextView
-        android:id="@+id/stoptv"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/stoptips"
-        android:textColor="@color/black"
-        android:textSize="20sp"
-        android:visibility="gone" />
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-    <Button
-        android:id="@+id/btn"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:text="管理页面"
-        android:visibility="visible"
-        />
+            <Button
+                android:id="@+id/btn"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:text="管理页面"
+                android:visibility="visible" />
 
-    <Button
-        android:id="@+id/resetbtn"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:text="重启"
-        android:visibility="gone" />
+            <Button
+                android:id="@+id/resetbtn"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:text="重启"
+                android:visibility="gone" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="21dp"
-        android:layout_marginRight="21dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="21dp"
+                android:layout_marginRight="21dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="姓名"
-            android:textColor="#253A70"
-            android:textSize="19sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="姓名"
+                    android:textColor="#253A70"
+                    android:textSize="19sp" />
 
-        <ImageView
-            android:id="@+id/loginout_iv"
-            android:layout_width="16dp"
-            android:layout_height="12dp"
-            android:layout_marginLeft="2dp"
-            android:src="@drawable/icon_fanhui" />
-    </LinearLayout>
+                <ImageView
+                    android:id="@+id/loginout_iv"
+                    android:layout_width="16dp"
+                    android:layout_height="12dp"
+                    android:layout_marginLeft="2dp"
+                    android:src="@drawable/icon_fanhui" />
+            </LinearLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="21dp"
-        android:layout_marginRight="21dp"
-        android:text="学校"
-        android:textColor="#798CB5"
-        android:textSize="15sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="21dp"
+                android:layout_marginRight="21dp"
+                android:text="学校"
+                android:textColor="#798CB5"
+                android:textSize="15sp" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="24dp"
-        android:overScrollMode="never" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="24dp"
+                android:overScrollMode="never" />
+        </LinearLayout>
+        <TextView
+            android:id="@+id/timestoptv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/stoptips"
+            android:textColor="@color/black"
+            android:textSize="20sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/stoptv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/stoptips"
+            android:textColor="@color/black"
+            android:textSize="20sp"
+            android:visibility="gone" />
+    </FrameLayout>
 </LinearLayout>

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

@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">XhlyManageApp</string>
     <string name="stoptips">已被禁用，无法操作</string>
+    <string name="timestoptips">当前时段不可用</string>
     <string name="inputaccount">请输入账号</string>
     <string name="inputcode">请输入密码</string>
     <string name="inputregioncode">请输入区域码</string>

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -8,8 +8,11 @@ object Const {
     //接口地址
     const val WSURL: String = "wss://mcwstest.xhkjedu.com/ws"
 
-    //标记app禁用
-    const val DISABLEAPP = "DISABLEAPP"
+    //标记平板禁用
+    const val DISABLEPAD= "DISABLEPAD"
+
+    //标记平板在禁用或者使用的事件
+    const val DISABLEPADTIME= "DISABLEPADTIME"
 
     //作为存储白名单应用的key
     const val WHITELISTAPP = "WHITELISTAPP"