diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file 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 c9de4dc5cb..49392a87a6 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 @@ -147,6 +147,8 @@ public class EntranceFragment extends MvpFragment ONE_DAY_TIME) { SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time); SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum); - AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[1]); + if (shareItemSum == 1) { + AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[1]); + } else { + AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[0]); + } } else { Logger.e(TAG, " playShareGuideVoice else < ONE_DAY_TIME "); } @@ -507,9 +526,12 @@ public class EntranceFragment extends MvpFragment 200) { - showSlideMapVoiceGuide(); + if (isShowGuide && isGreaterThanOneDay()) { + if (motionEvent.getX() > 200) { + showSlideMapVoiceGuide(); + } } + break; case MotionEvent.ACTION_MOVE: diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 0e9057feed..ab25f3a2ba 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -39,7 +39,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; /** diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java index f0c8bca6c4..ab3b78a18b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java @@ -1,12 +1,9 @@ package com.mogo.module.extensions.net; -import com.mogo.module.extensions.bean.CommonConfig; import com.mogo.module.extensions.bean.CommonConfigResponse; -import com.mogo.module.extensions.userinfo.UserInfoResponse; import java.util.Map; -import io.reactivex.Observable; import io.reactivex.Single; import retrofit2.http.GET; import retrofit2.http.QueryMap;