From 3b747111401f429be1d6d1c0ebacc3cf5a7b8665 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Dec 2020 12:02:33 +0800 Subject: [PATCH] fix bug of guide --- .../module/MogoModuleAuthorize.kt | 20 ++- .../extensions/entrance/EntranceFragment.java | 166 +++++++++--------- 2 files changed, 94 insertions(+), 92 deletions(-) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt index 33361ceba2..bba7e8463d 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt @@ -2,11 +2,13 @@ package com.mogo.module.authorize.authprovider.module import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeManagerImpl import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.util.SharedPreferenceUtil import com.mogo.service.module.IMogoModuleProvider +import com.mogo.utils.logger.Logger class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMogoAuthorizeModuleProvider { @@ -21,14 +23,18 @@ class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IM } override fun invokeAuthorization(tag: String) { - if(!SharedPreferenceUtil.hasGuide()){ - val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() - if(guideService is IMogoModuleProvider){ - guideService.init(AbsMogoApplication.getApp().applicationContext) + if (DebugConfig.isNeedLoadGuideModule()) { + if(!SharedPreferenceUtil.hasGuide()){ + val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() + if(guideService is IMogoModuleProvider){ + guideService.init(AbsMogoApplication.getApp().applicationContext) + } + val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) + listener?.authorizeFailed("需要先执行用户引导") + return } - val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) - listener?.authorizeFailed("需要先执行用户引导") - return + }else{ + Logger.i(TAG,"没有添加Guide模块，无需判断是否引导，准备展示授权") } mogoAuthShow.showAuthorizeView(tag, { //todo SP存储状态 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index be3ca91170..cf50976e2c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -1,15 +1,10 @@ package com.mogo.module.extensions.entrance; import android.content.Intent; -import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import android.os.Debug; import android.os.Handler; -import android.text.SpannableString; -import android.text.Spanned; import android.text.TextUtils; -import android.text.style.ForegroundColorSpan; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -26,7 +21,6 @@ import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.Group; import com.alibaba.android.arouter.launcher.ARouter; -import com.amap.api.maps.model.MyLocationStyle; import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; @@ -197,9 +191,9 @@ public class EntranceFragment extends MvpFragment { @@ -294,9 +288,9 @@ public class EntranceFragment extends MvpFragment properties = new HashMap<>(); - properties.put( "type", 1 ); - MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "APP_Find_Mogoer", properties ); + properties.put("type", 1); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track("APP_Find_Mogoer", properties); } - } ); + }); dealWeatherContainer(); @@ -430,13 +424,14 @@ public class EntranceFragment extends MvpFragment>> time = " + time); + Logger.d(TAG, " playShareGuideVoice shareItemSum = " + shareItemSum + "---- intervalTime = " + intervalTime + ">>> time = " + time); if (intervalTime == 0) { SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time); SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum); @@ -526,6 +521,7 @@ public class EntranceFragment extends MvpFragment 10021" ); + } catch (Exception e) { + Logger.e(TAG, e, "onIntentReceived -> 10021"); } } } @@ -779,7 +775,7 @@ public class EntranceFragment extends MvpFragment TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功")); + findViewById(R.id.btnShowTextTip).setOnClickListener(v -> TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功")); - findViewById(R.id.btnShowDrawableTip).setOnClickListener(v->{ + findViewById(R.id.btnShowDrawableTip).setOnClickListener(v -> { mMsgContainer.setVisibility(View.VISIBLE); TipDrawable drawable = new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150); - TipToast.tip("分享成功",drawable); + TipToast.tip("分享成功", drawable); }); - findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v->{ + findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v -> { mMsgContainer.setVisibility(View.GONE); @@ -976,7 +972,7 @@ public class EntranceFragment extends MvpFragment seekHelpNoticeListener = new IMogoOnMessageListener() { - @Override - public Class target() { - return String.class; - } + @Override + public Class target() { + return String.class; + } - @Override - public void onMsgReceived(String obj) { - if(mStatusManager.isSeekHelping()) { - int seekNum = SharedPrefsMgr.getInstance(getContext()).getInt("seek_help_num", 0); - final int finalSeekNum = seekNum++; - SharedPrefsMgr.getInstance(getContext()).putInt("seek_help_num", seekNum); - handler.post(() -> { - seekHelpGroup.setVisibility(View.VISIBLE); - seekHelpNum.setText("" + finalSeekNum); - }); - } - } - }; + @Override + public void onMsgReceived(String obj) { + if (mStatusManager.isSeekHelping()) { + int seekNum = SharedPrefsMgr.getInstance(getContext()).getInt("seek_help_num", 0); + final int finalSeekNum = seekNum++; + SharedPrefsMgr.getInstance(getContext()).putInt("seek_help_num", seekNum); + handler.post(() -> { + seekHelpGroup.setVisibility(View.VISIBLE); + seekHelpNum.setText("" + finalSeekNum); + }); + } + } + }; private Handler handler = new Handler(); - private void listenSeekNumber(){ + private void listenSeekNumber() { mApis.getSocketManagerApi(getContext()).registerOnMessageListener(SEEK_HELP_NOTICE_NUM_MSG_TYPE, seekHelpNoticeListener); - mStatusManager.registerStatusChangedListener(TAG,StatusDescriptor.SEEK_HELPING,this); + mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.SEEK_HELPING, this); } @Override