From b8747254e8fae43e5f211798fc69faac503c0490 Mon Sep 17 00:00:00 2001 From: cyh Date: Wed, 4 Sep 2024 18:01:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=96=B0=E7=94=A8=E6=88=B7=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=85=B6=E4=BB=96=E7=AA=97?= =?UTF-8?q?=E5=8F=A3,=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/LoginActivity.kt | 3 + .../com/yingmao/clash/act/NewMainActivity.kt | 56 ++++++++++++------- .../com/yingmao/clash/util/SystemLogcat.kt | 2 +- .../java/com/yingmao/clash/vm/MainAtyVM.kt | 2 +- .../layout/activity_dialog_view_layout.xml | 18 +++--- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt b/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt index 59ced79..8876a2e 100644 --- a/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt @@ -332,6 +332,9 @@ class LoginActivity : BaseActivity(), View.OnClickListener { .removeValueForKey(BZYConstants.MMKV_KEY_REMEMBER_PASSWORD) MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_REMEMBER_IS_CHECKED, false) } + if(TextUtils.isEmpty(username)){ + return + } username_encrypt = AESUtil.byteArrayToHexStr( AESUtil.encrypt(username) ) diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index e89fcb7..35802d0 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -106,7 +106,8 @@ class NewMainActivity : BaseActivity() { lateinit var tv_expire_date: TextView private lateinit var drawer: DrawerLayout private lateinit var mainAtyVM: MainAtyVM - private lateinit var activityDialog:ActivityViewDialog + private var activityDialog: ActivityViewDialog? = null + companion object { //记录心跳失败次数 var HEART_BEAT_FAILURE_FREQUENCY = 0 @@ -207,7 +208,7 @@ class NewMainActivity : BaseActivity() { // } mainAtyVM = ViewModelProvider(this).get(MainAtyVM::class.java) observe(this, mainAtyVM) - mainAtyVM.getNoticeInfo() + mainAtyVM.getRuningNoticeInfo() mainAtyVM.startHeartBeat() initViews() @@ -224,7 +225,7 @@ class NewMainActivity : BaseActivity() { startLog() // showBindAccount() firstEntry() - activityPopupWindow() + } /* @@ -252,8 +253,12 @@ class NewMainActivity : BaseActivity() { } } + } else { + mainAtyVM.getNoticeInfo() + activityPopupWindow() } } + private fun startLog() { launch(Dispatchers.IO) { @@ -465,27 +470,33 @@ class NewMainActivity : BaseActivity() { } else { RxToast.error("签到失败:${data.message}") } - } else if (httpStatus.reqType== HttpReqType.GetActivity) { + } else if (httpStatus.reqType == HttpReqType.GetActivity) { val data = httpStatus.rsp as GetActivityRsp - if(data.code==200){ - data.data.let { - data.data.data.list[0].redirectLink.let { - activityDialog= ActivityViewDialog(this,data.data.data.list[0].redirectLink) - activityDialog.showDialog() - activityDialog.setOnDialogClickListener(object :OnDialogClickListener{ - override fun onRechargeClickListener() { - //跳转到支付界面 - goRechargeWeb() - } + if (data.code == 200) { + if (data.data != null) { + if (data.data.data != null) { + if (data.data.data.list.isNotEmpty()) { + data.data.data.list[0].redirectLink.let { + activityDialog = + ActivityViewDialog(this, data.data.data.list[0].redirectLink) + activityDialog?.showDialog() + activityDialog?.setOnDialogClickListener(object : + OnDialogClickListener { + override fun onRechargeClickListener() { + //跳转到支付界面 + goRechargeWeb() + } - override fun onCancelClickListener() { - activityDialog.dismiss() + override fun onCancelClickListener() { + activityDialog?.dismiss() + } + }) } - }) + } } } } - android.util.Log.i("levelData","data:::${data}") + android.util.Log.i("levelData", "data:::${data}") } } @@ -730,7 +741,10 @@ class NewMainActivity : BaseActivity() { public fun goBackupRechargeWeb() { - startActivityForResult(Intent(this@NewMainActivity, BackupRechargeActivity::class.java), REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY) + startActivityForResult( + Intent(this@NewMainActivity, BackupRechargeActivity::class.java), + REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY + ) } private fun showPayResultDialog() { @@ -1011,7 +1025,9 @@ class NewMainActivity : BaseActivity() { super.onActivityResult(requestCode, resultCode, data) if (requestCode == REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY) { - activityDialog.dismiss() + if (activityDialog != null) { + activityDialog?.dismiss() + } showPayResultDialog() } } diff --git a/app/src/main/java/com/yingmao/clash/util/SystemLogcat.kt b/app/src/main/java/com/yingmao/clash/util/SystemLogcat.kt index b0c77de..dcd726b 100644 --- a/app/src/main/java/com/yingmao/clash/util/SystemLogcat.kt +++ b/app/src/main/java/com/yingmao/clash/util/SystemLogcat.kt @@ -8,7 +8,7 @@ object SystemLogcat { "Go", "DEBUG", "AndroidRuntime", - "ClashMetaForAndroid", + "BJM", "LwIP", ) diff --git a/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt b/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt index 77e7fc4..c33f996 100644 --- a/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt +++ b/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt @@ -175,7 +175,7 @@ class MainAtyVM : PublicViewMode() { "pageNum" to "1", "pageSize" to "5", "clientTypeArray" to "1", - "moduleType" to "home" + "moduleType" to "HOME" ) doAsync(HttpReqType.GetActivity) { httpApi.getActivity(params) } } diff --git a/app/src/main/res/layout/activity_dialog_view_layout.xml b/app/src/main/res/layout/activity_dialog_view_layout.xml index 1e4c4f4..922054a 100644 --- a/app/src/main/res/layout/activity_dialog_view_layout.xml +++ b/app/src/main/res/layout/activity_dialog_view_layout.xml @@ -7,20 +7,24 @@ + />