diff --git a/gradle.properties b/gradle.properties index d584595fab..1803b93dcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.7 +CARCHATTING_VERSION=2.0.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index b31a0437f6..0d6f65cfc8 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/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 ) - } //获取图片 diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index 6aaa000d64..57bcbd692c 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/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, diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 825c68da05..be3ca91170 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -187,6 +187,7 @@ public class EntranceFragment extends MvpFragment + + + 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"/> + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index 05a6e0ff20..8a48af5df3 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -1,7 +1,8 @@ 26px - 66px + 56px + 80px 10px 2px 2px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 549e102b27..71c4fe9ef9 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -147,7 +147,8 @@ 40px 45px - 120px + 100px + 134px 30px 20px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index e61d37ba08..13e7cae46c 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -150,7 +150,8 @@ 10px 10px 45px - 120px + 100px + 134px 30px 20px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index af3016c3c6..8e519dfe37 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -158,7 +158,8 @@ 19px 0px 26px - 66px + 56px + 80px 10px 2px 2px diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 46803b3758..86457f96fc 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/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(); diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml index f1e575c745..9b0d3bc5b2 100644 --- a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml +++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml @@ -1,8 +1,5 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml index f7dcb3f6c3..b098102de9 100644 --- a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml @@ -1,6 +1,6 @@ - #FF333333 + #fff #66000000 #333333 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_board_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_board_light.png new file mode 100644 index 0000000000..78e481fae8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_board_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png index 21805b2ff7..243931a120 100644 Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_board_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_board_light.png new file mode 100644 index 0000000000..78e481fae8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_board_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png index 21805b2ff7..243931a120 100644 Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_board_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_board_light.png new file mode 100644 index 0000000000..d58eb5e843 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_board_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png index eb26174ed6..e120ca6996 100644 Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png differ