Browse Source

1.移除多余引用

20241218TB223FC(测试jar包)
wangwanlei 9 months ago
parent
commit
43d5c21ffe

+ 2
- 6
app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt View File

3
 import BaseActivity
3
 import BaseActivity
4
 import android.Manifest
4
 import android.Manifest
5
 import android.annotation.SuppressLint
5
 import android.annotation.SuppressLint
6
-import android.content.pm.PackageManager
7
 import android.graphics.Color
6
 import android.graphics.Color
8
 import android.os.Build
7
 import android.os.Build
9
 import android.view.View
8
 import android.view.View
17
 import com.kongzue.dialogx.interfaces.OnBindView
16
 import com.kongzue.dialogx.interfaces.OnBindView
18
 import com.tbruyelle.rxpermissions2.RxPermissions
17
 import com.tbruyelle.rxpermissions2.RxPermissions
19
 import com.xhly.corelib.Const
18
 import com.xhly.corelib.Const
20
-import com.xhly.corelib.bean.AppInfo
21
 import com.xhly.corelib.eventbus.UIEvent
19
 import com.xhly.corelib.eventbus.UIEvent
22
 import com.xhly.corelib.utils.AppUtils
20
 import com.xhly.corelib.utils.AppUtils
23
 import com.xhly.corelib.utils.GsonUtils
21
 import com.xhly.corelib.utils.GsonUtils
26
 import com.xhly.manageapp.ManageApplication
24
 import com.xhly.manageapp.ManageApplication
27
 import com.xhly.manageapp.R
25
 import com.xhly.manageapp.R
28
 import com.xhly.manageapp.bean.EventLog
26
 import com.xhly.manageapp.bean.EventLog
29
-import com.xhly.manageapp.bean.LoginBean
27
+import com.xhly.manageapp.bean.login.LoginBean
30
 import com.xhly.manageapp.bean.SocketMsgBean
28
 import com.xhly.manageapp.bean.SocketMsgBean
31
 import com.xhly.manageapp.bean.log.LogPushBean
29
 import com.xhly.manageapp.bean.log.LogPushBean
32
 import com.xhly.manageapp.bean.log.LogdOperateBean
30
 import com.xhly.manageapp.bean.log.LogdOperateBean
33
-import com.xhly.manageapp.bean.strategy.StrategyBean
34
 import com.xhly.manageapp.bean.user.UserBean
31
 import com.xhly.manageapp.bean.user.UserBean
35
 import com.xhly.manageapp.contentprovider.ZSpProvider
32
 import com.xhly.manageapp.contentprovider.ZSpProvider
36
 import com.xhly.manageapp.databinding.ActivityLoginBinding
33
 import com.xhly.manageapp.databinding.ActivityLoginBinding
37
-import com.xhly.manageapp.service.websocket.AppSocket
38
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
34
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
39
 import com.xhly.manageapp.ui.main.activity.MainActivity
35
 import com.xhly.manageapp.ui.main.activity.MainActivity
40
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
36
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
132
             Toast(getString(R.string.codenoempty))
128
             Toast(getString(R.string.codenoempty))
133
             return
129
             return
134
         }
130
         }
135
-        val loginBean=LoginBean()
131
+        val loginBean= LoginBean()
136
         loginBean.loginname=account
132
         loginBean.loginname=account
137
         loginBean.loginpwd=code
133
         loginBean.loginpwd=code
138
         loginBean.device= Build.BRAND
134
         loginBean.device= Build.BRAND

+ 1
- 7
app/src/main/java/com/xhly/manageapp/ui/login/viewmodel/LoginViewModel.kt View File

2
 
2
 
3
 import androidx.lifecycle.LiveData
3
 import androidx.lifecycle.LiveData
4
 import androidx.lifecycle.MutableLiveData
4
 import androidx.lifecycle.MutableLiveData
5
-import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
6
-import com.xhly.corelib.network.RetrofitService
7
-import com.xhly.corelib.utils.LogShow
8
-import com.xhly.manageapp.bean.LoginBean
9
-import com.xhly.manageapp.bean.log.LogdOperateBean
5
+import com.xhly.manageapp.bean.login.LoginBean
10
 import com.xhly.manageapp.bean.user.UserBean
6
 import com.xhly.manageapp.bean.user.UserBean
11
-import com.xhly.manageapp.network.log.LogService
12
-import com.xhly.manageapp.ui.login.netservice.LoginService
13
 import com.xhly.manageapp.viewmodel.BaseViewModel
7
 import com.xhly.manageapp.viewmodel.BaseViewModel
14
 
8
 
15
 class LoginViewModel: BaseViewModel() {
9
 class LoginViewModel: BaseViewModel() {

+ 1
- 4
app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt View File

2
 
2
 
3
 import androidx.lifecycle.LiveData
3
 import androidx.lifecycle.LiveData
4
 import androidx.lifecycle.MutableLiveData
4
 import androidx.lifecycle.MutableLiveData
5
-import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
6
 import com.xhly.corelib.network.RetrofitService
5
 import com.xhly.corelib.network.RetrofitService
7
 import com.xhly.manageapp.bean.AppModel
6
 import com.xhly.manageapp.bean.AppModel
8
 import com.xhly.manageapp.bean.ListAppBean
7
 import com.xhly.manageapp.bean.ListAppBean
9
-import com.xhly.manageapp.bean.UpdateBean
8
+import com.xhly.manageapp.bean.log.UpdateBean
10
 import com.xhly.manageapp.bean.WallpaperBean
9
 import com.xhly.manageapp.bean.WallpaperBean
11
-import com.xhly.manageapp.bean.log.LogdOperateBean
12
 import com.xhly.manageapp.bean.log.PadInfoBean
10
 import com.xhly.manageapp.bean.log.PadInfoBean
13
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
11
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
14
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
12
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
16
 import com.xhly.manageapp.network.app.AppService
14
 import com.xhly.manageapp.network.app.AppService
17
 import com.xhly.manageapp.network.log.LogService
15
 import com.xhly.manageapp.network.log.LogService
18
 import com.xhly.manageapp.network.strategy.StrategyService
16
 import com.xhly.manageapp.network.strategy.StrategyService
19
-import com.xhly.manageapp.ui.login.netservice.LoginService
20
 import com.xhly.manageapp.viewmodel.BaseViewModel
17
 import com.xhly.manageapp.viewmodel.BaseViewModel
21
 
18
 
22
 class MainViewModel : BaseViewModel() {
19
 class MainViewModel : BaseViewModel() {

Loading…
Cancel
Save