1.添加修改密码接口

2.添加appsocket数据重置

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -236,6 +236,16 @@ class ManageApplication : MultiDexApplication() {
             }
         }
 
+
+        /**
+         *禁止手动切换桌面 true: 禁止手动切换桌面；false: 允许手动切换桌面
+         */
+        fun disallowSwitchLauncher_v3(enableFlag: Boolean) {
+            if (ModelNameUtils.IS_LianxX505f()) {
+                csdkManager?.disallowSwitchLauncher_v3(enableFlag)
+            }
+        }
+
         /**
          * 设置运行时权限
          */
@@ -512,7 +522,7 @@ class ManageApplication : MultiDexApplication() {
                 )
             )
             //允许运行时权限，禁止状态栏下拉，屏蔽底部虚拟键。
-            setRuntimePermissions(true)
+           // setRuntimePermissions(true)
             disableStatusBarPanel(true)
             hideHomeSoftKey(true)
             hideMenuSoftKey(true)
@@ -526,6 +536,8 @@ class ManageApplication : MultiDexApplication() {
                 csdkManager?.setPackageEnabled("com.xhly.easystud", true)
                 setUrlWhiteListEnable(false)
                 disableStatusBarPanel(false)
+                hideHomeSoftKey(false)
+                hideMenuSoftKey(false)
             }
             csdkManager?.urlWhiteListRead()?.forEach {
                 LogShow("白名单有"+it.toString())

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

@@ -66,6 +66,7 @@ object AppSocket : SocketClient() {
         socketUserBean.usertype = 2
         socketUserBean.username = Const.USERNAME
         socketUserBean.userid = ManageApplication.getDeviceInfo()
+        socketUserBean.schoolid=Const.SCHOOLID
         webData.body = socketUserBean
         WebSocketHelper.getInstance().sendSocketString(GsonUtils.parseClassToJson(webData))
     }

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

@@ -31,6 +31,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.databinding.ActivityLoginBinding
+import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
 import com.xhly.manageapp.ui.main.activity.MainActivity
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
@@ -154,6 +155,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         spUtils.saveJson(Const.USERINFO,userBean)
         val parseClassToJson = GsonUtils.parseClassToJson(userBean)
         ZSpProvider.save(this,Const.USERINFO,parseClassToJson)
+        AppSocket.onDestroy()
+        AppSocket.startSocket(ManageApplication.instance)
         startIntentActivity(MainActivity().javaClass)
         finish()
     }

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

@@ -323,7 +323,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                             val userBean = spUtils.getFromJson(
                                 Const.USERINFO, UserBean().javaClass
                             ) as UserBean
-                             viewModel.postEditPwd(userBean.userid,newCode,oldCode)
+                            val appVersionCode =
+                                SystemUtil.getAppVersionCode(this@MainActivity, packageName)
+                            viewModel.postEditPwd(userBean.userid,newCode,oldCode,appVersionCode)
                         } catch (e: Exception) {
 
                         }
@@ -674,7 +676,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.USBDISCONNECTEVENT
                 viewModel.eventLog(data)
             }
-            Const.APPSTOREKEY->{
+            Const.ACCOUNTLOGINOUT->{
                 loginOut()
             }
         }

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -198,12 +198,13 @@ class MainViewModel : BaseViewModel() {
     /**
      * 修改密码
      */
-    fun postEditPwd(userid:Long, loginpwd:String, oldpwd:String){
+    fun postEditPwd(userid:Long, loginpwd:String, oldpwd:String,rversion:Long){
         launchUI {
             val map=HashMap<String,Any>()
             map["userid"] = userid
             map["loginpwd"] =loginpwd
             map["oldpwd"] = oldpwd
+            map["rversion"]=rversion
             val postEditPwd = loginService.postEditPwd(map)
             if (postEditPwd.code==0){
               UIEvent(Const.ACCOUNTLOGINOUT).post()

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

@@ -11,10 +11,10 @@ object Const {
     var USERNAME = ""
 
     //学校id
-    var SCHOOLID:Long? = 0L
+    var SCHOOLID:Long? = null
 
     //班级id
-    var CLASSID :Long?= 0L
+    var CLASSID :Long?= null
 
     //标记上次打开的包名，当连续打开同一包名时，不认为打开多次
     var LASTPKGNAME = ""

corelib/src/main/java/com/xhly/corelib/utils/SystemUtil.java

@@ -265,22 +265,6 @@ public class SystemUtil {
             LocationManager systemService = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
                   String bestProvider = "";
             List<String> providers = systemService.getProviders(true);
-          /*  if (providers.contains(LocationManager.GPS_PROVIDER)) {
-                bestProvider = LocationManager.GPS_PROVIDER;
-            } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {
-                bestProvider = LocationManager.NETWORK_PROVIDER;
-            } else {
-                return data;
-            }*/
-           /* Criteria criteria = new Criteria();
-            criteria.setAltitudeRequired(false);
-            criteria.setBearingRequired(false);
-            criteria.setAccuracy(Criteria.ACCURACY_FINE);
-            criteria.setCostAllowed(true);
-             bestProvider = systemService.getBestProvider(criteria, true)
-              data = systemService.getLastKnownLocation(bestProvider);
-             ;*/
-
             if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
                     ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
                 for (String provider : providers) {

websocket/src/main/java/com/xhly/websocket/bean/WebSocketUserBean.kt

@@ -3,7 +3,7 @@ package com.xhly.websocket.bean
 class WebSocketUserBean {
     var userid: String? = ""
     var username: String? = ""
-
+    var schoolid:Long?=null
     //1是管理员，2是学生
     var usertype = 1
 }