1.修改登录页布局

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

@@ -34,6 +34,7 @@ import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.contentprovider.ZSpProvider
 import com.xhly.manageapp.service.websocket.AppSocket
+import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
 import com.xhly.manageapp.ui.main.activity.MainActivity
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
@@ -45,6 +46,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     //单独创建sharedpreference用来存储初始化的应用
     private val currentSpUtils by lazy { CurrentAppSharedPreferencesUtils.getInstance(this) }
     private var regioncode = ""
+    //如果次数大于10则可以打开设置页面
+    private var showSettingNum=0
     override fun getBinding() = ActivityLoginBinding.inflate(layoutInflater)
 
     override fun initData() {
@@ -68,6 +71,11 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             ManageApplication.setSysTime(it)
             Toast(getString(R.string.syncsucess))
         }
+        viewModel.controlResultData.observe(this){
+            if (it){
+                startIntentActivity(ManageActivity().javaClass)
+            }
+        }
         val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
         //如果解除管控为真，则不在执行以下代码
         if (!exitControlFlag){
@@ -112,6 +120,12 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         mBinding.synctimeLlayout.setOnClickListener {
                viewModel.postSyncTime()
         }
+        mBinding.logoIv.setOnClickListener {
+            if (showSettingNum>10){
+                showSettingNum=0
+                showSettingDialog()
+            }
+        }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
         }
@@ -205,6 +219,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                     val enterTv = v.findViewById<TextView>(R.id.dialog_enter_tv)
                     val cancelTv = v.findViewById<TextView>(R.id.dialog_cancel_tv)
                     val editText = v.findViewById<EditText>(R.id.dialog_et)
+                    val titleTv=v.findViewById<TextView>(R.id.dialog_title_tv)
                     enterTv.setOnClickListener {
                         dialog.dismiss()
                         val text = editText.text
@@ -219,6 +234,9 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                     cancelTv.setOnClickListener {
                         dialog.dismiss()
                     }
+                    titleTv.setOnClickListener {
+                        showSettingNum++
+                    }
                 }
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
             .setAlign(CustomDialog.ALIGN.CENTER).show()
@@ -355,6 +373,35 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
+    //弹出调用设置页面的dialog
+    private fun showSettingDialog() {
+        CustomDialog.build()
+            .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
+                override fun onBind(dialog: CustomDialog, v: View) {
+                    val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
+                    val enterTv = v.findViewById<TextView>(R.id.dialog_enter_tv)
+                    val cancelTv = v.findViewById<TextView>(R.id.dialog_cancel_tv)
+                    val editText = v.findViewById<EditText>(R.id.dialog_et)
+                    editText.hint = getString(R.string.inputcode)
+                    titleTv.text = getString(R.string.exitcontrol)
+                    enterTv.setOnClickListener {
+                        val code = editText.text
+                        if ((!code.isNullOrBlank()) && code.length >= 6) {
+                            dialog.dismiss()
+                            try {
+                                viewModel.postExitControl(code.toString())
+                            } catch (e: Exception) {
+
+                            }
+                        }
+                    }
+                    cancelTv.setOnClickListener {
+                        dialog.dismiss()
+                    }
+                }
+            }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
+            .setAlign(CustomDialog.ALIGN.CENTER).show()
+    }
 
     private fun useTimeStrategy() {
         //获得sputils中的平板锁定策略

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

@@ -27,6 +27,7 @@ import androidx.work.WorkManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
+import com.hjq.toast.Toaster
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
@@ -297,7 +298,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             Const.backNum++
             if (Const.backNum>Const.UPDATESTRATEGYNUM){
                 Const.backNum=0
-                Toast("开始请求策略")
+                Toaster.show(R.string.updatetips)
                 updateAllStrategy()
             }
         }

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

@@ -40,13 +40,27 @@
                 android:layout_height="match_parent">
 
                 <ImageView
+                    android:id="@+id/logo_iv"
                     android:layout_width="wrap_content"
                     android:layout_height="37dp"
                     android:src="@drawable/ic_manageapp_launcher"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/logo_tv"
+                    app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <TextView
+                    android:id="@+id/logo_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="37dp"
+                    android:gravity="center"
+                    android:text="星火云鸽"
+                    android:textColor="@color/codetipscolor"
+                    android:textSize="20sp"
+                    app:layout_constraintLeft_toRightOf="@id/logo_iv"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/logo_iv" />
+
                 <ImageView
                     android:layout_width="22dp"
                     android:layout_height="22dp"
@@ -64,11 +78,11 @@
                     android:background="@null"
                     android:gravity="center_vertical"
                     android:hint="@string/inputaccount"
+                    android:maxLength="20"
                     android:singleLine="true"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
                     android:textSize="21sp"
-                    android:maxLength="20"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -101,11 +115,11 @@
                     android:gravity="center_vertical"
                     android:hint="@string/inputcode"
                     android:inputType="numberPassword"
+                    android:maxLength="20"
                     android:singleLine="true"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
                     android:textSize="21sp"
-                    android:maxLength="20"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -131,60 +145,62 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/login_btn">
-
-                    <LinearLayout
-                        android:id="@+id/netset_llayout"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="29dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="21dp"
-                            android:layout_height="21dp"
-                            android:src="@drawable/icon_wifiset" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/netset"
-                            android:textColor="@color/codetipscolor"
-                            android:textSize="19sp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/synctime_llayout"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="21dp"
-                            android:layout_height="21dp"
-                            android:src="@drawable/icon_synctime" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/synctime"
-                            android:textColor="@color/codetipscolor"
-                            android:textSize="19sp" />
-                    </LinearLayout>
-                </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:gravity="center_vertical|right"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <LinearLayout
+                android:id="@+id/netset_llayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="11dp"
+                    android:layout_height="11dp"
+                    android:src="@drawable/icon_wifiset" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/netset"
+                    android:textColor="#798CB5"
+                    android:textSize="8sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/synctime_llayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="11dp"
+                    android:layout_height="11dp"
+                    android:src="@drawable/icon_synctime" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/synctime"
+                    android:textColor="#798CB5"
+                    android:textSize="8sp" />
+            </LinearLayout>
+        </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
@@ -193,7 +209,8 @@
         android:layout_height="match_parent"
         android:background="@drawable/main_bg"
         android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        >
 
         <ImageView
             android:layout_width="157dp"
@@ -212,10 +229,10 @@
                 android:layout_height="53dp"
                 android:background="@drawable/shape_shadow_bg"
                 android:hint="@string/passcode"
+                android:maxLength="20"
                 android:paddingLeft="28dp"
                 android:paddingRight="28dp"
                 android:singleLine="true"
-                android:maxLength="20"
                 android:textColor="@color/codetipscolor"
                 android:textColorHint="@color/codehintcolor"
                 android:textSize="16sp" />