diff --git a/app/build.gradle b/app/build.gradle index 465816d..39674e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 30002 - versionName "3.0.2" + versionCode 30005 + versionName "3.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // ndk { @@ -87,11 +87,11 @@ android { shrinkResources false // buildConfigField "String", "BASE_URL", '"http://192.168.69.99:9009"' // buildConfigField "String", "M_URL", '"http://192.168.69.112:8098"' -// buildConfigField "String", "BASE_URL", '"https://oa.qbjjyyun.net/api"' + buildConfigField "String", "BASE_URL", '"https://oa.qbjjyyun.net/api"' buildConfigField "String", "OA_URL", '"https://oa.live.educlouddata.com"' // buildConfigField "String", "OA_URL", '"http://192.168.69.114:3000"' buildConfigField "String", "M_URL", '"https://m.live.educlouddata.com/"' - buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' +// buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' buildConfigField "String", "APP_NAME", '"一体化平台（开发）"' buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' // buildConfigField "String", "WS_URL", '"ws://192.168.69.114:9801/"' diff --git a/app/src/main/java/com/yzx/escreen/MainActivity.kt b/app/src/main/java/com/yzx/escreen/MainActivity.kt index c4cba1e..5aaacd3 100644 --- a/app/src/main/java/com/yzx/escreen/MainActivity.kt +++ b/app/src/main/java/com/yzx/escreen/MainActivity.kt @@ -81,8 +81,8 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus private val mHandler = Handler(Looper.getMainLooper()) private val runnable = object : Runnable { override fun run() { - val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", false) - val isAutoShowChange = SPUtils.getInstance().getBoolean("auto_show_change", false) + val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", true) + val isAutoShowChange = SPUtils.getInstance().getBoolean("auto_show_change", true) if (isAutoShowLeave || isAutoShowChange) { if (!idsLoading) { idsLoading = true @@ -173,8 +173,8 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus } private fun checkAuto() { - isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", false) - isAutoShowChange = SPUtils.getInstance().getBoolean("auto_show_change", false) + isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", true) + isAutoShowChange = SPUtils.getInstance().getBoolean("auto_show_change", true) if (isAutoShowLeave || isAutoShowChange) { mHandler.removeCallbacks(runnable) mHandler.postDelayed(runnable, 2000) @@ -346,7 +346,10 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus override fun onClose(code: Int, reason: String?, remote: Boolean) { LogUtils.d("WebSocketClient-onClose", code, reason, remote) - + Thread{ + Thread.sleep(60*1000) + initWs() + }.start() } override fun onMessage(message: String?) { @@ -358,7 +361,10 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus override fun onError(ex: Exception?) { LogUtils.d("WebSocketClient-onError", ex) - + Thread{ + Thread.sleep(60*1000) + initWs() + }.start() } } @@ -378,6 +384,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus val res = gson.fromJson(msg, resultType) if (res.data.student_id > 0) { if (isAutoShowLeave || isAutoShowChange) { + LogUtils.d("WebSocketClient--wsMessage",res) EventBus.getDefault().post(EventLeaveIds("${res.data.student_id}")) // mPresenter?.getLeaveShowIds("${res.data.student_id}") } @@ -387,6 +394,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus //请假消息 @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(detail: EventLeaveIds) { + LogUtils.d("WebSocketClient--onMessageEvent",detail) mPresenter?.getLeaveShowIds("${detail.ids}") } @@ -590,7 +598,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus override fun onLeaveIDsSuccess(list: MutableList) { idsLoading = false - LogUtils.d("获取详情结束--ids", TimeUtils.getNowMills()) + LogUtils.d("WebSocketClient--获取详情结束--ids", list) val listLeave = list.filter { it.type == 0 }.toMutableList() val listChange = list.filter { it.type == 1 }.toMutableList() var type = 0 diff --git a/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt b/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt index ce26009..60fc23b 100644 --- a/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt +++ b/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt @@ -59,6 +59,7 @@ class LoginActivity : BaseActivity(), LoginView { accountLayout.visibility = View.GONE SPUtils.getInstance().put("last_login_tab_index",1) KeyboardUtils.hideSoftInput(this@LoginActivity) + mPresenter?.getWXQrCode() } } @@ -71,6 +72,7 @@ class LoginActivity : BaseActivity(), LoginView { qrLayout.visibility = View.VISIBLE accountLayout.visibility = View.GONE tabLayout.currentTab = 1 + mPresenter?.getWXQrCode() } loginBtn.setOnClickListener { this.doLogin() @@ -112,7 +114,7 @@ class LoginActivity : BaseActivity(), LoginView { } override fun initData() { - mPresenter?.getWXQrCode() + } override fun initPresenter(): LoginPresenter = LoginPresenter(this) diff --git a/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt index abb120f..50755c7 100644 --- a/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt +++ b/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt @@ -127,7 +127,7 @@ class ChangeFragment : BaseFragment(), ChangeView, changeSwitchBtnTxt(isChecked) EventBus.getDefault().post(AutoSwitchChange(2)) } - val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_change", false) + val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_change", true) switchBtn.isChecked = isAutoShowLeave changeSwitchBtnTxt(isAutoShowLeave) diff --git a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt index 6c1bec4..e41c185 100644 --- a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt +++ b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt @@ -149,7 +149,7 @@ class HomeFragment : BaseFragment(), HomeView, changeSwitchBtnTxt(isChecked) EventBus.getDefault().post(AutoSwitchChange(1)) } - val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", false) + val isAutoShowLeave = SPUtils.getInstance().getBoolean("auto_show_leave", true) switchBtn.isChecked = isAutoShowLeave changeSwitchBtnTxt(isAutoShowLeave) @@ -477,6 +477,7 @@ class HomeFragment : BaseFragment(), HomeView, @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(event: MessageEventAuto) { val list = event.list.filter { it.type == 0 }.toMutableList() + LogUtils.d("WebSocketClient-onMessageEvent",event) if (list.isNotEmpty() && switchBtn.isChecked) { onLeaveIDsSuccess(list) } @@ -498,7 +499,9 @@ class HomeFragment : BaseFragment(), HomeView, list.forEachIndexed { index, leaveID -> pageTv.postDelayed({ - mPresenter?.getDetail(leaveID.id) + if(leaveID.id>0){ + mPresenter?.getDetail(leaveID.id) + } }, 500L * index) } } diff --git a/app/src/main/java/com/yzx/escreen/presenter/MainPresenter.kt b/app/src/main/java/com/yzx/escreen/presenter/MainPresenter.kt index 3337bb1..1e3d38c 100644 --- a/app/src/main/java/com/yzx/escreen/presenter/MainPresenter.kt +++ b/app/src/main/java/com/yzx/escreen/presenter/MainPresenter.kt @@ -19,7 +19,10 @@ class MainPresenter(view: MainView) : BasePresenter(view) { if (User.getUser().token.isEmpty()) { return } - val url = "${Config.BASE_URL}${YzxInterface.INTERFACE_STUDENT_GET_SHOW_BOX_LIST}" + var url = "${Config.BASE_URL}${YzxInterface.INTERFACE_STUDENT_GET_SHOW_BOX_LIST}" + if(student_id.isEmpty()){ + url = "${Config.BASE_URL}${YzxInterface.INTERFACE_STUDENT_GET_SHOW_BOX_LIST_OLD}" + } OkGo.post>(url) .tag(this) .params("student_id", student_id)