From fe33b9521c75683ab341e1e2839a6730965c6b16 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 26 Mar 2020 11:14:31 +0800 Subject: [PATCH 1/6] add voice control --- .../com/mogo/module/extensions/ExtensionsModuleConst.java | 1 + .../mogo/module/extensions/entrance/EntrancePresenter.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 10bc476db0..aab4fbee5b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -36,6 +36,7 @@ public class ExtensionsModuleConst { //唤醒指令 //分享路况/上报路况/上报拥堵/上报交通检查/上报封路 唤醒 public static final String UPLOAD_ROAD_CONDITION_AWAKEN = "com.zhidao.pathfinder.report.roadCondition"; + public static final String UPLOAD_ROAD_CONDITION = "command_upload_roadcondition"; //关闭分享框 唤醒 public static final String SHARE_DIALOG_CLOSE = "com.zhidao.share.close"; // 两次未回复关闭分享对话框 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 93465a16f1..00d5b691a4 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 @@ -125,6 +125,8 @@ public class EntrancePresenter extends Presenter { * 注册唤醒命令 */ private void registerAwakeVoice() { + mogoIntentManager.registerIntentListener(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION, mogoIntentListener); + mogoIntentManager.registerIntentListener(ExtensionsModuleConst.GO_TO_SHARE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.SHARE_DIALOG_CLOSE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN, mogoIntentListener); @@ -206,6 +208,8 @@ public class EntrancePresenter extends Presenter { ShareControl.getInstance(mContext).dismissDialog(); Logger.d(TAG, "mogoIntentListener 两次未回复关闭对话框"); } + } else if (intentStr.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION)) { //上报路况 免唤醒 --ok + uploadRoadCondition(); } } }; @@ -244,7 +248,8 @@ public class EntrancePresenter extends Presenter { Log.d(TAG, "handleNeedAuthorizeCmd 上报封路 ----> "); uploadRoadClosed(); } else if (mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_BLOCK) - || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN)) { //上报拥堵, 分享路况, 上报路况 + || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN) + || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION)) { //上报拥堵, 分享路况, 上报路况 Log.d(TAG, "handleNeedAuthorizeCmd 上报路况 ----> "); uploadRoadCondition(); } From d46a6633b94c72a49aa9f23b02521d2cbbf6d511 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Mar 2020 11:39:49 +0800 Subject: [PATCH 2/6] add authorize agreement fragment --- .idea/misc.xml | 2 +- .../com/mogo/launcher/MogoApplication.java | 2 +- .../authorize/fragment/AuthorizeFragment.kt | 13 +- .../module_authorize_scrollbar.png | Bin 0 -> 194 bytes ...le_authorize_selector_blue_left_corner.xml | 15 + ...e_authorize_selector_dark_right_corner.xml | 15 + ...module_authorize_shape_drak_top_corner.xml | 7 + .../res/layout/module_authorize_fragment.xml | 90 +- .../src/main/res/values-ldpi-v4/dimens.xml | 1046 ++++++++++++++++ .../src/main/res/values-xhdpi-v4/dimens.xml | 1054 +++++++++++++++++ .../src/main/res/values/strings.xml | 2 + .../com/mogo/module/guide/GuideBizManager.kt | 2 +- .../drawable/module_guide_selector_blue.xml | 2 +- 13 files changed, 2241 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_scrollbar.png create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_blue_left_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_dark_right_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_shape_drak_top_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/values-ldpi-v4/dimens.xml create mode 100644 modules/mogo-module-authorize/src/main/res/values-xhdpi-v4/dimens.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index f89feb66b1..144e16a2f4 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -47,6 +47,7 @@ public class MogoApplication extends AbsMogoApplication { crashSystem.setDebug(BuildConfig.DEBUG); Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF); + MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_AGREEMENT_FRAGMENT, PATH_GUIDE_AGREEMENT_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); @@ -58,7 +59,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); MogoModulePaths.addModule(new MogoModule(BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_AGREEMENT_FRAGMENT, PATH_GUIDE_AGREEMENT_MODULE_NAME)); Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt index 5bc6fcde59..b9a620b49d 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt @@ -3,8 +3,9 @@ package com.mogo.module.authorize.fragment import android.view.View import com.mogo.commons.mvp.MvpFragment import com.mogo.module.authorize.R +import kotlinx.android.synthetic.main.module_authorize_fragment.* -class AuthorizeFragment : MvpFragment(), AuthorizeContract.View,View.OnClickListener { +class AuthorizeFragment : MvpFragment(), AuthorizeContract.View, View.OnClickListener { companion object { const val TAG = "AuthorizeFragment" @@ -15,7 +16,8 @@ class AuthorizeFragment : MvpFragment { + } + R.id.btnAuthorizeDisAgree -> { + + } + } } } \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_scrollbar.png b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_scrollbar.png new file mode 100644 index 0000000000000000000000000000000000000000..1bb3d4882d4125bfd9916d69322e7849f6a421e0 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^Y(QMd0V2P>zGMib7>k44ofy`glX(f`)Ofl$hIsJ4 zo#x1OK!JxPv})3~|NNphS>;PTFaByg#CGk73cIX}Q1yGmmI6n~MWHKXB4*eqZWdI3 zv*t3_mzk_tTeo=ksfmV#MK>gUJ*cAMWF&kc-stlIKaZ9poG%P5xVT%6c8bg=d#Wzp$PyHXGuu_ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_blue_left_corner.xml new file mode 100644 index 0000000000..6399ca294a --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_blue_left_corner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_dark_right_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_dark_right_corner.xml new file mode 100644 index 0000000000..d866721b3b --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_selector_dark_right_corner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_shape_drak_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_shape_drak_top_corner.xml new file mode 100644 index 0000000000..0f2dab89cb --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-ldpi/module_authorize_shape_drak_top_corner.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml index e313c14595..b4f573130a 100644 --- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml +++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml @@ -1,9 +1,93 @@ - + android:background="#000000"> + +