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 24f557de14..0a05343782 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 @@ -522,7 +522,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } if ( checkAMapView() ) { - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { style = new MyLocationStyle(); } @@ -544,7 +544,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } if ( checkAMapView() ) { - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( style == null ) { style = new MyLocationStyle(); } @@ -557,7 +557,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, public void initMyLocation() { if ( checkAMapView() ) { mMapView.getMap().setMyLocationEnabled( true ); - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); style.interval( 1000 ); style.anchor( 0.5F, 0.5F ); @@ -864,7 +864,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView.getMap() == null ) { return; } - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( mCarCursorOption.getCarCursorBmp() != null && !mCarCursorOption.getCarCursorBmp().isRecycled() ) { style.myLocationIcon( BitmapDescriptorFactory.fromBitmap( mCarCursorOption.getCarCursorBmp() ) ); } else { @@ -877,6 +877,20 @@ public class AMapNaviViewWrapper implements IMogoMapView, mMapView.getMap().setMyLocationStyle( style ); } + private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; + try { + style = mMapView.getMap().getMyLocationStyle(); + } catch ( Exception e ) { + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; + } + } + @Override public MapCameraPosition getMapCameraPosition() { if ( checkAMapView() ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index 7b6e72ea7a..2c70ee3345 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -465,10 +465,16 @@ public class AMapViewWrapper implements IMogoMapView, } private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; try { - return mMapView.getMap().getMyLocationStyle(); + style = mMapView.getMap().getMyLocationStyle(); } catch ( Exception e ) { - return new MyLocationStyle(); + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; } } @@ -790,7 +796,7 @@ public class AMapViewWrapper implements IMogoMapView, if ( mMapView.getMap() == null ) { return; } - MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + MyLocationStyle style = getMyLocationStyle(); if ( mCarCursorOption.getCarCursorBmp() != null && !mCarCursorOption.getCarCursorBmp().isRecycled() ) { style.myLocationIcon( BitmapDescriptorFactory.fromBitmap( mCarCursorOption.getCarCursorBmp() ) ); } else { 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 d4f71eb6a0..679e008277 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 @@ -82,8 +82,8 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { mMogoMarkerOptions = null; } if ( mMarker != null ) { - mMarker.remove(); mMarker.setObject( null ); + mMarker.remove(); mMarker = null; } if ( mMovingPointOverlay != null ) { 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 ebd938a034..a0ce977eba 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 @@ -190,7 +190,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mainInfoId, mLongitude, mLatitude - ); + ) } // } } 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 fc11da05b0..9cf32f0e38 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 @@ -4,6 +4,7 @@ import android.content.Intent import android.util.Log import com.google.gson.Gson import com.mogo.commons.AbsMogoApplication +import com.mogo.utils.TipToast import com.zhidao.cosupload.DbPriorityConfig import com.zhidao.cosupload.callback.CosStatusCallback import com.zhidao.cosupload.manager.CosUploadManagerImpl @@ -12,10 +13,7 @@ import com.zhidao.roadcondition.event.GetImageSuccessEvent import com.zhidao.roadcondition.event.LatLngStickyEventBus import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO -import com.zhidao.roadcondition.util.CarNet_Cos_Upload -import com.zhidao.roadcondition.util.LocationUtil -import com.zhidao.roadcondition.util.deletePicFile -import com.zhidao.roadcondition.util.trackNormalEvent +import com.zhidao.roadcondition.util.* /** * @description cos上传操作 @@ -25,8 +23,10 @@ import com.zhidao.roadcondition.util.trackNormalEvent */ class CosStatusController : CosStatusCallback { val TAG: String = this.javaClass.simpleName + //存储单次请求的视频和缩略图url var videoAndThumbMap: MutableMap = mutableMapOf() + //图片上传的eventId lateinit var mPicEventId: String private var isRetry = false //是否重试上传过图片 @@ -90,29 +90,32 @@ class CosStatusController : CosStatusCallback { // ) || CarCorderController.mType.equals(TANLU_ROAD_WORK) // ) { // VoiceController.speakVoice("cos上报失败") - Log.d(TAG, "uploadCosFailed mType = $mType") - if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { - sendGetInfoFailedReceiver("100") - } -// } + Log.d(TAG, "uploadCosFailed mType = $mType") if (!isRetry) { isRetry = true -// taskAsync(30_000) { //去掉重试 -// try { -// uploadFile(mutableListOf(localPath as String), entity, mType) -// } catch (e: Exception) { -// e.printStackTrace() -// } -// } + taskAsync(5_000) { + //去掉重试 + try { + uploadFile(mutableListOf(localPath as String), entity, mType, mainInfoId, mFromType, mLongitude, mLatitude) + } catch (e: Exception) { + e.printStackTrace() + } + } } else { + //重试一次，如果还失败就提示 + if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { + sendGetInfoFailedReceiver("100") + } + if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) { CosCallbackMapController.uploadFailed?.invoke() } CosCallbackMapController.unregisterCallback(localPath) InformationUploadController.release(entity?.id) -// deletePicFile(localPath) + deletePicFile(localPath) } + } override fun uploadCosCompleted( @@ -142,25 +145,23 @@ class CosStatusController : CosStatusCallback { val locationStr: String = Gson().toJson(locationInfo) Log.d(TAG, "locationStr = " + locationStr) //如果失败，需要提示失败弹框 - if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty() - || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty() - || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty() - ) { - if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { - sendGetInfoFailedReceiver("100") - } - } else { - //分享成功，并打点，如果是上报拥堵，需要takeVideo - LatLngStickyEventBus.getInstance() - .postSticky(GetImageSuccessEvent(downloadUrl, mType)) - //上传录像以及缩略图成功 - sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap) - } +// if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty() +// || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty() +// || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty() +// ) { +// if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { +// sendGetInfoFailedReceiver("100") +// } +// } else { + + //上传录像以及缩略图成功 + sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap) +// } } else { trackUploadCos(5) } } else { - //上传图片成功, 如果是上报路况，直接上传，TODO + //上传图片成功, 如果是上报路况，直接上传 Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType") sendInformationDirectly( INFO_TYPE_IMG, @@ -204,20 +205,36 @@ class CosStatusController : CosStatusCallback { //开始上传 entity?.isCustom?.let { mainServiceHttpModel.sendInformationMessage( - type = type, - url = map, - isCustom = it, - poiType = poiType, - mainInfoId = mainInfoId, - longitude = longitude, - latitude = latitude - ) { success -> - CosCallbackMapController.unregisterCallbacks(map) - CosCallbackMapController.mainService?.let { - CosCallbackMapController.mainService?.sendCustomResult(success) + type = type, + url = map, + isCustom = it, + poiType = poiType, + mainInfoId = mainInfoId, + longitude = longitude, + latitude = latitude + ) { success -> + CosCallbackMapController.unregisterCallbacks(map) + CosCallbackMapController.mainService?.let { + CosCallbackMapController.mainService?.sendCustomResult(success) + } + Log.d(TAG, "type = $type ----success = $success") + if (success) { + //分享成功，并打点，如果是上报拥堵，需要takeVideo + if (type == INFO_TYPE_VIDEO) { + try { + LatLngStickyEventBus.getInstance() + .postSticky(GetImageSuccessEvent("", poiType)) + } catch (e: java.lang.Exception) { + e.printStackTrace() + } + } + } else { + if (type == INFO_TYPE_VIDEO) { + TipToast.shortTip("分享失败，请检查网络") + } + } } } - } } override fun onProgress(localPath: String?, progress: Float) { @@ -230,6 +247,5 @@ class CosStatusController : CosStatusCallback { AbsMogoApplication.getApp().applicationContext ) } - } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 58020431ef..87ac502a8b 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -80,7 +80,7 @@ class MainService : Service() { Analytics.getInstance().start(this) //参数说明：appKey: app唯一标识（比如：包名） CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext) - .init(BuildConfig.APPLICATION_ID, 2) + .init(BuildConfig.APPLICATION_ID, 0) //初始化语音 VoiceController.initVoice() diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt index 1d88520feb..64eb300bb4 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt @@ -2,7 +2,10 @@ package com.zhidao.roadcondition.service import android.util.Log import com.mogo.commons.AbsMogoApplication +import com.zhidao.roadcondition.event.GetImageSuccessEvent +import com.zhidao.roadcondition.event.LatLngStickyEventBus import com.zhidao.roadcondition.model.* +import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO import com.zhidao.roadcondition.net.request import com.zhidao.roadcondition.util.* import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.setStrategyFrequency @@ -272,9 +275,13 @@ class MainServiceController { //转换失败的情况下再重试一次 geoRetryed = if (!geoRetryed) { geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId,longitude,latitude) - true } else { + //如果两次都失败，直接上报服务端 + postInformationMessage( + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude), + customSend + ) false } @@ -296,7 +303,6 @@ class MainServiceController { trackUploadServer(1) // CosStatusController().videoAndThumbMap.clear() customSend?.invoke(true) - } onError { Log.i(TAG, "$it upload message ${it.message}") diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt index 3ef6ac2e10..a3976af13d 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt @@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成 const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务 const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败 const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败 -const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功没有返回全视频和缩略图 +const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功但没有返回全视频和缩略图 const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始 const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败 const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长 diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 6cb5363e2d..f3ae390679 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -46,9 +46,6 @@ public class MainIndependentActivity extends MainActivity { @Override protected void onResume() { super.onResume(); - if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { - mServiceApis.getAdasControllerApi().setUseAlgorithm( true ); - } if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){ fixInMultiWindowMode(); } @@ -65,7 +62,6 @@ public class MainIndependentActivity extends MainActivity { @Override protected void onPause() { super.onPause(); - mServiceApis.getAdasControllerApi().setUseAlgorithm( true ); } @Override diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index c4ca90cd05..3cf294e319 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -50,6 +50,8 @@ public class EntrancePresenter extends Presenter implements Weathe private IMogoNetwork mNetWork; + private boolean isResumed = false; + public EntrancePresenter(Context context, EntranceView view) { super(view); mWeatherModel = new WeatherModel( getContext() ); @@ -71,9 +73,12 @@ public class EntrancePresenter extends Presenter implements Weathe if ( weatherInfo == null ) { return; } - String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() ); - String desc = phenomena == null ? "" : phenomena.nameCn; + if ( phenomena == null ) { + return; + } + String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); + String desc = phenomena.nameCn; int resId = phenomena.resId; mView.renderWeatherInfo( temp, desc, resId ); } @@ -88,6 +93,10 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onResume( @NonNull LifecycleOwner owner ) { super.onResume( owner ); + isResumed = true; + if (userInfo != null) { + mView.renderUserInfo(userInfo); + } if(ExtensionsConfig.needRequestUserInfo()){ // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); @@ -97,6 +106,7 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onPause( @NonNull LifecycleOwner owner ) { super.onPause( owner ); + isResumed = false; } @Override @@ -125,11 +135,13 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onSuccess(UserInfoResponse userInfoBaseResponse) { userInfo = userInfoBaseResponse.getResult(); - if(userInfo!=null) { - Logger.d(TAG, "获取个人信息成功: " + userInfo); - mView.renderUserInfo(userInfo); - }else{ - Logger.e(TAG,"获取个人信息失败"); + if(isResumed) { + if (userInfo != null) { + Logger.d(TAG, "获取个人信息成功: " + userInfo); + mView.renderUserInfo(userInfo); + } else { + Logger.e(TAG, "获取个人信息失败"); + } } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt index 6258977faa..85262296c0 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.commons.debug.DebugConfig import com.mogo.map.listener.IMogoMapListener import com.mogo.map.location.IMogoLocationListener import com.mogo.map.marker.IMogoMarkerClickListener @@ -56,11 +57,12 @@ class MogoGuideProvider : IMogoModuleProvider { } override fun init(context: Context?) { - if (isDeviceOfD()) { - GuideBizManager.init() - } else { - Logger.d("MogoGuideProvider", "device type is not D") - } + Logger.d("MogoGuideProvider", "init====") +// if (DebugConfig.isLoadGuideModule()) { + GuideBizManager.init() +// } else { +// Logger.d("MogoGuideProvider", "device type is not D") +// } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index 66b90abc08..b08d4375a9 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -112,6 +112,11 @@ class GuideFragment : MvpFragment(), GuideC GuideBizManager.invokeAuthorize() } + override fun onDestroyView() { + closeGuideFragment() + super.onDestroyView() + } + override fun onDestroy() { super.onDestroy() invokeAuthorize() diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt index 4b2d52a97a..c5b94fcb41 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt @@ -7,7 +7,7 @@ import com.mogo.service.analytics.IMogoAnalytics object AnalyticsUtil { - const val INVOKE_TRACK_PLAY_PASS_ID = "mogu_play_pass" + const val INVOKE_TRACK_PLAY_PASS_ID = "v2x_play_pass" const val INVOKE_TRACK_PASS_TIME = "pass_time" const val INVOKE_TRACK_PLAY_TIME = "play_time" diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 7f0c7b741d..be7bb6d82a 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -49,6 +49,7 @@ import com.mogo.utils.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -483,6 +484,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, config = GsonUtil.jsonFromObject(btnList); Logger.d(TAG, "获取分享框成功：" + config); } else { + config = GsonUtil.jsonFromObject(new ArrayList()); Logger.d(TAG, "获取分享框成功，但是data没有内容"); } } else { diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml index 61251bd7a5..80015e691b 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml @@ -1,9 +1,9 @@ + android:angle="0" + android:endColor="@color/tanlu_dialog_endcolor" + android:startColor="@color/tanlu_dialog_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml index 21152d5aac..21a7a34f19 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml index b4f3a4a62e..03926e4a3a 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml @@ -2,8 +2,8 @@ + android:endColor="@color/tanlu_dialog_bt_endcolor" + android:startColor="@color/tanlu_dialog_bt_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml index 7e4ab5e49f..87fcf17536 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="抱歉，无法获取到相关数据" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> @@ -74,7 +74,7 @@ android:background="@drawable/tanlu_dialog_bottom_button_right_bg" android:gravity="center" android:text="取消" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_bt_defalt_text_color" android:textSize="@dimen/tanlu_dialog_content_size" android:textStyle="bold" /> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml index 8b19f35380..3babec8500 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="由于网络原因上传失败" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 24181bdd65..8f5388e27d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -41,4 +41,13 @@ #59FFFFFF #FFFFFF + #FFFFFF + #3F4057 + #2A2B38 + #FFFFFF + #FFFFFF + #3E7FFC + #5CC1FF + #50526E + diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index 1b00b259ca..82f1820538 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -82,13 +82,11 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter try { - rbScenarioHistory?.isChecked=true + rbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -60,7 +60,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbSurroundingEvent?.isChecked=true + rbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -69,7 +69,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbShareEvents?.isChecked=true + rbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -126,9 +126,11 @@ class V2XEventPanelFragment : MvpFragment + @@ -54,9 +52,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_toLeftOf="@id/road_case_useless" - android:gravity="center" - android:paddingRight="@dimen/dp_24" - android:paddingLeft="@dimen/dp_24" + android:gravity="left" + android:paddingRight="@dimen/dp_28" android:text="100" android:textColor="#FFFFFF" android:textSize="@dimen/dp_34" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index c9ce0a563d..2d45b0b58f 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -56,7 +56,7 @@ 20px 16px 17px - 15.4px + 14px 82px 16px 117px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 6aacf207d4..e8ea373e8f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -57,8 +57,8 @@ 18px 20px 16px - 16px - 20px + 20px + 16px 82px 16px 117px diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java index 20c64855e3..77cebf1b3a 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java @@ -48,7 +48,7 @@ public interface IMogoTanluProvider extends IProvider { /** * 故障求助 */ - String TYPE_SEEK_HELP = "99999"; + String TYPE_SEEK_HELP = "9999"; /** * 用户手点上报 diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index abd5bac484..d0216dca8d 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml @@ -3,4 +3,13 @@ #333333 #666666 + #333333 + #F5F5F5 + #FFFFFF + #333333 + #2896FF + #FFFFFF + #FFFFFF + #E8E8E8 +