diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index e082ea7475..a2da5c6cd8 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/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index c56cb75bbb..53fe530624 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -138,7 +138,6 @@ 142px 66px 66px - 44px 10px 12px 14px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index 8818ec3b1c..f385c2e48f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -62,6 +62,8 @@ public class V2XConst { public static final String V2X_ROAD_EVET = "v2x_road_event"; public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; public static final String V2X_ROAD_PRODUCE = "v2x_road_produce"; + public static final String V2X_ASK_ALERT = "v2x_ask_alert";//UGC 提问 + public static final String V2X_ASK_RESULT = "v2x_ask_result";//UGC 提问回答或消失 public static final String LAUNCHER_ICON_CLICK = "Launcher_Icon_Click"; /** * V2X 道路事件操作类型 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 00050ea54b..7451f280ac 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -13,8 +13,8 @@ import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.alarm.V2XEarlyWarningServer; import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario; import com.mogo.module.v2x.utils.EventTypeUtils; import com.mogo.module.v2x.utils.V2XUtils; @@ -23,6 +23,9 @@ import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.network.utils.GsonUtil; +import java.util.HashMap; +import java.util.Map; + import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** @@ -53,7 +56,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { private V2XRoadEventEntity mV2XRoadEventEntity; private V2XEventShowEntity mV2XEventShowEntity; - public V2XEventUgcVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_event_ugc, viewGroup, false)); @@ -93,7 +95,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { public void initView(V2XEventShowEntity v2XEventShowEntity) { try { Log.w(MODULE_NAME + "_" + TAG, "v2XEventShowEntity=" + GsonUtil.jsonFromObject(v2XEventShowEntity)); - if (v2XEventShowEntity == null) { return; } @@ -121,6 +122,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { } }); ivEventTypeIcon.setImageResource((Integer) ugcTitleStr[2]); + + // UGC 问答数据统计 + Map properties = new HashMap<>(); + properties.put("content", (String) ugcTitleStr[1]); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ASK_ALERT, properties); } @@ -128,12 +134,14 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { @Override public void onClick(View v) { manualMarkingTrafficJam(1); + dataStatistics(1); } }); ivEventReportErr.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { manualMarkingTrafficJam(0); + dataStatistics(2); } }); } @@ -143,6 +151,13 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { } } + // UGC 提问回答或消失 + private void dataStatistics(int result) { + Map properties = new HashMap<>(); + properties.put("result", result); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ASK_RESULT, properties); + } + /** * 对道路事件进行反馈 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java index 8e1c82f927..ef8b05eeeb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java @@ -70,7 +70,7 @@ public class V2XEventUgcWindow extends RelativeLayout } public void initView(Context context) { - Logger.w(MODULE_NAME, "V2X-初始化疲劳驾驶"); + Logger.w(MODULE_NAME, "V2X-初始化UGC的Window"); LayoutInflater.from(context).inflate(R.layout.window_fault_help, this); // 详情列表 mRecyclerView = findViewById(R.id.rvRoadEventList); diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml new file mode 100644 index 0000000000..8882692332 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml new file mode 100644 index 0000000000..418d03a9bb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file