Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8

gradle.properties

@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.9.3
+CARCHATTING_VERSION=1.9.7
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java

@@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         public shareEmptyViewHolder(@NonNull View itemView) {
             super(itemView);
 
-            Button shareBtn = itemView.findViewById(R.id.share_event_button);
-            shareBtn.setOnClickListener(view -> {
+            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) {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java

@@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             spannableString.setSpan(new StyleSpan(Typeface.BOLD), 7,
                     originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
+
+            ttsForSurroundingFirstToday(exploreWayList.size());
         } else {
             mTopLayout.setVisibility(View.GONE);
             mRecyclerView.setVisibility(View.GONE);
@@ -207,19 +209,19 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             ttsForVoiceCheckout();
             fromVoice = false;
         }
-        ttsForSurroundingFirstToday();
     }
 
-    /*
+    /**
      * 手动点击周边事件 TTS播报
-     * */
-    private void ttsForSurroundingFirstToday() {
+     */
+    private void ttsForSurroundingFirstToday(int eventCount) {
         boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_SURROUNDING_SELECTED");
-        if (hasBroadTts == false) {
-            if (poiInfosList.size() > 0) {
+        if (!hasBroadTts) {
+            if (eventCount > 0) {
                 AIAssist.getInstance(V2XUtils.getApp()).
-                        speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null);
+                        speakTTSVoice("发现周边" + eventCount + "条交通信息", null);
             } else {
+                Logger.e(TAG,"周边没有发现交通信息");
             }
         }
     }

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;
 

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">
 
-        <Button
+        <TextView
             android:id="@+id/share_event_button"
             android:layout_width="@dimen/v2x_share_btn_width"
             android:layout_height="@dimen/v2x_share_btn_height"
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/share_btn_middle_padding"
             android:layout_centerInParent="true" />
 
-        <Button
+        <TextView
             android:id="@+id/refresh_button"
             android:layout_width="@dimen/v2x_share_btn_width"
             android:layout_height="@dimen/v2x_share_btn_height"

modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml

@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivEmptyView" />
 
-    <Button
+    <TextView
         android:id="@+id/btnShear"
         android:layout_width="@dimen/v2x_share_btn_width"
         android:layout_height="@dimen/v2x_share_btn_height"
@@ -38,13 +38,13 @@
         android:background="@drawable/bg_v2x_go_to_share"
         android:gravity="center"
         android:text="去分享"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_36"
         app:layout_constraintEnd_toStartOf="@+id/btnRefresh"
         app:layout_constraintStart_toStartOf="@+id/ivEmptyView"
         app:layout_constraintTop_toBottomOf="@+id/tvTrip" />
 
-    <Button
+    <TextView
         android:id="@+id/btnRefresh"
         android:layout_width="@dimen/v2x_share_btn_width"
         android:layout_height="@dimen/v2x_share_btn_height"

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_30" />
+    <gradient
+        android:angle="180"
+        android:endColor="#1AF5F5F5"
+        android:startColor="#F5F5F5" />
+</shape>