From 15c92b9226e531451a10518a0d1d06fdb4741ab1 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 1 Dec 2020 15:33:39 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BD=A6=E8=81=8A?= =?UTF-8?q?=E8=81=8A=E5=8D=B8=E8=BD=BD=E5=90=8E=EF=BC=8C=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=94=A4=E9=86=92=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/service/intent/AppOperationIntentHandler.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java index e02c90a89e..b97dcb12fc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java +++ b/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 From ca6cce52663d1439428fd9f81960f5dc7b0ce5bd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 15:34:59 +0800 Subject: [PATCH 02/22] update callchat ot fix hangUp --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d584595fab..9389632569 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.7 +CARCHATTING_VERSION=1.9.8 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 93bdd4b42a56c8eac0cb09097dbe2e79e7f80ced Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 1 Dec 2020 15:55:43 +0800 Subject: [PATCH 03/22] =?UTF-8?q?opt=20ui:=201.=20=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=8A=E8=BE=B9=E6=A1=86=202.=20toast?= =?UTF-8?q?=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .../extensions/entrance/EntranceFragment.java | 18 ++++++++-------- .../model_ext_default_user_head.png | Bin 1604 -> 4522 bytes .../model_ext_default_user_head_board.png | Bin 0 -> 1603 bytes .../model_ext_default_user_head.png | Bin 1604 -> 4522 bytes .../model_ext_default_user_head_board.png | Bin 0 -> 1603 bytes .../model_ext_default_user_head.png | Bin 3861 -> 9916 bytes .../model_ext_default_user_head_board.png | Bin 0 -> 3044 bytes .../layout/module_ext_layout_extensions.xml | 20 +++++++++++++----- .../src/main/res/values-mdpi/dimens.xml | 3 ++- .../res/values-xhdpi-1920x1000/dimens.xml | 3 ++- .../src/main/res/values-xhdpi/dimens.xml | 3 ++- .../src/main/res/values/dimens.xml | 3 ++- .../module_commons_toast_bkg_light.xml | 5 +---- .../main/module-commons-res/values/colors.xml | 2 +- ...odel_ext_default_user_head_board_light.png | Bin 0 -> 3179 bytes .../model_ext_default_user_head_light.png | Bin 3292 -> 2860 bytes ...odel_ext_default_user_head_board_light.png | Bin 0 -> 3179 bytes .../model_ext_default_user_head_light.png | Bin 3292 -> 2860 bytes ...odel_ext_default_user_head_board_light.png | Bin 0 -> 7222 bytes .../model_ext_default_user_head_light.png | Bin 9030 -> 5914 bytes 21 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head_board.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head_board.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head_board.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_board_light.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_board_light.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_board_light.png diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ 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..9024cc843f 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 @@ -966,15 +966,15 @@ public class EntranceFragment extends MvpFragmentE=00001b5ch_0Itp) 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 IM6N<$f|RYk;{X5v literal 1604 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 B@nHY} literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png index 726124020add2d7039ad9ea0bb9e6c85d1cb51fc..f95b06e2af553e6a3384773de2af1afed850afb7 100644 GIT binary patch literal 4522 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 IM6N<$f|RYk;{X5v literal 1604 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 B@nHY} literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png index baa717be4d7f7fc48d907b1518fb1120a769ca25..7abea7cdfc65976b635d373663035460101b119f 100644 GIT binary patch literal 9916 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

?QV(3rh~I-cI8@O_y_4ude0j^!mf)~Y ztzkP|cQPs(JsVHSes*J-YqSd)Ab{hn?{YI85HH$?%FVBd43JPg?3xR(B3|{pwkk3f zCBfzGBkGu<*-=GgEO0xx4kwR6$Y#cHEI~FI2T?=F*AF1&F?3PRXORISYNrcHJ}ZRD z+a~td{^Y=o5J6ww!AxFld z^u)pAcZ!fkH!*raF|su#4t3IVH=-7OfvyC{;p)$hPiLZ z`4hXn9{RGrI&^X9u`-|xCNxnHpyl&fYGK}+lx^3x_e+4na2dIaU0TM{Sh*y-!sRgxC=}rbn;DZ@& zfzexcQo4}=5`KsGdoDRbvWrKvVkOjt3=lDUY&7_Ja?E-6S`!%{VWsiV<_|ln$p8_o z7g#^6v^Cu}Rb+sO*)xKp1yDO6OqmyLAcFmcB}c`@5n!wupe`Z?G)V@s$ug9LGdV&|p+?DofvQf~WWPh%Ckr)72CS~u z-3~e0<$Q{atcs@#k{ygd>Cq|RK{9Ua77?n0UlcGxkPKXlvMAPXDLfq+F~!HoxTQk3 zeF=`wDj60{XCx!oLY|R~pwGbzmU?b&H`uE_BN@T>w@QYk`!kXe{PymQWCRxpJR=$2 zRg!tP#K^e0@6+foUNBYNCSRHOOj}SHU@&-Z9hjh~+Jj^q*x?xTt6#gcBd5qne&l8w zTYW!PUl4ng3?z#GX8i-uVRnk2(G zcj((Cw?MPVfUzT2q}kZB$S~@dvJ86TZO1uY*{aSa14h}6%{JWVM3>~i99&J?mq9ie zOl)qK;NXZagNf&gm0U!IA*6`yNn~&t%-{oA2vac`hLDxl)ZlF4tftf@B{(?hM)V!y z?G$J9G}-XkZ8+C7xxU#E5W>mxoJ2o+%Ub3#2C|t98V4b~-Da(+(L85d28lR2!PGn5P=g&~OHQ~=JL3BLGc zJZIxadf!G8;N+)=%78MU3@8K2fHI&ACU$N@(Fl?*T$3Q5Zf1B z^qd_&jL{o2-2F!vy9z^_j;V6%+O%{N21GIX|gA0%`BfL5198@dQXMX{7@x`?Cd z+h&^vh=T7nj{3&acI8&~Uzsv#@~24{0KkrB(T{~Rq1D8>47@gFlN3r4t(F?}AnJ|Eh!m zf}_8Gal!&v+2yLTDi(%mw^o~cyK=$I#>QHsxSWdd8J*%3Xx9FAPi_ zV@HN780&Tn2C7z?uBkCdhYI5uqNpybDq)yf<8;42c^oZVkXEn1Q6&s!3vsa4DDLfE zAnVR(2DmO*b5H>41FVtpw+r2FH(% z|ErRwW2#Fxwu^&(iCva>99m + + + 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/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 0000000000000000000000000000000000000000..78e481fae839413272bf2b9a88c2e9c3dc057aaa GIT binary patch literal 3179 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 R*319^002ovPDHLkV1nogFd6^= literal 0 HcmV?d00001 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 21805b2ff7e18f6f112a95bf051f620809f0aada..243931a120790c3bb6bcb65bc44ff240471f04a1 100644 GIT binary patch literal 2860 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 R*319^002ovPDHLkV1nogFd6^= literal 0 HcmV?d00001 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 21805b2ff7e18f6f112a95bf051f620809f0aada..243931a120790c3bb6bcb65bc44ff240471f04a1 100644 GIT binary patch literal 2860 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 literal 9030 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 From 042cdf7cab00a13148d60c4ec60dc9b3b7487987 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 1 Dec 2020 16:50:49 +0800 Subject: [PATCH 04/22] opt --- .../roadcondition/service/CarCorderController.kt | 13 ++++++++----- .../roadcondition/service/CosStatusController.kt | 12 +++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) 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, From 4fdb5016863df577e753a27132b0377327fe95f7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 17:16:03 +0800 Subject: [PATCH 05/22] update callchat and remove unuse code --- gradle.properties | 2 +- .../src/main/java/com/mogo/module/main/MainActivity.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9389632569..4d61922d0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.8 +CARCHATTING_VERSION=2.0.1 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib 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(); From e71e232927082a66b41eb031fdd05965d0171a03 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 19:43:20 +0800 Subject: [PATCH 06/22] update callchat --- .idea/gradle.xml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1f3d18c759..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,7 +74,6 @@ diff --git a/gradle.properties b/gradle.properties index 4d61922d0c..818e57b1bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.1 +CARCHATTING_VERSION=2.0.3 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From d60ce9c095b05d0419260b3b4f48d0540a3fd400 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 1 Dec 2020 20:08:14 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/extensions/entrance/EntranceFragment.java | 6 ++++-- .../src/main/res/layout/module_ext_layout_extensions.xml | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) 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 9024cc843f..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 + + \ No newline at end of file From 720783cf1e8258abdc7594e9b9f9a1fd9502a41f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 20:12:25 +0800 Subject: [PATCH 08/22] update --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 818e57b1bf..1803b93dcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.3 +CARCHATTING_VERSION=2.0.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From a0a009037c87a25cd05dfe3668eaaaa64cdc6d96 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 1 Dec 2020 20:43:13 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=8D=87=E7=BA=A7passportsdk=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index ad3efe1d74..730d32d42b 100644 --- a/config.gradle +++ b/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}", From 1fb34c93d0fcdd88e28b5eb291b19ec43f6a912e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 1 Dec 2020 20:55:10 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=81=8A?= =?UTF-8?q?=E8=81=8A=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F=E5=8C=97=E4=BA=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + gradle.properties | 2 +- ..._carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2804 bytes ...hatting_team_fragment_close_normal_light.png | Bin 0 -> 3091 bytes ...atting_team_fragment_close_pressed_light.png | Bin 0 -> 3064 bytes ...tting_team_invitation_head_default_light.png | Bin 0 -> 10820 bytes ..._carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2803 bytes ..._carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 4691 bytes ...rchatting_launcher_calling_bg_light_bak.xml} | 0 .../main/module-callchat-res/values/colors.xml | 1 + 10 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_pressed_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_invitation_head_default_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png rename skin/mogo-skin-light/src/main/module-callchat-res/drawable/{module_carchatting_launcher_calling_bg_light.xml => module_carchatting_launcher_calling_bg_light_bak.xml} (100%) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/gradle.properties b/gradle.properties index 818e57b1bf..c5883bfdbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.3 +CARCHATTING_VERSION=2.0.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..04cc98a79524ff33cc0ba73f7e3939738f978912 GIT binary patch literal 2804 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_pressed_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_pressed_light.png new file mode 100644 index 0000000000000000000000000000000000000000..6717a937ec55a26572d5be41943764460cd6b988 GIT binary patch literal 3064 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000000000000000000000000000000000..866e774abe133e32039a17fc2cea1cd1ebc00215 GIT binary patch literal 10820 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

rz(}o=e1hxZxsKg_<>@%Uav3F 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 FV1hsPfOr4^ literal 0 HcmV?d00001 diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..753cb382761a8ef1161504aedd5ac063e0fd0a81 GIT binary patch literal 4691 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 M(Z=4o)Y6mjKN9b&8UO$Q literal 0 HcmV?d00001 diff --git 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_bak.xml similarity index 100% rename from skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml rename to skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light_bak.xml diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml index ded680eb8a..27fca4f64e 100644 --- a/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml @@ -1,6 +1,7 @@ #333333 + #333333 #999999 #333333 From 60842014a37b7761c486dd80ffef778f1a88ac6e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 21:24:38 +0800 Subject: [PATCH 11/22] fix bug --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1803b93dcf..0437e850c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.4 +CARCHATTING_VERSION=2.0.8 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 744a921e4c161d929603d19710b4bdcbb343c21c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 22:37:28 +0800 Subject: [PATCH 12/22] fix bug --- .idea/gradle.xml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1f3d18c759..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,7 +74,6 @@ diff --git a/gradle.properties b/gradle.properties index 0437e850c5..43241a8760 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.8 +CARCHATTING_VERSION=2.0.9 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From bb6491bf7aa618aa5ffca03ed295fa8257e2a22d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 2 Dec 2020 09:52:46 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/common/MogoApisHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java index 1fc4db92be..3ca356c09c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java +++ b/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 ); } } From b33e93ed8bcf2138c4886ddb890ac1c31fa08610 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Dec 2020 11:55:12 +0800 Subject: [PATCH 14/22] add interceptor and update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 43241a8760..9cf5037b7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.9 +CARCHATTING_VERSION=2.1.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From ec739eb87f2fa7ac126e105d260b99ec663106b8 Mon Sep 17 00:00:00 2001 From: wujifei Date: Wed, 2 Dec 2020 12:53:07 +0800 Subject: [PATCH 15/22] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...archatting_launcher_calling_bg_light.9.png | Bin 2804 -> 2301 bytes ...archatting_launcher_calling_bg_light.9.png | Bin 2803 -> 2301 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png index 04cc98a79524ff33cc0ba73f7e3939738f978912..5b8a408b4db57cd29eb4b1ffc31cec9473093732 100644 GIT binary patch literal 2301 zcmVH{v#Dl*(iN5yl5gM zRHA7@h_R5`c7Ol&p7or~nKS3!neEQdy_22fWbSPEaqnlo=f|Av+}*V+*`wpBjgHYV zI!4Fn$k_3U=QgwuU-is(9BvfE-DrD+jqR|>`OrLf6s`^AZUJpC+Bn+8kQmK}=Eq_0 zc7RPCrUr8FwQJX=*4EbEDHe-gR4SFla=HAQv470Cs8|WCTCIl8!ph8g*R@)$Yi3-b zF}tSEy5oAi-Ze9RVeEG^{=xjYc{A5{Va^P$3v8+|Imqz`4<4K}-~i&^#tLY~2#`fE z8e3rYpc)V*0WtuV05ZT8X$Z9nMv#p?H-G1=<>lp5s9p&+ai}(!pvdXX&CO3rrP3Ne zG*Agz2q;2R6>3puPn86d8&{+YA~OyVjKGqun{|8&YeL1Q0#$?ARVCa}1L2-fWJsL^ zQc+_OEd&z*st~0r1ro=+O83KQ<00r>}W@h(h0=5B3^mHce1Yy+#Q zQ&A;>E3;TB<7EJ(P-l(C2(;F0Hvi1$^QRq92Z9OlWc=#Yt1|}NJqa_y&1JlFC7^Ot zycCKILDk|VcW>$D2#}z56>5ye_hHQlbFC3UiM%_OSNVC^hXxqx=!y86W8;^Jw@=9aiwaK*}~l1R(s8b}7t z7B{P0m6mKSVb&N>QfAN0^~T-1ci+SZgDBVU#8D^6eV-}TzqEn0DO1#(5^PyhCYlDb z>`Fi^ZdRgHN$xF`skl6x>t-$sz<{}a-#`QEymIBrEGycrF;gkr`;M8SaIYvuyEBWs z5|O4(4pXYrSRKzVfPqD&A)uXz*tyS?5bsHtW^n}pu_)uE3#2UIZD3<0Ac829ky;k< zGmn*|OvUX1YW>->XYZp*U9r>&bPOe)Gs$S)ReZ=#@BeQzRc-A_`=2G3Fp8 z)H;5)1S}%l-U)OsmJ8G7?)<8_c@JXDjBd^54v>L@UFjZGm6%y|xw}X}GNVh7J!`dE zkAMX$q51;ai=W13lonhlW^z@=NkU2iU$Ml^vgYbB9w`G)KZ+u4t{#Y;=81{M{{jn3 z9E}BZ9An1J5cM;iPd}D=lY2jzD4DfHMNkDdkgNKo1OgKhx&!p;)Q8d4wwI zx{g2(3<4B_?-T*`pr5IgMm?ySn`?@c5ZPx91UiLm`T{z}fX;f>&kQLtLYZ}&I=Q}S?uJOzcaIVqB>lg8-si30VipDCYwL>5e%NOkQW!W%3aqxiSOlOhcjG_A^DitT_}}XAlE0 zUzS3B>1W1@nH(ai)I7t}XU!xP>U}?xDYM24cIoOe5h2vXUEceCrZ5d)$i+#S02C}O zpkDSf6*uPvJO@~p%1q1Uz3yj5f#hQXNy^0QRAQ*l{Y+aDvXx0q4mfF-&qO~{lt&GR zHJMT&hITDcpjqf=3XodO+0>E|ex4lAtn@Q2U}fxVa)>OBHWPPw-}{*|`DnE!S0{J( zR9)WJex{Oqno^zoNIQml-_Nu?0SVXU*Ic2kBx7hM`kAhbE|jTS;tKV>pJ^+N6jgT5 z|9_MM(5&<`89WYEO+eh$Q*(LW`Qv>RKKU2E622i+pcie8b69<}!ekM;q zB6h0Dh(N*t^D$kp3S zp=|-OJ2qmvgBgBXuO^0Go`qn1`}XZKuoaKb{Y-?|Bn5I;SCmQT;=;nh8Ih2jFV9A8 zjj<1``XXssuWOF zS2zFUFR*4&e@1RV5NnGJyh8_X-n@Ah_BHacpDCZsF$>w$`E-7M{w%DSsWWPejM)1% zO;Ak=^3Uh0t%vb0zh>;Xu@lT*-(ll(IgWEYigPAaPUD&;(|{SdAuDD+QY(R- zWpEGUoj*Dxc7)CA5YClAk}4kZamca~c4r9+Wy3Pzvm_YBO(L88g(>T{01Nl<6 z43532HG@0J0O#=T4};|xz)1%2rEh9I+ID^P!vKE#Fu>@iD|Q&}=*LyId2}*p+dBRO Xqw8+%H2hZz00000NkvXXu0mjf`A=U8 literal 2804 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 Xqw8+%H2hZz00000NkvXXu0mjf`A=U8 literal 2803 zcmV(Wg<2R#Zr`oC9n7+*bB?Z3mY2=WC(JS|3I=Jh=2sM zA+dxM%NC1F7|S4Qta(vPzq_Yrn$EeUb4y>HKKE8Xs=?iNN;)q?m?=% zZQHZI+CSsiy0)&ZYwOy&wyu%9UI;9HwxGW_=JDLg$O3(WW4nmS5exbG?Q=a>GF-q< z2#|Mh?Bv)rqG3P3eI6ud!b8N+!PkJ_arW%lJ

rz(}o=e1hxZxsKg_<>@%Uav3F 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 FV1hsPfOr4^ From 379258a6ade37b388419e5df6f0bdec087928fef Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Dec 2020 15:13:28 +0800 Subject: [PATCH 16/22] fix UI --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9cf5037b7b..6504e6dede 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.1.2 +CARCHATTING_VERSION=2.1.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 527f7c3991afd93469ac9a8f3a8ee2770cd780f5 Mon Sep 17 00:00:00 2001 From: wujifei Date: Wed, 2 Dec 2020 16:14:54 +0800 Subject: [PATCH 17/22] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + gradle.properties | 2 +- ...module_carchatting_team_teammate_follower_bg_light.xml | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/gradle.properties b/gradle.properties index 9cf5037b7b..0f1163530e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.1.2 +CARCHATTING_VERSION=2.1.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml new file mode 100644 index 0000000000..199ee6720e --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file From 9adc21b2b1190b7b4c5b57b1d03300f1269d28a0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Dec 2020 16:27:22 +0800 Subject: [PATCH 18/22] update --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6504e6dede..3433d20efa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.1.4 +CARCHATTING_VERSION=2.1.6 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 88382b8b5a82b8a22adb99d477ac12e49c104281 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 2 Dec 2020 17:11:59 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E5=81=B6=E7=8E=B0npe=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/amap/AMapNaviViewWrapper.java | 6 ++- .../impl/amap/marker/AMapMarkerWrapper.java | 24 ++++++++-- .../extensions/utils/TopViewManager.java | 48 +++++++++++++++---- 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index c585fe4f00..c8684c751d 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/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 diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index 679e008277..80d0bef084 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/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 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java index ce1e39e34f..eb3e21a46c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java +++ b/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; + } } } From 52306421b2b3915ec3ae5ed65c1f9dfbf20e9a5b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Dec 2020 17:39:04 +0800 Subject: [PATCH 20/22] .. --- .idea/gradle.xml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1f3d18c759..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,7 +74,6 @@ diff --git a/gradle.properties b/gradle.properties index 3433d20efa..b6739c41d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.1.6 +CARCHATTING_VERSION=2.2.1 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 269653b4b66f2888e7a04608897edc93554cd1c3 Mon Sep 17 00:00:00 2001 From: wujifei Date: Wed, 2 Dec 2020 20:39:41 +0800 Subject: [PATCH 21/22] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0f1163530e..d7a48f50cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.1.5 +CARCHATTING_VERSION=2.2.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 78b0072b433aa2219838019056fee684256656ba Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Dec 2020 22:18:38 +0800 Subject: [PATCH 22/22] turn off log when release --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index f18f22db6d..8aa657a92e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/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 ) );