From b780400cd69a70cf3035d740768b67eed2463330 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 24 Sep 2020 17:22:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A4=B4=E5=83=8F=E7=82=B9=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XBaseViewHolder.java | 34 +++++++++++++++++++ .../v2x/adapter/holder/V2XRoadEventVH.java | 4 +++ 2 files changed, 38 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java index aca82b125c..daf41e1b83 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java @@ -1,15 +1,19 @@ package com.mogo.module.v2x.adapter.holder; +import android.content.Intent; +import android.util.Log; import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.voice.AIAssist; import com.mogo.map.MogoLatLng; import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.navi.MogoTraffic; +import com.mogo.module.carchattingprovider.ICarsChattingProvider; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.v2x.V2XConst; @@ -20,6 +24,10 @@ import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; +import com.zhidao.carchattingprovider.CallChattingProviderConstant; +import com.zhidao.carchattingprovider.MogoDriverInfo; + +import java.util.HashMap; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -32,6 +40,9 @@ public abstract class V2XBaseViewHolder extends RecyclerView.ViewHolder implements IMogoNaviListener { + private static final String TAG = "V2XBaseViewHolder"; + private ICarsChattingProvider mCarsChattingProvider; + public V2XBaseViewHolder(@NonNull View itemView) { super(itemView); } @@ -72,6 +83,28 @@ public abstract class V2XBaseViewHolder delayedCloseWindow(); } + public void triggerIVReportHead(MarkerExploreWay noveltyInfo) { + Log.d(TAG,"点击头像"+mCarsChattingProvider); + try { + mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + MogoDriverInfo mogoDriverInfo = new MogoDriverInfo(); + int ageNumber = noveltyInfo.getUserInfo().getAgeNumber(); + mogoDriverInfo.setAge(ageNumber); + String gender = noveltyInfo.getUserInfo().getGender(); + mogoDriverInfo.setGender(gender != null ? gender:null); + String sn = noveltyInfo.getUserInfo().getSn(); + mogoDriverInfo.setSn(sn != null ? sn:""); + String name = noveltyInfo.getUserInfo().getUserName(); + mogoDriverInfo.setUserName(name != null ? name:""); + mogoDriverInfo.setUserHead(noveltyInfo.getUserInfo().getUserHead()); + mCarsChattingProvider.showUserWindow(MODULE_NAME, mogoDriverInfo, this.itemView.getContext()); + + } catch (Exception e) { + Log.d(TAG,"点击头像发生错误--triggerIVReportHead"+e); + e.printStackTrace(); + } + } + /** * 打电话 */ @@ -160,6 +193,7 @@ public abstract class V2XBaseViewHolder delayedCloseWindow(); } + /** * 显示自定义 Toast * diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index aa46a1c0ef..bb7c0743ab 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -239,6 +239,10 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventZan.setOnClickListener(v -> { triggerZan(mNoveltyInfo); }); + + ivReportHead.setOnClickListener(v->{ + triggerIVReportHead(mNoveltyInfo); + }); } } catch (Exception e) { e.printStackTrace(); From d511259efdef9f4cfdb6066eb71d0ecb448c2b4b Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 24 Sep 2020 17:40:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86-=E8=AF=AD=E9=9F=B3=E5=94=A4=E8=B5=B7?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XRoadEventVH.java | 14 ++++++++++++-- .../mogo/module/v2x/voice/V2XVoiceConstants.java | 7 +++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index bb7c0743ab..5f24ee6022 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -48,6 +48,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * date : 2020/3/11 4:35 PM * desc : 道路事件详情 * version: 1.0 + * * @author donghongyu */ public class V2XRoadEventVH extends V2XBaseViewHolder { @@ -109,6 +110,13 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { showLiveCar(mV2XEventShowEntity); } }; + // 查看车辆信息 + private V2XVoiceCallbackListener v2xVoiceOpenCarInfoListener = new V2XVoiceCallbackListener() { + @Override + public void onCallback(String command, Intent intent) { + triggerIVReportHead(mNoveltyInfo); + } + }; private void init(View itemView) { ivEventImg = itemView.findViewById(R.id.ivEventImg); @@ -146,7 +154,9 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_FEEDBACK_TRUE, v2XVoiceCallbackReportTrueListener) .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_FEEDBACK_ERROR, - v2XVoiceCallbackReportErrorListener); + v2XVoiceCallbackReportErrorListener) + .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP, + v2xVoiceOpenCarInfoListener); } @Override @@ -240,7 +250,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { triggerZan(mNoveltyInfo); }); - ivReportHead.setOnClickListener(v->{ + ivReportHead.setOnClickListener(v -> { triggerIVReportHead(mNoveltyInfo); }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index 78aefa1956..74b5b13881 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -225,6 +225,12 @@ public class V2XVoiceConstants { public static final String COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP"; public static final String[] COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS = {"我的分享"}; + /* + * 查看车辆信息 + * */ + public static final String COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP"; + public static final String[] COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP_UN_WAKEUP_WORDS = {"查看车辆信息"}; + static { // 免唤醒 默认 sVoiceCmds.put(COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP_WORDS); @@ -251,6 +257,7 @@ public class V2XVoiceConstants { sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP_WORDS); sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP_WORDS); sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS); + sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP_UN_WAKEUP_WORDS); //默认 From 94c1db755bde6fc134b8a5d98b2d1da27b9c1d0f Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 24 Sep 2020 18:03:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=B1=82=E5=8A=A9?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E6=A1=86-=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XOtherSeekHelpVH.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index ff0feaf3de..97910f7114 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -54,7 +54,6 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { // 上传事件的用户信息 private MarkerUserInfo mUserInfo = new MarkerUserInfo(); - // 语音控制导航 private V2XVoiceCallbackListener mNaviCb = (command, intent) -> triggerStartNavi(mNoveltyInfo); // 语音控制拨打电话 @@ -66,6 +65,8 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { e.printStackTrace(); } }; + // 查看车辆信息 + private V2XVoiceCallbackListener mVoiceOpenCarInfoLis = ((command, intent) -> triggerIVReportHead(mNoveltyInfo)); public V2XOtherSeekHelpVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) @@ -95,7 +96,9 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING, mCallChartingCb) .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, - mCallChartingCb); + mCallChartingCb) + .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP, + mVoiceOpenCarInfoLis); } @Override @@ -106,7 +109,8 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI) .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP) .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING) - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP); + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_CAR_INFO_UN_WAKEUP); } }); } @@ -130,6 +134,12 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { } catch (Exception e) { e.printStackTrace(); } + ivHead.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + triggerIVReportHead(mNoveltyInfo); + } + }); // 只有自研车机才会 有车聊聊通话 if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { From 3fbcfde8f44d82fecea10a9872261412f76eb908 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 24 Sep 2020 18:04:11 +0800 Subject: [PATCH 4/4] opt --- .idea/misc.xml | 2 +- app/build.gradle | 4 +-- .../extensions/entrance/EntranceFragment.java | 29 +++++++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) 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/app/build.gradle b/app/build.gradle index 48cda21e4a..ac0ed8fa02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,7 +115,7 @@ android { // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 @@ -137,7 +137,7 @@ android { // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 - buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 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 e56e5f8bc6..83e4e1752c 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 @@ -7,6 +7,7 @@ import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -426,17 +427,21 @@ public class EntranceFragment extends MvpFragment 200) { + showSlideMapVoiceGuide(); + } + break; + + case MotionEvent.ACTION_MOVE: + + break; + } + } /** * 由于Launcher和Independent对于天气的表现形式不太一样，所以通过此方法区分处理