Skip to content

S
ShenghuoquanBusiness
Commit a20bee8c authored by shiyl's avatar shiyl
Browse files
Options

系统设置迁移到Setting模块

parent d5d2cb4e
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 160 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/bean/HintOptionBean.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/bean/HintOptionBean.kt
View file @ a20bee8c
package com.yidian.shenghuoquan.newscontent.bean
package com.yidian.bcommon.bean
/**
* author: yinjiacheng
* date: 6/8/21 12:54 AM
* description: 提示dialog内操作项
*/
data class HintOptionBean(val option: String)
\ No newline at end of file
data class HintOptionBean(val option: String)
CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
View file @ a20bee8c
......@@ -68,10 +68,10 @@ class AppConfig {
const val SinaCallBackUrl = "https://api.weibo.com/oauth2/default.html"
// 用户协议
const val userProtocol = "https://www.appgc.cn/plugins/privacy/content?type=mp&appId=1080334&ver=210601"
const val userProtocol = "http://merchant.jwshq.cn/home/agreement"
// 隐私政策
const val privacyPolicy = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
const val privacyPolicy = "http://merchant.jwshq.cn/home/policy"
// 我的钱包 - 常见问题
const val commonProblem = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
......
CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/IntentConstants.kt 0 → 100644
View file @ a20bee8c
package com.yidian.bcommon.constant
/**
* 页面通信的key常量
*/
object IntentConstants {
// 管理中心传递到系统设置的TowerPro的配置信息
const val KEY_EXTRA_COMMON_CONFIG = "commonConfig"
}
CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/bean/GetCommonConfigBean.kt
View file @ a20bee8c
......@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName
import java.io.Serializable
/**
* TowerPro的配置信息
*
* author: yinjiacheng
* date: 7/12/21 10:10 PM
* description: open-tower-api.go2yd.com/api/resource
......
CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ZapServiceActionConstants.kt
View file @ a20bee8c
......@@ -7,6 +7,8 @@ package com.yidian.bcommon.services
class ZapServiceActionConstants {
companion object {
// 退出登录
const val ActionLogout = "ActionLogout"
// 请求生活号列表
const val ActionRequestList = "ActionRequestList"
// 请求短信验证码
......
CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ZapServiceNameConstants.kt
View file @ a20bee8c
......@@ -7,10 +7,12 @@ package com.yidian.bcommon.services
class ZapServiceNameConstants {
companion object {
// BSetting组件中的设置相关服务
const val SettingService = "SettingService"
// 生活号列表服务名称
const val LifeNumberListServiceName = "LifeNumberListService"
const val LifeNumberListService = "LifeNumberListService"
// BGeneralBusiness组件中提供的通用服务
const val GeneralAbilityServiceName = "GeneralAbilityServiceName"
const val GeneralAbilityService = "GeneralAbilityService"
// BGeneralBusiness组件中给H5提供的通用网络请求服务(名称需要和H5同步的)
const val BNAHttpReq = "BNAHttpReq"
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/HintDialog.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/widget/dialog/HintDialog.kt
View file @ a20bee8c
package com.yidian.shenghuoquan.newscontent.ui.dialog
package com.yidian.bcommon.widget.dialog
import android.annotation.SuppressLint
import android.content.Context
......@@ -6,12 +6,11 @@ import android.os.Bundle
import android.view.View
import android.view.WindowManager
import androidx.annotation.ColorInt
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import com.yidian.bcommon.R
import com.yidian.bcommon.base.BaseDialog
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.databinding.DialogHintBinding
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.bcommon.databinding.DialogHintBinding
import com.yidian.utils.DensityUtil
......
Components/newscontent/src/main/res/drawable/bg_hint_dialog.xml → CommonLib/BCommon/src/main/res/drawable/bg_hint_dialog.xml
View file @ a20bee8c
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_FFFFFFFF" />
<solid android:color="@color/white" />
<corners android:radius="12dp" />
......
Components/newscontent/src/main/res/layout/dialog_hint.xml → CommonLib/BCommon/src/main/res/layout/dialog_hint.xml
View file @ a20bee8c
......@@ -50,7 +50,7 @@
android:layout_width="0dp"
android:layout_height="46dp"
android:background="@null"
android:textColor="@color/color_FF1852F1"
android:textColor="@color/color_1852F1"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_left"
......
Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/app/BGeneralBusinessApplication.kt
View file @ a20bee8c
......@@ -20,6 +20,6 @@ class BGeneralBusinessApplication : YdBaseApplication() {
private fun initService() {
Zap.addService(ZapServiceNameConstants.BNAHttpReq, BNAHttpReqService())
Zap.addService(ZapServiceNameConstants.GeneralAbilityServiceName, GeneralAbilityService())
Zap.addService(ZapServiceNameConstants.GeneralAbilityService, GeneralAbilityService())
}
}
Components/BRoot/src/main/java/com/yidian/shenghuoquan/broot/ui/FlashActivity.kt
View file @ a20bee8c
......@@ -69,7 +69,7 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>() {
val loginStatus = Hawk.get(HawkConfig.LoginStatus, false)
if (loginStatus) {
// 已登录请求生活号列表
ZapTicket(ZapServiceNameConstants.LifeNumberListServiceName).withAction(ZapServiceActionConstants.ActionRequestList)
ZapTicket(ZapServiceNameConstants.LifeNumberListService).withAction(ZapServiceActionConstants.ActionRequestList)
.onResult { result ->
// 请求生活号列表成功，关闭启动页
if (result.result as Boolean) {
......
Components/BSetting/src/main/AndroidManifest.xml
View file @ a20bee8c
......@@ -4,6 +4,7 @@
<application>
<activity android:name=".ui.login.LoginLifeCircleActivity" />
<activity android:name=".ui.setting.SystemSettingActivity" />
</application>
</manifest>
\ No newline at end of file
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/app/BSettingApplication.kt
View file @ a20bee8c
......@@ -3,12 +3,15 @@ package com.yidian.shenghuoquan.bsetting.app
import android.content.Intent
import com.yidian.bcommon.app.YdBaseApplication
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.news.util.ProcessUtil
import com.yidian.shenghuoquan.bsetting.service.SettingService
import com.yidian.xpage.XPageManager
import com.yidian.xpage.node.XPageHandler
import com.yidian.xpage.node.XPageNode
import com.yidian.xpage.node.XPageNodePageType
import com.yidian.yac.core.core.YacModuleSpec
import com.yidian.yac.core.zap.Zap
@YacModuleSpec
class BSettingApplication : YdBaseApplication() {
......@@ -39,8 +42,7 @@ class BSettingApplication : YdBaseApplication() {
}
private fun initService() {
// Zap.addService(SelectCategoryService.serviceName, SelectCategoryService())
// Zap.addService(GoodsPublishService.SERVICE_NAME, GoodsPublishService())
Zap.addService(ZapServiceNameConstants.SettingService, SettingService())
}
}
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/app/ClassMapUtil.kt
View file @ a20bee8c
......@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.bsetting.app
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.shenghuoquan.bsetting.ui.login.LoginLifeCircleActivity
import com.yidian.shenghuoquan.bsetting.ui.setting.SystemSettingActivity
/**
......@@ -11,7 +12,7 @@ object ClassMapUtil {
val xPageNodeMap = mapOf(
XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE to LoginLifeCircleActivity::class.java,// 启动页
// XRouterPathConstants.Companion.COMMODITY_MANAGEMENT to CommodityManagementActivity::class.java, // 商品管理
XRouterPathConstants.Companion.SYSTEM_SETTING to SystemSettingActivity::class.java, // 商品管理
)
}
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/http/SettingRemoteDataSource.kt
View file @ a20bee8c
......@@ -31,4 +31,23 @@ object SettingRemoteDataSource {
})
}
/**
* 用户退出登录接口
*/
fun userLogout(callback: ((Boolean) -> Unit)? = null) {
val timeStamp = System.currentTimeMillis()
val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
api.userLogout(publicParamsMap, privateParamsMap)
.compose(TransformUtil.defaultSchedulers())
.subscribe(object : HttpResultSubscriber<Any?>() {
override fun onSuccess(result: HttpResult<Any?>?) {
callback?.invoke(true)
}
override fun onFailure(result: HttpResult<Any?>?) {
}
})
}
}
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/service/SettingService.kt 0 → 100644
View file @ a20bee8c
package com.yidian.shenghuoquan.bsetting.service
import com.yidian.bcommon.services.ZapServiceActionConstants
import com.yidian.shenghuoquan.bsetting.http.SettingRemoteDataSource
import com.yidian.xarc.xrouter.ResultResolver
import com.yidian.yac.core.zap.ZapService
import org.json.JSONObject
/**
* 设置相关的服务
*/
class SettingService : ZapService() {
private lateinit var resolver: ResultResolver
override fun onAction(path: String, action: String, params: Any, options: Any, resolver: ResultResolver) {
this.resolver = resolver
params as JSONObject
when (action) {
ZapServiceActionConstants.ActionLogout -> requestLogout()
}
}
override fun onExit() {
}
override fun onInit() {
}
/**
* 请求退出登录
*/
private fun requestLogout() {
SettingRemoteDataSource.userLogout {
if (it) {
resolver.success(it)
}
}
}
}
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/ui/login/LoginLifeCircleActivity.kt
View file @ a20bee8c
......@@ -143,7 +143,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), View.OnFoc
Hawk.put(HawkConfig.Nickname, loginResponse.nick_name)
Hawk.put(HawkConfig.Avatar, loginResponse.avatar)
// 登录成功后请求生活号列表接口
ZapTicket(ZapServiceNameConstants.LifeNumberListServiceName).withAction(ZapServiceActionConstants.ActionRequestList)
ZapTicket(ZapServiceNameConstants.LifeNumberListService).withAction(ZapServiceActionConstants.ActionRequestList)
.onResult { result ->
// 请求生活号列表成功，关闭启动页
if (result.result as Boolean) {
......@@ -182,7 +182,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), View.OnFoc
// 生活号id
StorageUtil.deleteLifeAccountId()
// 通过服务 清除内存中的认证数据
ZapTicket(ZapServiceNameConstants.LifeNumberListServiceName)
ZapTicket(ZapServiceNameConstants.LifeNumberListService)
.withAction(ZapServiceActionConstants.ActionClearAuthenticationData)
.ship()
}
......@@ -194,7 +194,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), View.OnFoc
val jsonObject = JSONObject()
jsonObject.put("mobile", mobile)
jsonObject.put("scene", "login")
ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
ZapTicket(ZapServiceNameConstants.GeneralAbilityService)
.withAction(ZapServiceActionConstants.ActionRequestSmsCode)
.withServiceParams(jsonObject)
.onResult { result ->
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/setting/SystemSettingActivity.kt → Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/ui/setting/SystemSettingActivity.kt
View file @ a20bee8c
package com.yidian.shenghuoquan.newscontent.ui.setting
package com.yidian.shenghuoquan.bsetting.ui.setting
import android.os.Build
import android.os.Bundle
......@@ -11,20 +11,20 @@ import com.yidian.bcommon.constant.HawkConfig
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SYSTEM_SETTING
import com.yidian.bcommon.base.BaseActivity
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.bcommon.constant.IntentConstants
import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.bcommon.extensions.initTitleBar
import com.yidian.bcommon.http.bean.GetCommonConfigBean
import com.yidian.bcommon.services.AppUpgradeService
import com.yidian.bcommon.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SystemSettingUtils
import com.yidian.bcommon.webview.PublicWebViewActivity
import com.yidian.bcommon.widget.CommonInfoDialog
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.databinding.ActivitySystemSettingBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
import com.yidian.shenghuoquan.newscontent.http.callback.IUserLogoutCallBack
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.shenghuoquan.bsetting.R
import com.yidian.shenghuoquan.bsetting.databinding.ActivitySystemSettingBinding
import com.yidian.shenghuoquan.bsetting.http.SettingRemoteDataSource
import com.yidian.utils.ToastUtil
import com.yidian.xarc.xbase.utils.AppUtils
import com.yidian.xpage.XPageManager
......@@ -36,16 +36,12 @@ import com.yidian.yac.core.zap.ZapTicket
*/
class SystemSettingActivity : BaseActivity<ActivitySystemSettingBinding>() {
companion object {
const val EXTRA_COMMON_CONFIG = "commonConfig"
}
/**
* TowerPro通用配置
*/
private val commonConfig by lazy {
intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { serializable ->
(serializable as HashMap<*, *>)[EXTRA_COMMON_CONFIG]?.let {
(serializable as HashMap<*, *>)[IntentConstants.KEY_EXTRA_COMMON_CONFIG]?.let {
it as GetCommonConfigBean.Data
}
}
......@@ -128,18 +124,20 @@ class SystemSettingActivity : BaseActivity<ActivitySystemSettingBinding>() {
}
override fun onRightOption() {
ApiService.userLogout(logoutCallBack)
requestLogout()
}
})
dialog.setLeftBtnColor(ContextCompat.getColor(this, R.color.color_666666))
dialog.setRightBtnColor(ContextCompat.getColor(this, R.color.color_FFFF3A3A))
dialog.setRightBtnColor(ContextCompat.getColor(this, R.color.color_FF3A3A))
dialog.show()
}
private val logoutCallBack = object : IUserLogoutCallBack {
override fun userLogoutSuccess() {
ToastUtil.showToast(this@SystemSettingActivity, "退出登录成功")
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
private fun requestLogout() {
SettingRemoteDataSource.userLogout {
if (it) {
ToastUtil.showToast(this@SystemSettingActivity, "退出登录成功")
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
}
}
......
Components/BSetting/src/main/manifest/AndroidManifest.xml
View file @ a20bee8c
......@@ -4,6 +4,7 @@
<application>
<activity android:name=".ui.login.LoginLifeCircleActivity" />
<activity android:name=".ui.setting.SystemSettingActivity" />
</application>
</manifest>
Components/newscontent/src/main/res/layout/activity_system_setting.xml → Components/BSetting/src/main/res/layout/activity_system_setting.xml
View file @ a20bee8c
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FFF5F6F7"
android:background="@color/color_F5F6F7"
android:orientation="vertical">
<include
......@@ -40,7 +40,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -101,7 +101,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -130,7 +130,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -160,7 +160,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -222,7 +222,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -251,7 +251,7 @@
<ImageView
android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
Components/BSetting/src/main/res/values/strings.xml 0 → 100644
View file @ a20bee8c
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="setting">设置</string>
<string name="logout_account">注销账号</string>
<string name="logout_description">
<Data>
<![CDATA[<p><font color=\'#DE000000\'>如果您经过慎重考虑，确定放弃账户，您的账户需同时满足以下条件:</font></p><p><font color=\'#DE000000\'>1、账户无异常行为记录，且账户信息无相关注销记录;</font></p><p><font color=\'#DE000000\'>2、账户内无未完成状态或完成未满15天的订单;</font></p><p><font color=\'#DE000000\'>3、账户无纠纷;</font></p><p><font color=\'#DE000000\'>4、账户下无资金、无欠款、无未完结历史订单;</font></p><p><font color=\'#DE000000\'>5、账户注销同时原钱包将同时注销，确保钱包处于正常状态、无余额零钱、无未完成交易、无处理中提现请求，不存在其他因注销账户产生的纠纷情况等。</font></p><br></br><p><font color=\'#DE000000\'>您的账户满足注销条件，您可以通过发送邮件至<font color=\'#1852F1\'>support.tpo@linkingcities.com</font>进行注销申请，我们将在15个工作日内为您进行处理。</font></p><br></br><p><b><font color=\'#DE000000\'>提示:</font></b></p><p><font color=\'#DE000000\'>账户注销后，账户信息及账户在平台产生的资产、虚拟权益无法恢复，可能对您主张售后服务带来不便。商户端账户注销将影响您在生活圈App内相关权益及信息。</font></p>]]>
</Data>
</string>
<string name="commit_feedback">提交反馈</string>
<string name="describe_your_feedback">请简要明确的描述您的意见和建议</string>
<string name="user_feedback">用户反馈</string>
<string name="close">关闭</string>
<string name="conform_logout">确定退出登录</string>
</resources>
\ No newline at end of file
Components/newscontent/src/main/AndroidManifest.xml
View file @ a20bee8c
......@@ -59,9 +59,6 @@
<activity
android:name=".personnel.ui.AddStaffActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.setting.SystemSettingActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.center.MerchantCenterActivity"
android:theme="@style/Transparent" />
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
View file @ a20bee8c
......@@ -16,7 +16,6 @@ import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_I
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.MERCHANT_CENTER
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
......@@ -25,7 +24,6 @@ import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MY_ST
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.STORE_MANAGEMENT
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SYSTEM_SETTING
import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.news.util.ProcessUtil
import com.yidian.nightmode.util.NightModeUtil
......@@ -35,7 +33,6 @@ import com.yidian.shenghuoquan.newscontent.service.SelectStoreService
import com.yidian.shenghuoquan.newscontent.ui.auth.*
import com.yidian.shenghuoquan.newscontent.ui.center.*
import com.yidian.shenghuoquan.newscontent.ui.setting.FeedbackActivity
import com.yidian.shenghuoquan.newscontent.ui.setting.SystemSettingActivity
import com.yidian.shenghuoquan.newscontent.ui.store.ChooseStoreActivity
import com.yidian.shenghuoquan.newscontent.ui.store.StoreManagementActivity
import com.yidian.shenghuoquan.newscontent.wallet.ui.*
......@@ -250,17 +247,6 @@ class NewsContentApplication : YdBaseApplication() {
context.startActivity(intent)
}
}),
XPageNode(SYSTEM_SETTING, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, SystemSettingActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode(MERCHANT_CENTER, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
......@@ -398,7 +384,7 @@ class NewsContentApplication : YdBaseApplication() {
}
private fun initService() {
Zap.addService(ZapServiceNameConstants.LifeNumberListServiceName, LifeNumberListService())
Zap.addService(ZapServiceNameConstants.LifeNumberListService, LifeNumberListService())
Zap.addService(SelectStoreService.serviceName, SelectStoreService())
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt
View file @ a20bee8c
......@@ -55,24 +55,6 @@ class ApiService {
})
}
// 用户退出登录接口
fun userLogout(apiCallback: IUserLogoutCallBack) {
val timeStamp = System.currentTimeMillis()
val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(HashMap(), timeStamp)
ServiceFactory.getInstance().createService(CommonService::class.java)
.userLogout(publicParamsMap, privateParamsMap)
.compose(TransformUtil.defaultSchedulers())
.subscribe(object : HttpResultSubscriber<Any?>() {
override fun onSuccess(result: HttpResult<Any?>?) {
apiCallback.userLogoutSuccess()
}
override fun onFailure(result: HttpResult<Any?>?) {
}
})
}
// 101 身份信息校验接口
fun authPersonalCheck(apiCallback: IAuthPersonalCheckCallback, requestParams: HashMap<String, String?>) {
val timeStamp = System.currentTimeMillis()
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IUserLogoutCallBack.kt deleted 100644 → 0
View file @ d5d2cb4e
package com.yidian.shenghuoquan.newscontent.http.callback
interface IUserLogoutCallBack {
fun userLogoutSuccess()
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/AddStaffActivity.kt
View file @ a20bee8c
......@@ -131,7 +131,7 @@ class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
val jsonObject = JSONObject()
jsonObject.put("mobile", mobile)
jsonObject.put("scene", "add_user")
ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
ZapTicket(ZapServiceNameConstants.GeneralAbilityService)
.withAction(ZapServiceActionConstants.ActionRequestSmsCode)
.withServiceParams(jsonObject)
.onResult { result ->
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt
View file @ a20bee8c
......@@ -21,12 +21,12 @@ import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.bcommon.widget.EditTextInputCallback
import com.yidian.bcommon.widget.PhoneNumberTextWatcher
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerChangeBinding
import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalChangeAccountCallBack
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalCheckSmsCodeCallBack
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.bcommon.utils.CountDownTimerUtils
import com.yidian.bcommon.utils.StorageUtil
import com.yidian.bcommon.utils.TextWatcherAdapter
......@@ -201,7 +201,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
val jsonObject = JSONObject()
jsonObject.put("mobile", mobile)
jsonObject.put("scene", "enterprise")
ZapTicket(ZapServiceNameConstants.GeneralAbilityServiceName)
ZapTicket(ZapServiceNameConstants.GeneralAbilityService)
.withAction(ZapServiceActionConstants.ActionRequestSmsCode)
.withServiceParams(jsonObject)
.onResult { result ->
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerInfoActivity.kt
View file @ a20bee8c
......@@ -10,7 +10,7 @@ import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerInfoBinding
import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountAdmin
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
import com.yidian.xpage.XPageManager
/**
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffInfoActivity.kt
View file @ a20bee8c
......@@ -10,7 +10,7 @@ import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffInfoBinding
import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountUser
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
import com.yidian.xpage.XPageManager
/**
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffManageActivity.kt
View file @ a20bee8c
......@@ -6,15 +6,15 @@ import androidx.core.content.ContextCompat
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
import com.yidian.bcommon.base.BaseActivity
import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffManageBinding
import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountUser
import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalDissolveCallBack
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.bcommon.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.StorageUtil
import com.yidian.xpage.XPageManager
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthActivity.kt
View file @ a20bee8c
......@@ -5,15 +5,18 @@ import android.view.View
import androidx.core.view.isVisible
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.base.BaseActivity
import com.yidian.bcommon.services.ZapServiceActionConstants
import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountAuthBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
import com.yidian.shenghuoquan.newscontent.http.callback.IAuthAuthenticationCallback
import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback
import com.yidian.shenghuoquan.newscontent.http.callback.IUserLogoutCallBack
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthAuthenticationBean
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
import com.yidian.xpage.XPageManager
import com.yidian.yac.core.zap.ZapTicket
import timber.log.Timber
/**
* author: yinjiacheng
......@@ -21,7 +24,7 @@ import com.yidian.xpage.XPageManager
* description: 生活号认证
*/
class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(), View.OnClickListener, IAuthAuthenticationCallback,
IAuthMerchantCheckCallback, IUserLogoutCallBack {
IAuthMerchantCheckCallback {
companion object {
// 从哪个页面跳转
......@@ -79,9 +82,6 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
override fun onClick(v: View?) {
when (v?.id) {
R.id.tv_join_strategy -> {
// TODO: 5/26/21 入驻攻略
}
R.id.view_personal_auth -> {
// 请求个人认证信息 用于回显已填入的信息
ApiService.authAuthentication(this)
......@@ -92,11 +92,21 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
}
R.id.btn_logout -> {
// 退出登录
ApiService.userLogout(this)
requestLogout()
}
}
}
private fun requestLogout() {
ZapTicket(ZapServiceNameConstants.SettingService).withAction(ZapServiceActionConstants.ActionLogout)
.onResult { result ->
if (result.result as Boolean) {
// 退出登录成功 跳转登录页面
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
}.ship()
}
override fun authAuthenticationSuccess(result: AuthAuthenticationBean.Response?) {
viewBind.viewPersonalAuth.isSelected = true
viewBind.viewEnterpriseAuth.isSelected = false
......@@ -125,8 +135,4 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
}
override fun userLogoutSuccess() {
// 退出登录成功 跳转登录页面
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountCreateActivity.kt
View file @ a20bee8c
......@@ -16,7 +16,7 @@ import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountCreateBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.TextWatcherAdapter
import com.yidian.utils.ToastUtil
import com.yidian.xpage.XPageManager
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragment.kt
View file @ a20bee8c
......@@ -26,7 +26,7 @@ import com.yidian.bcommon.http.HttpResult
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.FragmentLifeAccountIdCardAuthBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
......@@ -36,7 +36,7 @@ import com.yidian.shenghuoquan.newscontent.http.callback.IAuthLiveIdentityCallba
import com.yidian.shenghuoquan.newscontent.http.callback.IAuthPersonalCheckCallback
import com.yidian.shenghuoquan.newscontent.http.httpbean.*
import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.utils.BitmapUtil
import com.yidian.shenghuoquan.newscontent.utils.FileUtil
import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
View file @ a20bee8c
......@@ -26,7 +26,7 @@ import com.yidian.framework.mobile.insight.manage.XInsight
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.FragmentLifeAccountIdCardAuthBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
......@@ -36,7 +36,7 @@ import com.yidian.shenghuoquan.newscontent.http.callback.IAuthLiveIdentityCallba
import com.yidian.shenghuoquan.newscontent.http.callback.IAuthPersonalCheckCallback
import com.yidian.shenghuoquan.newscontent.http.httpbean.*
import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.utils.BitmapUtil
import com.yidian.shenghuoquan.newscontent.utils.FileUtil
import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthActivity.kt
View file @ a20bee8c
......@@ -8,19 +8,21 @@ import com.yidian.bcommon.constant.HawkConfig
import com.yidian.bcommon.constant.XEventConfig
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.base.BaseActivity
import com.yidian.bcommon.services.ZapServiceActionConstants
import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
import com.yidian.shenghuoquan.newscontent.http.callback.IAuthPersonalCompleteCallback
import com.yidian.shenghuoquan.newscontent.http.callback.IUserLogoutCallBack
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthAuthenticationBean
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthPersonalCompleteBean
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.bcommon.utils.StorageUtil
import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
import com.yidian.xarc.xevent.XBaseEvent
import com.yidian.xarc.xevent.XEventManager
import com.yidian.xpage.XPageManager
import com.yidian.yac.core.zap.ZapTicket
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
......@@ -31,7 +33,7 @@ import org.greenrobot.eventbus.ThreadMode
*/
class LifeAccountPersonalAuthActivity :
BaseActivity<ActivityLifeAccountPersonalAuthBinding>(), View.OnClickListener, CompoundButton.OnCheckedChangeListener,
IAuthPersonalCompleteCallback, HintDialog.OnHintOptionCallback, IUserLogoutCallBack, CommonTopBarView.OnCommonTopBarBackCallback {
IAuthPersonalCompleteCallback, HintDialog.OnHintOptionCallback, CommonTopBarView.OnCommonTopBarBackCallback {
companion object {
// 认证数据
......@@ -215,11 +217,17 @@ class LifeAccountPersonalAuthActivity :
override fun onRightOption() {
// 重新登录
ApiService.userLogout(this)
requestLogout()
}
override fun userLogoutSuccess() {
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
private fun requestLogout() {
ZapTicket(ZapServiceNameConstants.SettingService).withAction(ZapServiceActionConstants.ActionLogout)
.onResult { result ->
if (result.result as Boolean) {
// 退出登录成功 跳转登录页面
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
}.ship()
}
override fun onDoBack() {
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @ a20bee8c
......@@ -8,10 +8,6 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
import com.scwang.smart.refresh.layout.api.RefreshLayout
import com.scwang.smart.refresh.layout.listener.OnRefreshListener
import com.yidian.bcommon.constant.AppConfig
import com.yidian.bcommon.constant.XBirdPageConstants
import com.yidian.bcommon.constant.XEventConfig
import com.yidian.bcommon.constant.XRouterPathConstants
import com.yidian.bcommon.base.BaseActivity
import com.yidian.bcommon.http.CommonDataSource
import com.yidian.bcommon.http.bean.GetCommonConfigBean
......@@ -19,7 +15,7 @@ import com.yidian.bcommon.http.callback.IGetCommonConfigCallback
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.MerchantServiceFunctionAdapter
import com.yidian.shenghuoquan.newscontent.adapter.MerchantServiceGroupAdapter
import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
import com.yidian.bcommon.bean.HintOptionBean
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.ActivityMerchantCenterBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService
......@@ -27,11 +23,13 @@ import com.yidian.shenghuoquan.newscontent.http.callback.*
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
import com.yidian.shenghuoquan.newscontent.http.httpbean.GetLifeAccountInfoByIdBean
import com.yidian.bcommon.bean.LifeAccountItemBean
import com.yidian.bcommon.constant.*
import com.yidian.bcommon.services.ZapServiceActionConstants
import com.yidian.bcommon.services.ZapServiceNameConstants
import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountAuthActivity
import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountEnterpriseAuthActivity
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.bcommon.widget.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.ui.dialog.MerchantCenterBottomHintDialog
import com.yidian.shenghuoquan.newscontent.ui.setting.SystemSettingActivity
import com.yidian.bcommon.utils.StorageUtil
import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
import com.yidian.shenghuoquan.newscontent.widget.LifeAccountLabelView
......@@ -40,6 +38,7 @@ import com.yidian.utils.ToastUtil
import com.yidian.xarc.xevent.XBaseEvent
import com.yidian.xarc.xevent.XEventManager
import com.yidian.xpage.XPageManager
import com.yidian.yac.core.zap.ZapTicket
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
......@@ -51,7 +50,7 @@ import org.greenrobot.eventbus.ThreadMode
class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), MerchantSwitchDialog.OnMerchantSwitchCallback,
LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener, IUserLogoutCallBack,
MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener,
DialogInterface.OnShowListener, DialogInterface.OnDismissListener, IGetCommonConfigCallback {
companion object {
......@@ -144,8 +143,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
* 刷新商户管理中心相关数据
*/
private fun refreshMerchantCenterData(
lifeAccountData: LifeAccountItemBean.Response,
configData: GetCommonConfigBean.Data
lifeAccountData: LifeAccountItemBean.Response,
configData: GetCommonConfigBean.Data
) {
// 设置标签
viewBind.lvLifeAccountLabel.isVisible = true
......@@ -229,7 +228,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
hashMapOf(XBirdPageConstants.PAGE_URL to pageUrl)
// 系统设置传参TowerPro配置数据
functionParamsMap[data.merchantManagerCenter.items[2].functions[3].functionId] =
hashMapOf(SystemSettingActivity.EXTRA_COMMON_CONFIG to data)
hashMapOf(IntentConstants.KEY_EXTRA_COMMON_CONFIG to data)
// 认证管理传参生活号id和生活号key tag
functionParamsMap[data.merchantManagerCenter.items[2].functions[4].functionId] =
hashMapOf(
......@@ -561,10 +560,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
)
}
override fun userLogoutSuccess() {
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
override fun onShow(dialog: DialogInterface?) {
// 切换主体弹窗显示
// 更改页面标题背景色
......@@ -585,7 +580,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
if (lifeAccountResult?.size == 0) {
// 如果当前无生活号则退出登录
ToastUtil.showToast(this@MerchantCenterActivity, resources.getString(R.string.no_life_account))
ApiService.userLogout(this@MerchantCenterActivity)
requestLogout()
return
}
if (lifeAccountResult?.contains(curLifeAccount) == false) {
......@@ -621,4 +616,14 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
override fun getCommonConfigFailure(message: String?) {
viewBind.rlRefresh.finishRefresh(false)
}
private fun requestLogout() {
ZapTicket(ZapServiceNameConstants.SettingService).withAction(ZapServiceActionConstants.ActionLogout)
.onResult { result ->
if (result.result as Boolean) {
// 退出登录成功 跳转登录页面
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
}
}.ship()
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountEnterpriseAuthInfoView.kt
View file @ a20bee8c
......@@ -8,7 +8,7 @@ import androidx.core.content.ContextCompat
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountEnterpriseAuthInfoBinding
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
/**
* author: yinjiacheng
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountMerchantInfoView.kt
View file @ a20bee8c
......@@ -6,7 +6,7 @@ import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountMerchantInfoBinding
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
/**
* author: yinjiacheng
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountPersonalAuthInfoView.kt
View file @ a20bee8c
......@@ -6,7 +6,7 @@ import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountPersonalAuthInfoBinding
import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
import com.yidian.bcommon.utils.SensitiveInfoUtil
/**
* author: yinjiacheng
......
Components/newscontent/src/main/manifest/AndroidManifest.xml
View file @ a20bee8c
......@@ -59,9 +59,6 @@
<activity
android:name=".personnel.ui.AddStaffActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.setting.SystemSettingActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.center.MerchantCenterActivity"
android:theme="@style/Transparent" />
......
Components/newscontent/src/main/res/layout/activity_my_wallet.xml
View file @ a20bee8c
......@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp20"
android:drawableEnd="@mipmap/icon_next"
android:drawableEnd="@drawable/icon_next"
android:text="交易明细"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp14" />
......
Components/newscontent/src/main/res/layout/view_life_account_auth_select.xml
View file @ a20bee8c
......@@ -34,7 +34,7 @@
android:id="@+id/iv_select"
android:layout_width="23dp"
android:layout_height="23dp"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
Components/newscontent/src/main/res/layout/view_life_account_face_auth.xml
View file @ a20bee8c
......@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp2"
android:drawableEnd="@mipmap/icon_next"
android:drawableEnd="@drawable/icon_next"
android:text="@string/start_face_auth"
android:textColor="#FF1852F1"
android:textSize="15sp"
......
Components/newscontent/src/main/res/layout/view_life_account_label.xml
View file @ a20bee8c
......@@ -45,7 +45,7 @@
android:id="@+id/iv_life_account_detail"
android:layout_width="@dimen/dp23"
android:layout_height="@dimen/dp23"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
Components/newscontent/src/main/res/layout/view_merchant_info.xml
View file @ a20bee8c
......@@ -40,7 +40,7 @@
android:layout_width="@dimen/dp28"
android:layout_height="@dimen/dp28"
android:padding="@dimen/dp4"
android:src="@mipmap/icon_next"
android:src="@drawable/icon_next"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
Components/newscontent/src/main/res/values/strings.xml
View file @ a20bee8c
......@@ -148,8 +148,6 @@
<string name="manager_account_change_tips">管理员账号替换后，原账户将无法操作生活号所有功能，同时将自动退出当前登录状态，新账号将继承原账号所有权益。</string>
<string name="manager_register_tips">未注册生活圈的手机号，登录时将自动注册，且代表你已经同意《用户协议》《隐私政策》。</string>
<string name="dissolve_relationship">解除关系后此账号将不再有权限管理企业信息，账号已产生内容仍属企业</string>
<string name="setting">设置</string>
<string name="conform_logout">确定退出登录</string>
<string name="life_account_name">名称</string>
<string name="life_account_auth_info">认证信息</string>
<string name="merchant_upgrade">商户升级</string>
......@@ -168,7 +166,6 @@
<string name="upgrade_to_use_more_tool">升级后才能使用更多平台工具</string>
<string name="auth_to_use_more_tool">认证后才能使用更多平台工具</string>
<string name="audit_urgent">正在加急审核认证</string>
<string name="close">关闭</string>
<string name="goto_auth">去认证</string>
<string name="goto_upgrade">去升级</string>
<string name="goto_modify">去修改</string>
......@@ -180,14 +177,6 @@
<string name="no_stores">暂无门店</string>
<string name="click_below_add_store">请点击下方新增门店</string>
<string name="click_top_right_add_store">请点击右上角新增门店</string>
<string name="logout_account">注销账号</string>
<string name="logout_description">
<Data>
<![CDATA[<p><font color=\'#DE000000\'>如果您经过慎重考虑，确定放弃账户，您的账户需同时满足以下条件:</font></p><p><font color=\'#DE000000\'>1、账户无异常行为记录，且账户信息无相关注销记录;</font></p><p><font color=\'#DE000000\'>2、账户内无未完成状态或完成未满15天的订单;</font></p><p><font color=\'#DE000000\'>3、账户无纠纷;</font></p><p><font color=\'#DE000000\'>4、账户下无资金、无欠款、无未完结历史订单;</font></p><p><font color=\'#DE000000\'>5、账户注销同时原钱包将同时注销，确保钱包处于正常状态、无余额零钱、无未完成交易、无处理中提现请求，不存在其他因注销账户产生的纠纷情况等。</font></p><br></br><p><font color=\'#DE000000\'>您的账户满足注销条件，您可以通过发送邮件至<font color=\'#1852F1\'>support.tpo@linkingcities.com</font>进行注销申请，我们将在15个工作日内为您进行处理。</font></p><br></br><p><b><font color=\'#DE000000\'>提示:</font></b></p><p><font color=\'#DE000000\'>账户注销后，账户信息及账户在平台产生的资产、虚拟权益无法恢复，可能对您主张售后服务带来不便。商户端账户注销将影响您在生活圈App内相关权益及信息。</font></p>]]>
</Data>
</string>
<string name="commit_feedback">提交反馈</string>
<string name="describe_your_feedback">请简要明确的描述您的意见和建议</string>
<string name="user_feedback">用户反馈</string>
<string name="close">关闭</string>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment