Merge branch 'qa_1.1.8' into dev

# Conflicts: # modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml # skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png # skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
2020-12-01 14:53:19 +08:00
parent 55703f36df e7d84bdc5d
commit 17478da011
10 changed files with 57 additions and 24 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.9.0
+CARCHATTING_VERSION=1.9.7
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
@@ -7,7 +7,9 @@ import android.view.WindowManager;
 import androidx.annotation.NonNull;

 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.R;
+import com.mogo.utils.logger.Logger;

 /**
 * 浮在各种wm上面的dialog基类，调用了window.setType
@@ -15,13 +17,16 @@ import com.mogo.module.common.R;
 * @author tongchenfei
 */
 public class BaseFloatDialog extends Dialog {
+
+    private static final String TAG = "BaseFloatDialog";
+
    public BaseFloatDialog(@NonNull Context context) {
        this(context, R.style.BaseFloatDialogStyle);
    }

    public BaseFloatDialog(@NonNull Context context, int themeResId) {
        super(context, themeResId);
-        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
+        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
            addFlag();
        }
    }
@@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog {
                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
                | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
    }
+
+    @Override
+    public void show() {
+        Logger.d(TAG, "onShow====");
+        if (DebugConfig.isNeedHideAdasWhenShare()) {
+            MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS();
+        }
+        super.show();
+    }
+
+    @Override
+    public void dismiss() {
+        Logger.d(TAG, "onDismiss====");
+        if (DebugConfig.isNeedHideAdasWhenShare()
+                && MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) {
+            MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
+        }
+        super.dismiss();
+    }
 }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -400,7 +400,7 @@ public class MogoServices implements IMogoMapListener,
     */
    private void closeAllPanel() {

-        if ( mCallProviderResponse != null ) {
+        if ( mCallProviderResponse == null ) {
            mCallProviderResponse = new ICallChatResponse() {
                @Override
                public void hideUserWindowError(@NotNull String errorMsg) {
@@ -411,9 +411,11 @@ public class MogoServices implements IMogoMapListener,
        MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
        MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
        MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel();
-        carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
+        if ( carsChattingProvider == null ) {
+            carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
+        }
        if ( carsChattingProvider != null ) {
-            carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse);
+            carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse);
        }
    }

--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
@@ -65,6 +65,13 @@ class AccStatusIntentHandler implements IntentHandler {
            if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) {
                return;
            }
+            if ( state == ACC_ON || state == ACC_OFF_DELAY ) {
+                Intent newIntent = new Intent( "com.freedom.ser.ACTION" );
+                newIntent.putExtra( "acc", true );
+                newIntent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES );
+                context.sendBroadcast( newIntent );
+                Logger.d( TAG, "发送广播：com.freedom.ser.ACTION" );
+            }
            boolean accOn = state == ACC_ON;
            if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) {
                return;
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
@@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
    }

    override fun show() {
-        Logger.d(TAG, "onShow====")
-        if (DebugConfig.isNeedHideAdasWhenShare()) {
-            mApis.adasControllerApi.closeADAS()
-        }
        gridBtnManager.showShareButton()
        super.show()
    }

-    override fun dismiss() {
-        Logger.d(TAG, "onDismiss=====")
-        if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) {
-            mApis.adasControllerApi.showADAS()
-        }
-        super.dismiss()
-    }
-
    companion object {
        private const val TAG = "GridFixableShareDialog"
    }
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/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,"周边没有发现交通信息");
            }
        }
    }
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -50,6 +50,8 @@
        android:gravity="left"
        android:paddingLeft="@dimen/num_padding_left"
        android:text="10009"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/share_item_text_size" />

    <TextView
        android:id="@+id/road_case_address"
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
+++ b/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>