Merge branch 'qa_1.1.7_fix' into dev

# Conflicts: # modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml # modules/mogo-module-extensions/src/main/res/values/dimens.xml # modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
2020-11-13 18:25:30 +08:00
parent e406773162 5238a03b43
commit c597a28bf4
8 changed files with 53 additions and 6 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -77,6 +77,7 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
    <groovy codeStyle="LEGACY" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
 </project>
--- 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 @@
    <dimen name="module_ext_north_goneMarginTop">142px</dimen>
    <dimen name="module_ext_button_width">66px</dimen>
    <dimen name="module_ext_button_height">66px</dimen>
-    <dimen name="module_ext_button_height_small">44px</dimen>
    <dimen name="module_ext_camera_button_marginTop">10px</dimen>
    <dimen name="module_ext_display_overview_textSize">12px</dimen>
    <dimen name="module_ext_display_overview_textSize_large">14px</dimen>
--- 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 道路事件操作类型
--- 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<V2XEventShowEntity> {
    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<V2XEventShowEntity> {
    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<V2XEventShowEntity> {
                        }
                    });
                    ivEventTypeIcon.setImageResource((Integer) ugcTitleStr[2]);
+
+                    // UGC 问答数据统计
+                    Map<String, Object> 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<V2XEventShowEntity> {
                    @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<V2XEventShowEntity> {
        }
    }

+    // UGC 提问回答或消失
+    private void dataStatistics(int result) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("result", result);
+        V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ASK_RESULT, properties);
+    }
+
    /**
     * 对道路事件进行反馈
     */
--- 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);
--- 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
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#3A435E" android:startColor="#525B7B" android:type="linear" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#3A435E" android:startColor="#525B7B" android:type="linear" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+</selector>
--- 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
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#E6DEDEDE" android:startColor="#E6DEDEDE" android:type="linear" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#E6DEDEDE" android:startColor="#E6DEDEDE" android:type="linear" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+</selector>