Commit 09d9bf6a by 霍志良

feat:未登录情况点击导医直接跳转

parent fd7f9a0d
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.53", "m-confide" : "0.0.49.53",
"m-consultant" : "0.0.60.10", "m-consultant" : "0.0.60.10",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.96", "m-user" : "0.0.61.98",
"m-home" : "0.0.22.87", "m-home" : "0.0.22.87",
"m-im" : "0.0.21.18", "m-im" : "0.0.21.18",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
...@@ -92,7 +92,7 @@ ext { ...@@ -92,7 +92,7 @@ ext {
"m-confide" : "0.0.49.52", "m-confide" : "0.0.49.52",
"m-consultant" : "0.0.60.10", "m-consultant" : "0.0.60.10",
"m-fm" : "0.0.30.07", "m-fm" : "0.0.30.07",
"m-user" : "0.0.61.96", "m-user" : "0.0.61.98",
"m-home" : "0.0.22.87", "m-home" : "0.0.22.87",
"m-im" : "0.0.21.18", "m-im" : "0.0.21.18",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
......
...@@ -102,6 +102,7 @@ object LoginUtils { ...@@ -102,6 +102,7 @@ object LoginUtils {
@JvmStatic @JvmStatic
fun logoutClearLocal() { fun logoutClearLocal() {
logingCallBackListener=null
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "退出登录") AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "退出登录")
UserIn.imLogout() UserIn.imLogout()
UserIn.closePlayer() UserIn.closePlayer()
...@@ -111,7 +112,9 @@ object LoginUtils { ...@@ -111,7 +112,9 @@ object LoginUtils {
@JvmStatic @JvmStatic
fun loginSuccessOperate(activity: Activity) { fun loginSuccessOperate(activity: Activity) {
logingCallBackListener?.loginSuccess() if (logingCallBackListener!=null){
logingCallBackListener?.loginSuccess()
}
// 登录成功后,如果一键登录界面没有关闭,则关闭掉 // 登录成功后,如果一键登录界面没有关闭,则关闭掉
OneKeyLoginHelp.quitLoginPage() OneKeyLoginHelp.quitLoginPage()
val size = ActivityManager.getActivitySize() val size = ActivityManager.getActivitySize()
......
...@@ -599,8 +599,8 @@ object OneKeyLoginHelp { ...@@ -599,8 +599,8 @@ object OneKeyLoginHelp {
* @return true:登录。false:未登录 * @return true:登录。false:未登录
* */ * */
fun startLoginByStatusLoginCallBack(context: Context, isOpenDialog: Boolean,listener: LoginCallBackListener) { fun startLoginByStatusLoginCallBack(context: Context, isOpenDialog: Boolean,listener: LoginCallBackListener) {
LoginUtils.setLoginCallBack(listener)
if (!UserHelper.isLogin()) { if (!UserHelper.isLogin()) {
LoginUtils.setLoginCallBack(listener)
if (this::mActivity.isInitialized) { if (this::mActivity.isInitialized) {
//如果mActivity有初始化,代表项目使用了一键登录 //如果mActivity有初始化,代表项目使用了一键登录
startLogin(context as Activity, isOpenDialog) startLogin(context as Activity, isOpenDialog)
......
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