Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -57,7 +57,7 @@ public class MogoApplication extends AbsMogoApplication {
         crashSystem.init();
         //设置debug模式，日志不上传
         crashSystem.setDebug( BuildConfig.DEBUG );
-        Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE );
+        Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.OFF );
 
         if( DebugConfig.isNeedLoadGuideModule() ){
             MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_GUIDE, MogoModulePaths.PATH_GUIDE ) );

config.gradle

@@ -131,7 +131,7 @@ ext {
             jetbrainsannotationsjava5  : "org.jetbrains:annotations-java5:15.0",
 
             // 统一登录
-            accountsdk                 : "com.zhidao.accountservice:account-sdk:1.0.17",
+            accountsdk                 : "com.zhidao.accountservice:account-sdk:1.0.18",
             // crash
             crashSdk                   : "com.zhidaoauto.crash.log:library:1.0.5",
             kotlinstdlibjdk7           : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",

gradle.properties

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

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -581,7 +581,11 @@ public class AMapNaviViewWrapper implements IMogoMapView,
 //                mMyLocationMarker.startAnimation();
 //            }
 //        });
-        mMyLocationMarker.startAnimation();
+        try {
+            mMyLocationMarker.startAnimation();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java

@@ -342,10 +342,16 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
         ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY );
         animationScale.setDuration( duration );
         animationScale.setFillMode( Animation.FILL_MODE_FORWARDS );
-        animationScale.setInterpolator( interpolator );
+        if ( interpolator != null ) {
+            animationScale.setInterpolator( interpolator );
+        }
 
         mMarker.setAnimation( animationScale );
-        mMarker.startAnimation();
+        try {
+            mMarker.startAnimation();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -357,7 +363,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
         ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY );
         animationScale.setDuration( duration );
         animationScale.setFillMode( Animation.FILL_MODE_FORWARDS );
-        animationScale.setInterpolator( interpolator );
+        if ( interpolator != null ) {
+            animationScale.setInterpolator( interpolator );
+        }
         animationScale.setAnimationListener( new Animation.AnimationListener() {
             @Override
             public void onAnimationStart() {
@@ -398,7 +406,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
 
         AnimationSet animationSet = new AnimationSet( true );
         animationSet.setDuration( duration );
-        animationSet.setInterpolator( interpolator );
+        if ( interpolator != null ) {
+            animationSet.setInterpolator( interpolator );
+        }
         animationSet.setAnimationListener( new Animation.AnimationListener() {
             @Override
             public void onAnimationStart() {
@@ -422,7 +432,11 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
         } );
 
         mMarker.setAnimation( animationSet );
-        mMarker.startAnimation();
+        try {
+            mMarker.startAnimation();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt

@@ -135,7 +135,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
 
             //地图上打点
@@ -175,7 +176,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
         }
 
@@ -350,7 +352,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 mainInfoId,
                 mLongitude,
                 mLatitude,
-                mSpeed
+                mSpeed,
+                mFromType
         )
 
         //地图上打点
@@ -424,9 +427,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 mainInfoId,
                 mLongitude,
                 mLatitude,
-                mSpeed
+                mSpeed,
+                mFromType
         )
-
     }
 
     //获取图片

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt

@@ -146,7 +146,8 @@ class CosStatusController : CosStatusCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
         }
         Log.d(TAG, "delete file: $localPath")
@@ -161,7 +162,7 @@ class CosStatusController : CosStatusCallback {
 //                CosCallbackMapController.mainService?.sendCustomResult(it)
 //            }
 //        } else {
-        sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed)
+        sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed,mFromType)
 //        }
     }
 
@@ -176,13 +177,14 @@ class CosStatusController : CosStatusCallback {
             mainInfoId: Long,
             longitude: Double,
             latitude: Double,
-            speed: Float
+            speed: Float,
+            fromType: String
     ) {
-        Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}")
+        Log.d(TAG, "sendInformationDirectly  poiType= $poiType --fromType =$fromType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}")
         //开始上传
         entity?.isCustom?.let {
             mainServiceHttpModel.sendInformationMessage(
-                    fromType = mFromType,
+                    fromType = fromType,
                     type = type,
                     url = map,
                     isCustom = it,

modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java

@@ -42,7 +42,7 @@ public final class MogoApisHandler {
     public IMogoServiceApis getApis() {
         if ( sApis == null ) {
             synchronized ( this ) {
-                if ( sApis != null ) {
+                if ( sApis == null ) {
                     sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
                 }
             }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -187,6 +187,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     };
 
     private Group seekHelpGroup;
+    private Group groupUserHead;
 
     private UploadButtonAnimatorController mUploadButtonAnimatorController;
 
@@ -365,6 +366,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mWeatherTemp = findViewById(R.id.module_ext_id_weather_temp);
 
         mUserHeadImg = findViewById(R.id.ivUserHeadImg);
+        groupUserHead = findViewById(R.id.groupUserHead);
 
         mMsgContainer = findViewById(R.id.module_ext_id_msg);
 
@@ -398,7 +400,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             }
         } );
 
-        mUserHeadImg.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE);
+        groupUserHead.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE);
 
         mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload,
                 mStatusManager);
@@ -425,7 +427,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             mMove2CurrentLocation.setVisibility(View.GONE);
             mWeatherContainer.setVisibility(View.GONE);
             mMsgContainer.setVisibility(View.GONE);
-            mUserHeadImg.setVisibility(View.GONE);
+            groupUserHead.setVisibility(View.GONE);
         }
 
         isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false);
@@ -966,15 +968,15 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             mMsgContainer.setVisibility(View.GONE);
 
 
-            String enthusiasmIndex = "一般的字加粗的字一般的字";
-            SpannableString spannableStringUnSelectCountStr = new SpannableString(enthusiasmIndex);
-            ForegroundColorSpan foregroundColorSpanUnSelectCount = new ForegroundColorSpan(Color.RED);
-            spannableStringUnSelectCountStr.setSpan(foregroundColorSpanUnSelectCount, 4, 7, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-
-            TipToast.tip(spannableStringUnSelectCountStr.toString());
-//            TipDrawable drawable =
-//                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
-//            TipToast.tip("分享成功",drawable);
+//            String enthusiasmIndex = "一般的字加粗的字一般的字";
+//            SpannableString spannableStringUnSelectCountStr = new SpannableString(enthusiasmIndex);
+//            ForegroundColorSpan foregroundColorSpanUnSelectCount = new ForegroundColorSpan(Color.RED);
+//            spannableStringUnSelectCountStr.setSpan(foregroundColorSpanUnSelectCount, 4, 7, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+//
+//            TipToast.tip(spannableStringUnSelectCountStr.toString());
+            TipDrawable drawable =
+                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
+            TipToast.tip("分享成功",drawable);
         });
     }
 

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java

@@ -48,7 +48,11 @@ public class TopViewManager implements IMogoTopViewManager {
     public void addView(View view, ViewGroup.LayoutParams params,
                         IMogoTopViewStatusListener statusListener) {
         parentParams = params;
-        TopViewAnimHelper.getInstance().startTopInAnim(view, params, statusListener);
+        try {
+            TopViewAnimHelper.getInstance().startTopInAnim(view, params, statusListener);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -72,7 +76,11 @@ public class TopViewManager implements IMogoTopViewManager {
     public void addViewNoLinkage(View view, ViewGroup.LayoutParams params,
                                  IMogoTopViewStatusListener statusListener) {
         parentParams = params;
-        TopViewNoLinkageAnimHelper.getInstance().startTopInAnim(view, params, statusListener);
+        try {
+            TopViewNoLinkageAnimHelper.getInstance().startTopInAnim(view, params, statusListener);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -82,31 +90,55 @@ public class TopViewManager implements IMogoTopViewManager {
 
     @Override
     public void addSubView(View view, IMogoTopViewStatusListener statusListener) {
-        TopViewAnimHelper.getInstance().addSubView(view, parentParams, statusListener);
+        try {
+            TopViewAnimHelper.getInstance().addSubView(view, parentParams, statusListener);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void removeView(View view) {
-        TopViewAnimHelper.getInstance().startTopOutAnim(view);
+        try {
+            TopViewAnimHelper.getInstance().startTopOutAnim(view);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void removeViewNoLinkage(View view) {
-        TopViewNoLinkageAnimHelper.getInstance().startTopOutAnim(view);
+        try {
+            TopViewNoLinkageAnimHelper.getInstance().startTopOutAnim(view);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void removeSubView(View view) {
-        TopViewAnimHelper.getInstance().removeSubView(view);
+        try {
+            TopViewAnimHelper.getInstance().removeSubView(view);
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public boolean isViewAdded(View view) {
-        return TopViewAnimHelper.getInstance().isViewAdded(view);
+        try {
+            return TopViewAnimHelper.getInstance().isViewAdded(view);
+        } catch ( Exception e ){
+            return false;
+        }
     }
 
     @Override
     public boolean isViewNoLinkageAdded(View view) {
-        return TopViewNoLinkageAnimHelper.getInstance().isViewAdded(view);
+        try {
+            return TopViewNoLinkageAnimHelper.getInstance().isViewAdded(view);
+        } catch( Exception e ){
+            return false;
+        }
     }
 }

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml

@@ -69,14 +69,30 @@
             tools:text="···" />
     </RelativeLayout>
 
+    <ImageView
+        android:id="@+id/ivUserHeadBoard"
+        android:layout_width="@dimen/module_ext_user_avator_board_size"
+        android:layout_height="@dimen/module_ext_user_avator_board_size"
+        android:background="@drawable/model_ext_default_user_head_board"
+        android:layout_marginRight="@dimen/module_common_shadow_width_pos"
+        android:layout_marginTop="@dimen/module_common_shadow_width_pos"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <ImageView
         android:id="@+id/ivUserHeadImg"
         android:layout_width="@dimen/module_ext_user_avator_size"
         android:layout_height="@dimen/module_ext_user_avator_size"
-        android:layout_marginRight="@dimen/module_common_shadow_width_pos"
-        android:layout_marginTop="@dimen/module_common_shadow_width_pos"
         android:src="@drawable/model_ext_default_user_head"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="@id/ivUserHeadBoard"
+        app:layout_constraintTop_toTopOf="@id/ivUserHeadBoard"
+        app:layout_constraintRight_toRightOf="@id/ivUserHeadBoard"
+        app:layout_constraintBottom_toBottomOf="@id/ivUserHeadBoard"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/groupUserHead"
+        app:constraint_referenced_ids="ivUserHeadBoard,ivUserHeadImg" />
 </merge>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_ext_msg_counter_margin">26px</dimen>
-    <dimen name="module_ext_user_avator_size">66px</dimen>
+    <dimen name="module_ext_user_avator_size">56px</dimen>
+    <dimen name="module_ext_user_avator_board_size">80px</dimen>
     <dimen name="module_ext_layout_padding">10px</dimen>
     <dimen name="module_ext_layout_paddingRight">2px</dimen>
     <dimen name="module_ext_layout_paddingBottom">2px</dimen>

modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -147,7 +147,8 @@
 
     <dimen name="module_ext_top_over_navi_height">40px</dimen>
     <dimen name="module_ext_msg_counter_margin">45px</dimen>
-    <dimen name="module_ext_user_avator_size">120px</dimen>
+    <dimen name="module_ext_user_avator_size">100px</dimen>
+    <dimen name="module_ext_user_avator_board_size">134px</dimen>
     <dimen name="module_ext_layout_padding">30px</dimen>
     <dimen name="module_ext_layout_paddingRight">20px</dimen>
     <dimen name="module_ext_layout_paddingBottom">20px</dimen>

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

@@ -150,7 +150,8 @@
     <dimen name="module_ext_notice_margin_start">10px</dimen>
     <dimen name="module_ext_weather_margin_start">10px</dimen>
     <dimen name="module_ext_msg_counter_margin">45px</dimen>
-    <dimen name="module_ext_user_avator_size">120px</dimen>
+    <dimen name="module_ext_user_avator_size">100px</dimen>
+    <dimen name="module_ext_user_avator_board_size">134px</dimen>
     <dimen name="module_ext_layout_padding">30px</dimen>
     <dimen name="module_ext_layout_paddingRight">20px</dimen>
     <dimen name="module_ext_layout_paddingBottom">20px</dimen>

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

@@ -158,7 +158,8 @@
     <dimen name="module_ext_top_over_navi_height">19px</dimen>
     <dimen name="module_ext_weather_margin_start">0px</dimen>
     <dimen name="module_ext_msg_counter_margin">26px</dimen>
-    <dimen name="module_ext_user_avator_size">66px</dimen>
+    <dimen name="module_ext_user_avator_size">56px</dimen>
+    <dimen name="module_ext_user_avator_board_size">80px</dimen>
     <dimen name="module_ext_layout_padding">10px</dimen>
     <dimen name="module_ext_layout_paddingRight">2px</dimen>
     <dimen name="module_ext_layout_paddingBottom">2px</dimen>

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -373,9 +373,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mServiceApis.getRefreshStrategyControllerApi().clearAllData();
         AIAssist.getInstance( this ).release();
         mServiceApis.getOnlineCarPanelApi().clear();
-        if ( CallChatApi.getInstance().getApiProvider() != null ) {
-//            CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null);
-        }
         ContextHolderUtil.releaseContext();
         MogoModulesManager.getInstance().onDestroy();
         SchemeIntent.getInstance().clear();

modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java

@@ -4,11 +4,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import com.mogo.module.service.ServiceConst;
 import com.mogo.utils.LaunchUtils;
 import com.mogo.utils.TipToast;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -25,7 +23,7 @@ public class AppOperationIntentHandler implements IntentHandler {
     public final Map< String, String > sAppPackages = new HashMap<>();
 
     public AppOperationIntentHandler() {
-        sAppPackages.put( "车聊聊", "com.zhidao.imdemo" );
+//        sAppPackages.put( "车聊聊", "com.zhidao.imdemo" );
     }
 
     @Override

skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_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_11" />
+    <gradient
+        android:angle="180"
+        android:endColor="#C6C6C6"
+        android:startColor="#C6C6C6" />
+</shape>

skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="module_carchatting_nick_color_light">#333333</color>
+    <color name="module_carchatting_white_color_light">#333333</color>
     <color name="module_carchatting_status_color_light">#999999</color>
 
     <color name="module_carchatting_user_call_light">#333333</color>

skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="90dp" />
-    <gradient
-        android:angle="180"
-        android:endColor="#E5F5F5F5"
-        android:startColor="#FFFFFFFF" />
+    <solid android:color="#d8000000" />
 </shape>

skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="modules_commons_toast_text_color_light">#FF333333</color>
+    <color name="modules_commons_toast_text_color_light">#fff</color>
     <color name="module_commons_dlg_bkg_light">#66000000</color>
     <color name="module_commons_wm_dialog_text_textColor_light">#333333</color>
 </resources>