diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt index c37f8a140d..556ad10664 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt @@ -2,6 +2,7 @@ package com.zhidao.roadcondition.service import com.mogo.commons.AbsMogoApplication import com.zhidao.auto.platform.voice.VoiceClient +import java.lang.Exception /** * @description 声音控制类 @@ -45,7 +46,11 @@ object VoiceController { * @param customType 命令 */ fun unRegisterCustomWakeupCmd(customType: String) { - voiceClient.unRegisterCustomWakeupCmd(customType) + try { + voiceClient.unRegisterCustomWakeupCmd(customType) + } catch (e:Exception){ + + } } /** diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java index e02c90a89e..b97dcb12fc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java @@ -4,11 +4,9 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.mogo.module.service.ServiceConst; import com.mogo.utils.LaunchUtils; import com.mogo.utils.TipToast; -import org.json.JSONException; import org.json.JSONObject; import java.util.HashMap; @@ -25,7 +23,7 @@ public class AppOperationIntentHandler implements IntentHandler { public final Map< String, String > sAppPackages = new HashMap<>(); public AppOperationIntentHandler() { - sAppPackages.put( "车聊聊", "com.zhidao.imdemo" ); +// sAppPackages.put( "车聊聊", "com.zhidao.imdemo" ); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 53f0c88824..6828c691cf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { + TextView share = itemView.findViewById(R.id.share_event_button); + share.setOnClickListener(view -> { V2XEventPanelFragment.Companion.getInstance().hidePanel(); mApis.getShareManager().showShareDialog(); }); - Button refresh = itemView.findViewById(R.id.refresh_button); + TextView refresh = itemView.findViewById(R.id.refresh_button); refresh.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 08c4d3abe2..69dac71345 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -16,6 +16,7 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.listener.SurroundingDetailItemListener; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; @@ -39,10 +40,12 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter list) { + public V2XSurroundingDetailAdapter(Context context, List list, SurroundingDetailItemListener listener) { mContext = context; markerExploreWays = list; + mListener = listener; } @Override @@ -77,18 +80,19 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter 0) { + if (!hasBroadTts) { + if (eventCount > 0) { AIAssist.getInstance(V2XUtils.getApp()). - speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + speakTTSVoice("发现周边" + eventCount + "条交通信息", null); } else { + Logger.e(TAG,"周边没有发现交通信息"); } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java new file mode 100644 index 0000000000..1290e78670 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java @@ -0,0 +1,15 @@ +package com.mogo.module.v2x.listener; + +import android.view.View; + +import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.v2x.entity.panel.SurroundingConstruction; + +/** + * @author lixiaopeng + * @description + * @since 2020/8/10 + */ +public interface SurroundingDetailItemListener { + void onItemClickListener(View v, int position, MarkerExploreWay exploreWay); +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java index e6c4717760..4301964bd1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java @@ -21,8 +21,8 @@ public class V2XListEmptyView extends LinearLayout { private ImageView mIvEmptyView; private TextView mTvTrip; - private Button mBtnShear; - private Button mBtnRefresh; + private TextView mBtnShear; + private TextView mBtnRefresh; private OnControlListener mOnControlListener; diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index edaa337156..b8d06d3216 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -31,7 +31,7 @@ android:layout_marginTop="@dimen/share_empty_btn_padding" android:paddingBottom="@dimen/dp_10"> -