diff --git a/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt b/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt index 082fc86..d1e28ae 100644 --- a/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt @@ -30,12 +30,16 @@ import com.stripe.android.model.StripeIntent import com.tencent.mmkv.MMKV import com.yingmao.clash.BuildConfig import com.yingmao.clash.R +import com.yingmao.clash.act.UIMainActivity.Companion.isVip +import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder import com.yingmao.clash.app.MainApplication import com.yingmao.clash.base.BaseActivity import com.yingmao.clash.conf.BZYConstants import com.yingmao.clash.entity.CheckLoginRsp import com.yingmao.clash.entity.PayUploadParamData import com.yingmao.clash.entity.RechargeModelEntity +import com.yingmao.clash.fragment.home.HomeFragment +import com.yingmao.clash.fragment.home.HomeFragment.Companion.clashRunning import com.yingmao.clash.fragment.recharge.RechargeViewModel import com.yingmao.clash.fragment.recharge.adapter.RechargeModelAdapter import com.yingmao.clash.fragment.recharge.adapter.VIPRechargeAdapter @@ -52,7 +56,9 @@ import com.yingmao.clash.util.ThreadUtils import com.yingmao.clash.view.RxToast import com.yingmao.clash.view.dialog.DialogDoMainChoose import com.yingmao.clash.view.dialog.RxDialogShapeLoading +import com.yingmao.clash.vm.MainAtyVM import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch @@ -77,7 +83,7 @@ class MemberRechargeActivity : BaseActivity() { private lateinit var rxDialogShapeLoading: RxDialogShapeLoading private var outTradeNo = "" private var selectedGradeID: Int = 0 - + private lateinit var mainAtyVM: MainAtyVM //stripePay 支付 private var paymentIntentClientSecret: String = "" private val stripe: Stripe by lazy { @@ -96,12 +102,13 @@ class MemberRechargeActivity : BaseActivity() { } private fun initData() { + mainAtyVM = ViewModelProvider(this)[MainAtyVM::class.java] val validPeriod = MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD) setExpireDate(validPeriod) - if (checkExpire()) { - userIdentity.text = resources.getString(R.string.TemporaryUser) - } else { + if (isVip) { userIdentity.text = resources.getString(R.string.VIPMember) + } else { + userIdentity.text = resources.getString(R.string.TemporaryUser) } userIdentityNumber.text = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME) @@ -264,12 +271,19 @@ class MemberRechargeActivity : BaseActivity() { HttpReqType.GET_RECHARGE_INFO -> { Logger.d("获取充值续费信息请求成功") swipeLayout.isRefreshing = false - (httpStatus.rsp as RechargeInfoRsp).let { it -> - if (it.code != "1000") { - RxToast.error(if (it.message.isNullOrBlank()) resources.getString(R.string.FailedRechargeList) + "（${it.code}）" else "${it.code}:${it.message}") - } else { - it.data?.let { rechargeInfo -> - initAdapter(rechargeInfo) + (httpStatus.rsp as RechargeInfoRsp).let { + when (it.code) { + "1088" -> { + RxToast.info(resources.getString(R.string.LoginOut)) + cleanUserInfo() + } + "1000" -> { + it.data?.let { rechargeInfo -> + initAdapter(rechargeInfo) + } + } + else -> { + RxToast.error(if (it.message.isNullOrBlank())resources.getString(R.string.FailedRechargeList)+ "（${it.code}）" else "${it.code}:${it.message}") } } } @@ -652,4 +666,47 @@ class MemberRechargeActivity : BaseActivity() { finish() // 关闭当前 Activity super.onBackPressed() } + private fun cleanUserInfo() { + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_PH_TOKEN) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_TOKEN) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_CURRENT_NODE) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_SELECTED_NAME_KEY) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_VPN_UserCommand) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_All_ITEM_NAME_KEY) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.PROFILE_SUB_URL) + Log.d("cleanUserInfo clashRunning==>$clashRunning") + if (clashRunning) { + HomeFragment().stopClash() + } + UIMainActivity.isSubbed=false + mainAtyVM.stopHeartBeat() + cleanProfile() + val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + startActivity(intent) + finish() + } + private fun cleanProfile() { + Log.d("cleanProfile start") + GlobalScope.launch(Dispatchers.IO) { + profileBinder?.let { pm -> + pm.queryAll().forEach { profile -> + Log.d("cleanProfile go delete name==>${profile.name}, uuid==>${profile.uuid}") + pm.delete(profile.uuid) + } + } ?: let { + Log.d("profileBinder is null") + } + } + } + override fun onDestroy() { + super.onDestroy() + if(dialogDoMainChoose!=null){ + if(dialogDoMainChoose!!.isShowing){ + dialogDoMainChoose!!.dismiss() + dialogDoMainChoose=null + } + + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt index a5f0426..a3e010a 100644 --- a/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/UIMainActivity.kt @@ -39,6 +39,7 @@ import com.yingmao.clash.base.BaseActivity import com.yingmao.clash.conf.BZYConstants import com.yingmao.clash.conf.Conf import com.yingmao.clash.entity.CheckLoginRsp +import com.yingmao.clash.fragment.NewAccFragment import com.yingmao.clash.fragment.home.HomeFragment import com.yingmao.clash.fragment.setting.SettingFragment import com.yingmao.clash.listener.DownLoadListener @@ -47,6 +48,7 @@ import com.yingmao.clash.net.http.HttpReqType import com.yingmao.clash.net.http.HttpStatus import com.yingmao.clash.net.http.NetService import com.yingmao.clash.net.http.entity.AppVersionCheckRsp +import com.yingmao.clash.net.http.entity.ExpensesRecordRsp import com.yingmao.clash.net.http.entity.GetActivityRsp import com.yingmao.clash.net.http.entity.PhDownloadUrlRsp import com.yingmao.clash.net.http.entity.SubscriptionRsp @@ -100,7 +102,7 @@ class UIMainActivity : BaseActivity() { private var activityDialog: ActivityViewDialog? = null private var checkPayResultDia: MaterialDialog? = null private var checkBindAccountDia: MaterialDialog? = null - + private val mPageInfo = PageInfo() companion object { //记录心跳失败次数 var HEART_BEAT_FAILURE_FREQUENCY = 0 @@ -112,7 +114,6 @@ class UIMainActivity : BaseActivity() { var profileBinder: IProfileManager? = null var isUpload: Boolean = false var hostsMem: ArrayList = ArrayList() - var isSubed = false var newMainActGlo: Boolean = false public suspend fun setSub2(url: String) { profileBinder?.let { pm -> @@ -177,6 +178,8 @@ class UIMainActivity : BaseActivity() { } } } + var isVip:Boolean=false + } override fun onCreate(savedInstanceState: Bundle?) { @@ -195,6 +198,7 @@ class UIMainActivity : BaseActivity() { newMainActGlo = isGlobal startLog() firstEntry() + mainAtyVM.getExpensesRecord(mPageInfo) } private fun initView(savedInstanceState: Bundle?) { @@ -343,7 +347,10 @@ class UIMainActivity : BaseActivity() { } else { // RxToast.info(resources.getString(R.string.PaymentResultsStr)) } - } else { + }else if(checkLoginRsp.code == -2){ + RxToast.info(resources.getString(R.string.LoginOut)) + cleanUserInfoToLogout() + }else { RxToast.info(resources.getString(R.string.QueryFailed)) } payResultLoading?.dismiss() @@ -375,7 +382,30 @@ class UIMainActivity : BaseActivity() { } } } - + HttpReqType.EXPENSES_RECORD ->{ + if(httpStatus.rsp is ExpensesRecordRsp){ + httpStatus.rsp.let { expensesRecordRsp -> + if(expensesRecordRsp.code == "1000"){ + if(expensesRecordRsp.data != null) { + val expensesRecordList = expensesRecordRsp.data.expensesRecords + if(expensesRecordList!=null){ + if(expensesRecordList.size>0){ + isVip=true + }else{ + isVip=false + } + }else{ + isVip=false + } + }else{ + isVip=false + } + }else{ + isVip=false + } + } + } + } else -> { } @@ -435,6 +465,7 @@ class UIMainActivity : BaseActivity() { if (clashRunning) { fragments.filterIsInstance().forEach { it.stopClash() } } + isSubbed=false stopUploadTimer() mainAtyVM.stopHeartBeat() cleanProfile() @@ -703,4 +734,38 @@ class UIMainActivity : BaseActivity() { REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY ) } + private fun cleanUserInfoToLogout() { + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_PH_TOKEN) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_TOKEN) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_CURRENT_NODE) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_SELECTED_NAME_KEY) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_VPN_UserCommand) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_All_ITEM_NAME_KEY) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.PROFILE_SUB_URL) + Log.d("cleanUserInfo clashRunning==>${clashRunning}") + if (clashRunning) { + fragments.filterIsInstance().forEach { it.stopClash() } + } + isSubbed=false + stopUploadTimer() + mainAtyVM.stopHeartBeat() + cleanProfile() + val intent=Intent(CommonUtils.getApp(), LoginActivity::class.java) + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + startActivity(intent) + finish() + } + class PageInfo { + var page = 1 + fun nextPage() { + page++ + } + + fun reset() { + page = 1 + } + + val isFirstPage: Boolean + get() = page == 1 + } } \ No newline at end of file diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index e69062e..1b3169b 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -45,7 +45,7 @@ import com.yingmao.clash.act.ConnectionModeActivity import com.yingmao.clash.act.LoginActivity import com.yingmao.clash.act.UIMainActivity import com.yingmao.clash.act.UIMainActivity.Companion.clashBinder -import com.yingmao.clash.act.UIMainActivity.Companion.isSubed +import com.yingmao.clash.act.UIMainActivity.Companion.isSubbed import com.yingmao.clash.act.UIMainActivity.Companion.newMainActGlo import com.yingmao.clash.act.UIMainActivity.Companion.newUuid import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder @@ -66,6 +66,7 @@ import com.yingmao.clash.util.ActivityResultLifecycle import com.yingmao.clash.util.CommonUtils import com.yingmao.clash.util.MarqueeTextView import com.yingmao.clash.util.PayUtils +import com.yingmao.clash.util.Utils import com.yingmao.clash.util.startClashService import com.yingmao.clash.util.stopClashService import com.yingmao.clash.view.RxToast @@ -260,7 +261,13 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher } rxDialogSureCancel.show() } else { - startClash() + android.util.Log.i("AAAAAAAAAAAAA::","data isSubbed::: "+isSubbed) + if(isSubbed){ + startClash() + }else{ + RxToast.success(resources.getString(R.string.tooFast)) + } + } } clActivity.setOnClickListener { @@ -276,7 +283,7 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher var selected_name = - MMKV.defaultMMKV().decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, ""); + MMKV.defaultMMKV().decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, "") if (!TextUtils.isEmpty(selected_name)) { if (!BuildConfig.is_tz){ setNodeNameAndImg(selected_name!!) @@ -384,7 +391,12 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher MMKV.defaultMMKV().encode(BZYConstants.CONNECTID, dataInfo.data.id) val serviceIntent = Intent(requireContext(), ConnectionService::class.java) serviceIntent.putExtra("receiver", resultReceiver) - requireContext().startService(serviceIntent) + val serviceRunning = + Utils.isServiceRunning(requireContext(), ConnectionService::class.java) + android.util.Log.i("AppStartupStatus","data::"+serviceRunning) + if(!serviceRunning){ + requireContext().startService(serviceIntent) + } } } } @@ -520,14 +532,12 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher pm.setActive(profile) newUuid = profile.uuid.toString() - isSubed = true } ?: run { //为空的情况下选择第一个 pm.queryAll().forEach { profile -> pm.setActive(profile) newUuid = profile.uuid.toString() - isSubed = true return@forEach } } @@ -994,4 +1004,13 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher }) dialog.show() } + override fun onDestroy() { + super.onDestroy() + val serviceRunning = + Utils.isServiceRunning(requireContext(), ConnectionService::class.java) + if(serviceRunning){ + val serviceIntent= Intent(requireContext(), ConnectionService::class.java) + requireContext().stopService(serviceIntent) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt index f8acbc7..7a4bda8 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt @@ -57,7 +57,7 @@ import com.yingmao.clash.act.ShareActivity import com.yingmao.clash.act.SplashActivity import com.yingmao.clash.act.SplashHelper import com.yingmao.clash.act.UIMainActivity -import com.yingmao.clash.act.UIMainActivity.Companion.isSubed +import com.yingmao.clash.act.UIMainActivity.Companion.isVip import com.yingmao.clash.act.UIMainActivity.Companion.newUuid import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder import com.yingmao.clash.act.UIMainActivity.Companion.subUrl @@ -258,10 +258,10 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc } setExpireDate() - if (checkExpire()) { - userIdentity.text = requireActivity().resources.getString(R.string.TemporaryUser) - } else { + if (isVip) { userIdentity.text = requireActivity().resources.getString(R.string.VIPMember) + } else { + userIdentity.text = requireActivity().resources.getString(R.string.TemporaryUser) } userIdentityNumber.text = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME) @@ -338,6 +338,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc launch(Dispatchers.IO) { profileBinder?.let { pm -> pm.queryAll().forEach { profile -> + Log.d("setting profile delete ==>${profile.name}") pm.delete(profile.uuid) } @@ -637,10 +638,12 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_VPN_UserCommand) MMKV.defaultMMKV().removeValueForKey(BZYConstants.NODE_All_ITEM_NAME_KEY) MMKV.defaultMMKV().removeValueForKey(BZYConstants.PROFILE_SUB_URL) + MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_Switch_Finsh_Set) //清除源切换记录 - + + UIMainActivity.isSubbed=false Log.d("cleanUserInfo clashRunning==>${clashRunning}") if (clashRunning) { fragments.filterIsInstance().forEach { it.stopClash() } @@ -829,7 +832,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc delay(500) pm.update(it.uuid) newUuid = pro.uuid.toString() - isSubed = true } ?: run { val uuid: UUID = pm.create( Profile.Type.Url, Conf.getClashConfName(requireActivity().applicationContext) @@ -848,7 +850,6 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc ) } newUuid = qPro.uuid.toString() - isSubed = true // } } } @@ -908,7 +909,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc Log.d("new main actname==>" + actName) pm.setActive(it) newUuid = pro.uuid.toString(); - isSubed = true + UIMainActivity.isSubbed = true Log.d("setSub2 setActive end") finishInit() } ?: run { @@ -929,7 +930,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc ) } newUuid = qPro.uuid.toString(); - isSubed = true + UIMainActivity.isSubbed = true // } } finishInit() diff --git a/app/src/main/java/com/yingmao/clash/service/ConnectionService.java b/app/src/main/java/com/yingmao/clash/service/ConnectionService.java index 432e09a..18b1cfc 100644 --- a/app/src/main/java/com/yingmao/clash/service/ConnectionService.java +++ b/app/src/main/java/com/yingmao/clash/service/ConnectionService.java @@ -13,7 +13,7 @@ import com.yingmao.clash.fragment.AccelerateViewModel; public class ConnectionService extends Service { private static final String TAG = "TimerService"; - private static final long INTERVAL_MILLIS = 10000; // 10 秒 + private static final long INTERVAL_MILLIS = 60000; // 60 秒 private Handler handler = new Handler(); private Intent intent; private Runnable runnable = new Runnable() { diff --git a/app/src/main/java/com/yingmao/clash/util/Utils.kt b/app/src/main/java/com/yingmao/clash/util/Utils.kt index bd68f1d..a55eb29 100644 --- a/app/src/main/java/com/yingmao/clash/util/Utils.kt +++ b/app/src/main/java/com/yingmao/clash/util/Utils.kt @@ -2,6 +2,7 @@ package com.yingmao.clash.util import android.Manifest import android.app.Activity +import android.app.ActivityManager import android.content.Context import android.content.pm.PackageManager import android.media.MediaDrm @@ -286,5 +287,15 @@ object Utils { v.requestLayout() } } + fun isServiceRunning(context: Context, serviceClass: Class<*>): Boolean { + val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager + val runningServices = manager.getRunningServices(Int.MAX_VALUE) + for (service in runningServices) { + if (serviceClass.name == service.service.className) { + return true + } + } + return false + } } \ No newline at end of file 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 ea22259..f8b708f 100644 --- a/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt +++ b/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt @@ -12,11 +12,14 @@ import com.yingmao.clash.act.NewMainActivity import com.yingmao.clash.base.PublicViewMode import com.cncat.vpn.common.log.Log import com.google.gson.Gson +import com.yingmao.clash.act.PageInfo +import com.yingmao.clash.act.UIMainActivity import com.yingmao.clash.app.MainApplication import com.yingmao.clash.conf.BZYConstants import com.yingmao.clash.entity.CheckLoginRsp import com.yingmao.clash.entity.ClashNodebBean import com.yingmao.clash.entity.Node +import com.yingmao.clash.fragment.setting.SettingFragment import com.yingmao.clash.http.OkHttpBase import com.yingmao.clash.listener.AsyncCallBackListener import com.yingmao.clash.listener.DownLoadListener @@ -343,4 +346,18 @@ class MainAtyVM : PublicViewMode() { httpApi.appUpStatus(paramsToken,requestBody) } } + fun getExpensesRecord(page : UIMainActivity.PageInfo){ + val httpApi = NetService.instances.createHttps(HttpApi::class.java) + val username = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME,"")!! + val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN,"")!! + val userId = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_USER_ID)!! + val params = hashMapOf( + "phoneNumber" to username, + "userId" to userId, + "phToken" to phToken, + "pageno" to "${page.page}", + "pageSize" to "5", + ) + doAsync(HttpReqType.EXPENSES_RECORD){httpApi.phOrderList(params)} + } } \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 545bb7c..aa1ea77 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -358,4 +358,6 @@ Service Description\n Go to login Email registration Recharge Membership + It is detected that the current account is logged in on other devices. If it is not your own operation, please change the password immediately and log out of the unfamiliar device. + The application is initializing. Please wait for 1~2 seconds and try again. \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1896975..fb30da2 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -349,4 +349,6 @@ 手動注册 充值會員 + 檢測到當前賬號在其他設備登錄，如非本人操作，請立即修改密碼並退出陌生設備。 + 應用初始化中,請等待1~2秒後重試 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b4fcc26..2cef652 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -347,4 +347,6 @@ 雲梯加速器 手動注册 充值會員 + 檢測到當前賬號在其他設備登錄，如非本人操作，請立即修改密碼並退出陌生設備。 + 應用初始化中,請等待1~2秒後重試 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a36634c..3c85c12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -369,4 +369,6 @@ 手动注册 充值会员 + 检测到当前账号在其他设备登录，如非本人操作，请立即修改密码并退出陌生设备。 + 应用初始化中,请等待1~2秒后重试 \ No newline at end of file