Merge remote-tracking branch 'origin/dev' into dev

modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java

@@ -157,7 +157,8 @@ public class CustomRatingBar extends LinearLayout {
                 context.getResources().getDimension(R.dimen.heart_ratingbar_width));
         elementHeight = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentHeight,
                 context.getResources().getDimension(R.dimen.heart_ratingbar_height));
-        elementPadding = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentPadding, 10);
+        elementPadding = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentPadding,
+                context.getResources().getDimension(R.dimen.ratingbar_padding));
 
         elementStep = mTypedArray.getFloat(R.styleable.CustomRatingBar_elenmentStep, 1.0f);
         stepSize = StepSize.fromStep(mTypedArray.getInt(R.styleable.CustomRatingBar_stepSize, 1));

modules/mogo-module-common/src/main/res/values/dimens.xml

@@ -1052,5 +1052,6 @@
 	<dimen name="v2x_share_btn_height">48px</dimen>
 	<dimen name="share_item_address">17.5000px</dimen>
 	<dimen name="panel_list_item_title_size">15.3125px</dimen>
+	<dimen name="ratingbar_padding">6px</dimen>
 
 </resources>

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java

@@ -559,7 +559,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
                 @Override
                 public void onQueryRoadInfoSuccess(@NotNull List<? extends MarkerExploreWay> roadInfoList) {
                     if (roadInfoList == null || (roadInfoList != null && roadInfoList.size() <= 0)) {
-                        speakFailVoice("未找到其他车主分享的路况信息");
+                        speakFailVoice("未发现" + mKeywords + "附近的特殊路况");
                         moveToMarcker(currentLat, currentLon);
                         return;
                     }

modules/mogo-module-tanlu/src/main/res/values/strings.xml

@@ -33,9 +33,8 @@
         <item >小智这就去查，您稍等一下</item>
     </array>
     <array name="search_fail_voice_array">
-        <item>找不到相关地址</item>
-        <item>找不到地址，是小智不好</item>
-        <item>未找到其他车主分享的路况信息</item>
+        <item>找不到相关地址，试试换个说法</item>
+        <item>找不到地址，换个地址试试</item>
     </array>
 
 </resources>

modules/mogo-module-v2x/src/main/AndroidManifest.xml

@@ -16,6 +16,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
+
+        <!--ugc上报状态反馈广播-->
+        <receiver android:name=".receiver.UgcUploadStatusReceiver">
+            <intent-filter>
+                <action android:name="com.v2x.ugc.upload.status" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/UgcUploadStatusReceiver.kt

@@ -0,0 +1,20 @@
+package com.mogo.module.v2x.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+
+/**
+ * ugc上报反馈
+ */
+class UgcUploadStatusReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == "com.v2x.ugc.upload.status"){
+            var id = intent.getLongExtra("id", 0)
+            var type = intent.getStringExtra("type")
+            var fromType = intent.getStringExtra("fromType")
+
+        }
+    }
+}