1.修改登录页面布局和登录接口。

2.修改登录校验接口。
3.添加第三方App登录后关联信息接口。
4.添加登录信息切换广播接收器。
5.修改应用拉起的时机。

app/src/main/AndroidManifest.xml

@@ -130,6 +130,14 @@
                 <action android:name="com.xhly.manageapp.loginout" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name="com.xhly.manageapp.broadcastreceiver.XhlyLoginEditReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.xhly.manageapp.loginedit" />
+            </intent-filter>
+        </receiver>
         <receiver
             android:name="com.xhly.manageapp.broadcastreceiver.XhlyUpdeteStrategyReceiver"
             android:enabled="true"

app/src/main/java/com/xhly/manageapp/bean/login/LoginBean.kt

@@ -2,8 +2,8 @@ package com.xhly.manageapp.bean.login
 
 //用于登录
 class LoginBean {
-    var loginname = ""
-    var loginpwd = ""
+    /*var loginname = ""
+    var loginpwd = ""*/
     var sn = ""
     //设备名
     var device: String? = null

app/src/main/java/com/xhly/manageapp/bean/login/LoginStudentBean.kt

@@ -0,0 +1,51 @@
+package com.xhly.manageapp.bean.login
+
+/**
+ * userid	number
+ * 非必须
+ * 用户id
+ * mock: 1
+ *
+ * regionid	number
+ * 必须
+ * 区域id
+ * mock: 2
+ *
+ * classname	string
+ * 必须
+ * 班级名称
+ * mock: 班级1
+ *
+ * schoolname	string
+ * 必须
+ * 学校名称
+ * mock: 学校1
+ *
+ * username	string
+ * 必须
+ * 姓名
+ * mock: xxx
+ *
+ * userphone	string
+ * 必须
+ * studentno	string
+ * 必须
+ * cardid	string
+ * 必须
+ * usersex	number
+ * 必须
+ * 性别0保密1男2女
+ * mock: 1
+ */
+  //用于传递学生登录信息
+class LoginStudentBean {
+    var userid: Long = 0
+    var regionid: Long = 0
+    var classname: String? = null
+    var schoolname: String? = null
+    var username: String? = null
+    var userphone: String? = null
+    var studentno: String? = null
+    var cardid: String? = null
+    var usersex: Int = 0
+}

app/src/main/java/com/xhly/manageapp/bean/user/McUserBean.kt

@@ -0,0 +1,39 @@
+package com.xhly.manageapp.bean.user
+
+//传递给管控的登录信息
+/**
+ * classname	string
+ * 必须
+ * 班级名称
+ * mock: 班级1
+ *
+ * schoolname	string
+ * 必须
+ * 学校名称
+ * mock: 学校1
+ *
+ * username	string
+ * 必须
+ * 姓名
+ * mock: xxx
+ *
+ * userphone	string
+ * 必须
+ * studentno	string
+ * 必须
+ * cardid	string
+ * 必须
+ * usersex	number
+ * 必须
+ * 性别0保密1男2女
+ * mock: 1
+ */
+class McUserBean {
+    var classname: String? = null
+    var schoolname: String? = null
+    var username: String? = null
+    var userphone: String? = null
+    var studentno: String? = null
+    var cardid: String? = null
+    var usersex: Int = 0
+}

app/src/main/java/com/xhly/manageapp/broadcastreceiver/XhlyLoginEditReceiver.kt

@@ -0,0 +1,22 @@
+package com.xhly.manageapp.broadcastreceiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import com.xhly.corelib.Const
+import com.xhly.corelib.eventbus.UIEvent
+
+class XhlyLoginEditReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        /*UIEvent(Const.ACCOUNTLOGINOUT).post()*/
+        //用来处理第三方登录信息
+        val stringExtra = intent.getStringExtra("loginEdit")
+        val bundle=Bundle()
+        if (stringExtra!=null){
+            bundle.putString("loginEdit",stringExtra)
+        }
+        UIEvent(Const.THIRDLOGINSUCCESS).setBundle(bundle).post()
+    }
+}

app/src/main/java/com/xhly/manageapp/broadcastreceiver/XhlyLoginOutReceiver.kt

@@ -3,12 +3,13 @@ package com.xhly.manageapp.broadcastreceiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import android.util.Log
 import com.xhly.corelib.Const
 import com.xhly.corelib.eventbus.UIEvent
 
 class XhlyLoginOutReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        UIEvent(Const.ACCOUNTLOGINOUT).post()
+        UIEvent(Const.LOGINOUTTOMAINACTIVITY).post()
     }
 }

app/src/main/java/com/xhly/manageapp/network/UriAdress.kt

@@ -67,13 +67,26 @@ object UriAdress {
      */
     const val ULOGIN_LOGIN = "/ulogin/login"
 
+    /**
+     * 登录校验接口
+     */
+    const val ULOGIN_CHECK_LOGIN = "/ulogin/check_login"
 
+    /**
+     * sn登录接口
+     */
+    const val ULOGIN_LOGIN_SN = "/ulogin/login_sn"
 
+    /**
+     * SN登录校验接口
+     */
+    const val ULOGIN_CHECK_LOGIN_SN = "/ulogin/check_rsn"
 
     /**
-     * 登录校验接口
+     * 更新登录用户信息
      */
-    const val ULOGIN_CHECK_LOGIN = "/ulogin/check_login"
+    const val ULOGIN_EDIT = "/ulogin/edit"
+
 
     /**
      * 退出登录接口

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

@@ -232,27 +232,20 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     }
 
     private fun login() {
-        val account = mBinding.accountEt.text.toString()
-        val code = mBinding.codeEt.text.toString()
+        val regioncodeStr = mBinding.accountEt.text.toString()
         LogShow("sn=="+ ManageApplication.getDeviceInfo())
-        if (account.isNullOrBlank()) {
-            Toast(getString(R.string.accountnoempty))
-            return
-        }
-        if (code.isNullOrBlank()) {
-            Toast(getString(R.string.codenoempty))
+        if (regioncodeStr.isNullOrBlank()) {
+            Toast("区域码不能为空")
             return
         }
         val loginBean= LoginBean()
-        loginBean.loginname=account
-        loginBean.loginpwd=code
+        loginBean.regionCode=regioncodeStr
         loginBean.device= Build.BRAND
         loginBean.deviceModel=Build.MODEL
         loginBean.romVersion=Build.DISPLAY
         ManageApplication.getDeviceInfo(1)?.let{mac->
             loginBean.deviceMac=mac
         }
-        loginBean.regionCode=regioncode
         loginBean.clientVersion=SystemUtil.getAppVersionName(this,packageName)
         ManageApplication.getDeviceInfo()?.let {
             loginBean.sn=it

app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt

@@ -3,6 +3,7 @@ package com.xhly.manageapp.ui.login.netservice
 import com.xhly.corelib.network.bean.ResponseData
 import com.xhly.manageapp.bean.login.CheckLoginBean
 import com.xhly.manageapp.bean.login.LoginBean
+import com.xhly.manageapp.bean.login.LoginStudentBean
 import com.xhly.manageapp.bean.scheme.AutoAppBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.UriAdress
@@ -14,14 +15,21 @@ interface LoginService {
     @GET("/status/info")
     suspend fun getTest(): ResponseData<String>
 
-    @POST(UriAdress.ULOGIN_LOGIN)
+    @POST(UriAdress.ULOGIN_LOGIN_SN)
     suspend fun postLogin(@Body loginBean: LoginBean): ResponseData<UserBean>
     /*
      登录校验
      */
-    @POST(UriAdress.ULOGIN_CHECK_LOGIN)
+    @POST(UriAdress.ULOGIN_CHECK_LOGIN_SN)
     suspend fun postLoginCheck(@Body map:HashMap<String,Any>): ResponseData<CheckLoginBean>
 
+
+    /*
+     更新用户信息
+ */
+    @POST(UriAdress.ULOGIN_EDIT)
+    suspend fun postLoginEdit(@Body loginStudentBean: LoginStudentBean): ResponseData<UserBean>
+
     /**
      * 退出登录接口参数 userid	number 用户id
      * loginpwd	string 密码
@@ -29,6 +37,7 @@ interface LoginService {
     @POST(UriAdress.ULOGIN_LOGIN_OUT)
     suspend fun postLoginOut(@Body map:HashMap<String,Any>): ResponseData<Any>
 
+
     /**
      * 解除当前锁屏
      */

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

@@ -19,7 +19,9 @@ import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.os.Build
+import android.os.Bundle
 import android.provider.Settings
+import android.util.Log
 import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.MotionEvent
@@ -74,9 +76,11 @@ import com.xhly.manageapp.bean.app.AppModel
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.UpdateBean
+import com.xhly.manageapp.bean.login.LoginStudentBean
 import com.xhly.manageapp.bean.scheme.AutoAppBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
+import com.xhly.manageapp.bean.user.McUserBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.broadcastreceiver.BLEStateReceiver
@@ -84,8 +88,10 @@ import com.xhly.manageapp.broadcastreceiver.NetConnectReceiver
 import com.xhly.manageapp.broadcastreceiver.SDReceiver
 import com.xhly.manageapp.broadcastreceiver.ScreenReceiver
 import com.xhly.manageapp.broadcastreceiver.USBReceiver
+import com.xhly.manageapp.broadcastreceiver.XhlyLoginEditReceiver
 import com.xhly.manageapp.broadcastreceiver.XhlyLoginOutReceiver
 import com.xhly.manageapp.broadcastreceiver.XhlyUpdeteStrategyReceiver
+import com.xhly.manageapp.contentprovider.ZSpProvider
 import com.xhly.manageapp.service.ManageAccessibilityService
 import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.ManageActivity
@@ -120,6 +126,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private var mUSBReceiver: USBReceiver? = null
     private var mLoginOutReceiver: XhlyLoginOutReceiver? = null
     private var mXhlyUpdeteStrategyReceiver: XhlyUpdeteStrategyReceiver? = null
+    private var mLoginEditReceiver: XhlyLoginEditReceiver? = null
     private var dataList: ArrayList<AppInfo> = arrayListOf()
     private var userBean: UserBean? = null
     private var timer: Timer? = null
@@ -186,6 +193,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private var quitFlag=false
     //处理连续点击电源键的操作
     private var lastClickPowerTime=0L
+    //标记更新了user
+    private var updateUser=false
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
@@ -237,6 +246,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 registerUSBReceiver()
                 registerSDReceiver()
                 registerLoginOutReceiver()
+                registerLoginEditReceiver()
                 registerXhlyUpdeteStrategyReceiver()
                 adapter?.userBean=it
             }
@@ -674,6 +684,36 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             }
         }
 
+        viewModel.mainLoginData.observe(this){userBean->
+            if (!updateUser){
+                return@observe
+            }
+            updateUser=false
+            if (userBean.xhlyLoginSucess){
+                this.userBean=userBean
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.doEvent = EventLog.ACCOUNTLOGINEVENT
+                data.comm=EventLog.ACCOUNTLOGINEVENTSTRING
+                viewModel.eventLog(data)
+                Const.USERID=userBean.userid
+                Const.USERNAME=userBean.username.toString()
+                Const.SCHOOLID=userBean.schoolid
+                Const.CLASSID=userBean.classid
+                spUtils.saveJson(Const.USERINFO,userBean)
+                val parseClassToJson = GsonUtils.parseClassToJson(userBean)
+                ZSpProvider.save(this,Const.USERINFO,parseClassToJson)
+                AppSocket.onDestroy()
+                AppSocket.startSocket(ManageApplication.instance)
+            }else{
+                userBean.xhlyLoginMessage?.let {
+                    Toast(it)
+                }
+            }
+        }
+
         lifecycleScope.launch {
             isCreatFlag = true
             isDestroyFlag=false
@@ -954,6 +994,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         super.onResume()
         userBean?.let {
             StrategyUtils.initMainResume()
+            val name = StringBuffer()
+            if (!it.schoolName.isNullOrBlank()) {
+                name.append(it.schoolName)
+            }
+            if (!it.classname.isNullOrBlank()) {
+                name.append(it.classname)
+            }
+            mBinding.userschoolTv.text = name.toString()
+            mBinding.usernameTv.text = it.username
         }
         isResumeFlag = true
         Const.startAppStoreFlag = false
@@ -1039,14 +1088,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             Const.USERID = it.userid
             Const.USERNAME = it.username.toString()
             viewModel.postDevicesetDetail(it.schoolid)
-            val name = StringBuffer()
-            if (!it.schoolName.isNullOrBlank()) {
-                name.append(it.schoolName)
-            }
-            if (!it.classname.isNullOrBlank()) {
-                name.append(it.classname)
-            }
-            mBinding.userschoolTv.text = name.toString()
         }
         netStrategyDataFlag=true
         viewModel.postWallpaperPad()
@@ -1326,12 +1367,17 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         LogShow("锁定了吧" + mainLockFlag + "|||" + autoAppFlag)
         //自动退出时优先退出而不是拉起app
         if (autoAppFlag&&!loginoutFlag) {
-            //因为对于学生端app退出登录的处理，所以类型为5（这时认为执行的时机是学生主动退出了登录，所以不拉起）时不执行拉起
-            if (type!=5&&type!=4){
+            /*//因为对于学生端app退出登录的处理，所以类型为5（这时认为执行的时机是学生主动退出了登录，所以不拉起）时不执行拉起
+            if (type!=5){
                 userBean?.let {
                     netAutoAppFlag=true
                     viewModel.postAutoAppDetail(it.regionid)
                 }
+            }*/
+            //没有单点登录所以不再判断
+            userBean?.let {
+                netAutoAppFlag=true
+                viewModel.postAutoAppDetail(it.regionid)
             }
         }
     }
@@ -1673,9 +1719,47 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             Const.STARTLOCATION -> {
                 getLocation()
             }
+            Const.THIRDLOGINSUCCESS->{
+                 loginEdit(uiEvent.bundle)
+            }
+            Const.LOGINOUTTOMAINACTIVITY->{
+                loginoutFlag=true
+            }
+        }
+    }
+
+    private fun loginEdit(bundle: Bundle?) {
+        bundle?.let {
+            val string = it.getString("loginEdit")
+            if (string!=null){
+                try {
+                    val mcUserBean = GsonUtils.parseJsonWithGson(string, McUserBean::class.java)
+                    val loginStudentBean=LoginStudentBean()
+                    userBean?.let {
+                        loginStudentBean.userid=it.userid
+                        loginStudentBean.regionid=it.regionid
+                    }
+                    loginStudentBean.username=mcUserBean?.username
+                    loginStudentBean.studentno=mcUserBean?.studentno
+                    loginStudentBean.cardid=mcUserBean?.cardid
+                    loginStudentBean.classname=mcUserBean?.classname
+                    loginStudentBean.schoolname=mcUserBean?.schoolname
+                    loginStudentBean.userphone=mcUserBean?.userphone
+                    if (mcUserBean?.usersex==1){
+                        loginStudentBean.usersex=1
+                    }else{
+                        loginStudentBean.usersex=0
+                    }
+                    updateUser=true
+                    viewModel.editLogin(loginStudentBean)
+                }catch (e:Exception){
+                    Log.d("修改登录信息失败",e.toString())
+                }
+            }
         }
     }
 
+
     //发送违规事件
     private fun postEventLog(data: LogdOperateBean) {
         try {
@@ -2044,6 +2128,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         registerReceiver(mLoginOutReceiver, filter)
     }
 
+    private fun registerLoginEditReceiver() {
+        val filter = IntentFilter()
+        mLoginEditReceiver = XhlyLoginEditReceiver()
+        filter.addAction("com.xhly.manageapp.loginedit")
+        registerReceiver(mLoginEditReceiver, filter)
+    }
+
     private fun registerXhlyUpdeteStrategyReceiver() {
         val filter = IntentFilter()
         mXhlyUpdeteStrategyReceiver = XhlyUpdeteStrategyReceiver()
@@ -2204,6 +2295,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         mLoginOutReceiver?.let {
             unregisterReceiver(it)
         }
+        mLoginEditReceiver?.let {
+            unregisterReceiver(it)
+        }
         LogShow("MainActivity被销毁")
     }
 

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -13,7 +13,9 @@ import com.xhly.manageapp.bean.log.LogEventBean
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogPushResultBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.bean.login.LoginStudentBean
 import com.xhly.manageapp.bean.scheme.AutoAppBean
+import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.ui.login.netservice.LoginService
 import kotlinx.coroutines.flow.Flow
@@ -50,6 +52,45 @@ open class BaseViewModel : CommonBaseViewModel() {
     private val autoAppResult = MutableStateFlow<AutoAppBean?>(null)
     val autoAppData: Flow<AutoAppBean?> = autoAppResult.asStateFlow()
 
+
+    private val mainLoginResult=MutableLiveData<UserBean>()
+    val mainLoginData:LiveData<UserBean> =mainLoginResult
+    //标记修改登录信息失败，失败3次则不再继续
+    var editNum=0
+
+    //编辑登录信息
+    fun editLogin(loginStudentBean: LoginStudentBean){
+        launchUI {
+            try {
+                val postLogin = loginService.postLoginEdit(loginStudentBean)
+                if (postLogin.code==0){
+                    if (postLogin.obj!=null){
+                        mainLoginResult.value=postLogin.obj
+                    }
+                }else{
+                    editNum++
+                    if (editNum==3){
+                        val userBean=UserBean()
+                        userBean.xhlyLoginSucess=false
+                        if (postLogin.msg!=null){
+                            userBean.xhlyLoginMessage=postLogin.msg
+                        }
+                        mainLoginResult.value=userBean
+                    }else{
+                        editLogin(loginStudentBean)
+                    }
+                }
+            }catch (e:Exception){
+                val userBean=UserBean()
+                userBean.xhlyLoginSucess=false
+                mainLoginResult.value=userBean
+                LogShow(e.toString())
+            }
+        }
+
+    }
+
+
     /**
      * 解除当前锁屏
      */

app/src/main/java/com/xhly/manageapp/workmanager/TimingWorker.kt

@@ -80,10 +80,11 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             //校验登录
             userBean?.let {
                 val map = HashMap<String, Any>()
-                map["userid"] = userBean.userid
-                map["loginpwd"] = userBean.loginpwd
+                map["regionCode"] = userBean.regionCode.toString()
+                map["sn"] = ManageApplication.getDeviceInfo()?:""
                 try {
                     val postLoginCheck = loginService.postLoginCheck(map)
+                    LogShow("sn校验结果"+postLoginCheck.code+"|||"+postLoginCheck.obj.needLogin)
                     if (postLoginCheck.code == 0 && postLoginCheck.obj.needLogin) {
                         UIEvent(Const.ACCOUNTLOGINOUT).post()
                     }

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

@@ -32,7 +32,7 @@
             android:id="@+id/login_sv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="72dp">
+            android:layout_marginTop="147dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/login_clayout"
@@ -74,7 +74,7 @@
                     android:layout_width="22dp"
                     android:layout_height="22dp"
                     android:layout_marginRight="15dp"
-                    android:src="@drawable/icon_zhanghao"
+                    android:src="@drawable/icon_code_sn"
                     app:layout_constraintBottom_toBottomOf="@id/account_et"
                     app:layout_constraintRight_toLeftOf="@id/account_et"
                     app:layout_constraintTop_toTopOf="@id/account_et" />
@@ -86,7 +86,7 @@
                     android:layout_marginTop="82dp"
                     android:background="@null"
                     android:gravity="center_vertical"
-                    android:hint="@string/inputaccount"
+                    android:hint="@string/inputregioncode"
                     android:maxLength="20"
                     android:singleLine="true"
                     android:textColor="@color/black"
@@ -105,48 +105,11 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/account_et" />
 
-                <ImageView
-                    android:layout_width="22dp"
-                    android:layout_height="22dp"
-                    android:layout_marginRight="15dp"
-                    android:src="@drawable/icon_mima"
-                    app:layout_constraintBottom_toBottomOf="@id/code_et"
-                    app:layout_constraintRight_toLeftOf="@id/code_et"
-                    app:layout_constraintTop_toTopOf="@id/code_et" />
-
-                <EditText
-                    android:id="@+id/code_et"
-                    android:layout_width="300dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="165dp"
-                    android:background="@null"
-                    android:digits="@string/psw_style"
-                    android:gravity="center_vertical"
-                    android:hint="@string/inputcode"
-                    android:inputType="textPassword"
-                    android:maxLength="20"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textColorHint="#FFB8C2D9"
-                    android:textSize="21sp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:layout_width="387dp"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="12dp"
-                    android:src="#D0DBF4"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/code_et" />
-
                 <FrameLayout
                     android:id="@+id/login_btn"
                     android:layout_width="387dp"
                     android:layout_height="49dp"
-                    android:layout_marginTop="279dp"
+                    android:layout_marginTop="167dp"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent">

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

@@ -141,6 +141,11 @@ object Const {
      */
     const val ACCOUNTLOGINOUT = "ACCOUNTLOGINOUT"
 
+    /**
+     * 标记第三方主动退到管控页面
+     */
+    const val LOGINOUTTOMAINACTIVITY = "LOGINOUTTOMAINACTIVITY"
+
     /**
      * 标记直接退出，不调用接口
      */
@@ -262,6 +267,9 @@ object Const {
     //存储学校设置的设备设置
     const val SCHOOLSETDEVICE = "SCHOOLSETDEVICE"
 
+    //标记第三方登录成功
+    const val THIRDLOGINSUCCESS = "THIRDLOGINSUCCESS"
+
     //记录设备策略名称
     const val DEVICETYPE1 = "摄像头"
     const val DEVICETYPE2 = "蓝牙"