From 154b85c617a5099975e9f197f30b0aa2bbd77659 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 14 Aug 2020 14:16:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E6=95=85?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E9=80=81=E6=8E=A5=E6=94=B6=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=8E=A2=E8=B7=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../com/mogo/launcher/MogoApplication.java | 1 + .../mogo/tanlu/api/MogoTanluApiProvider.java | 3 +- .../roadcondition/service/UploadParams.kt | 16 +++++-- .../module/share/StrategyShareProvider.kt | 27 ++++++++++++ .../share/constant/StrategyShareConst.kt | 4 ++ .../AccidentStrategyPushWrapper.kt | 11 +++++ .../AccidentStrategyReceiver.kt | 25 +++++++++++ .../com/mogo/service/MogoServicePaths.java | 6 +++ .../mogo/service/tanlu/TanluUploadParams.java | 42 +++++++++++++++++++ 10 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/StrategyShareConst.kt create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 99cd7e7447..da2288e735 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -74,6 +74,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) ); + MogoModulePaths.addBaseModule(new MogoModule( MogoServicePaths.PATH_STRATEGY_SHARE,"StrategyShare")); MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); diff --git a/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java b/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java index 44f60ecab8..9342e15065 100644 --- a/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java +++ b/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java @@ -42,7 +42,8 @@ public class MogoTanluApiProvider implements IMogoTanluProvider { properties.put("from", params.getFromType()); AnalyticsUtils.track("v2x_share_type", properties); MainService.Companion.launchService(context, new UploadParams(params.getEventType(), - params.getFromType(), params.getDuration())); + params.getFromType(), params.getDuration(), params.getParentId(), + params.getLocation().lat, params.getLocation().lon)); }else{ throw new IllegalArgumentException("TanluUploadParams 不允许为空"); } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt index 690b2ec53e..75797e8bda 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt @@ -2,29 +2,37 @@ package com.zhidao.roadcondition.service import android.os.Parcel import android.os.Parcelable +import com.mogo.map.MogoLatLng -class UploadParams(val eventType:String,val fromType:String,val duration:Int) : Parcelable { +class UploadParams(val eventType: String, val fromType: String, val duration: Int, val parentId: String, val lat: Double, val lon: Double) : Parcelable { constructor(parcel: Parcel) : this( parcel.readString()!!, parcel.readString()!!, - parcel.readInt()) + parcel.readInt(), + parcel.readString()!!, + parcel.readDouble(), + parcel.readDouble() + ) override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.writeString(eventType) parcel.writeString(fromType) parcel.writeInt(duration) + parcel.writeString(parentId) + parcel.writeDouble(lat) + parcel.writeDouble(lon) } - override fun describeContents(): Int { return 0 } override fun toString(): String { - return "UploadParams(eventType='$eventType', fromType='$fromType', duration=$duration)" + return "UploadParams(eventType='$eventType', fromType='$fromType', duration=$duration, parentId='$parentId', lat=$lat, lon=$lon)" } + companion object CREATOR : Parcelable.Creator { override fun createFromParcel(parcel: Parcel): UploadParams { return UploadParams(parcel) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt new file mode 100644 index 0000000000..eb49f7af20 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -0,0 +1,27 @@ +package com.mogo.module.share + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.facade.template.IProvider +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.module.share.constant.ACCIDENT_STRATEGY_SHARE_PUSH_TYPE +import com.mogo.module.share.constant.S_TAG +import com.mogo.module.share.strategyreceiver.AccidentStrategyReceiver +import com.mogo.service.IMogoServiceApis +import com.mogo.service.MogoServicePaths +import com.mogo.utils.logger.Logger + +/** + * 策略上报入口，服务端策略上报Push的接收地，接收后再调用tanlu相关接口进行视频抓取 + * + * @author tongchenfei + */ +@Route(path = MogoServicePaths.PATH_STRATEGY_SHARE) +class StrategyShareProvider : IProvider { + override fun init(context: Context?) { + Logger.d(S_TAG, "策略上报Provider初始化====") + val apis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis + // 注册事故 + apis.getSocketManagerApi(context).registerOnMessageListener(ACCIDENT_STRATEGY_SHARE_PUSH_TYPE, AccidentStrategyReceiver(apis)) + } +} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/StrategyShareConst.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/StrategyShareConst.kt new file mode 100644 index 0000000000..014701a56d --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/StrategyShareConst.kt @@ -0,0 +1,4 @@ +package com.mogo.module.share.constant + +const val S_TAG = "StrategyShare" +const val ACCIDENT_STRATEGY_SHARE_PUSH_TYPE = 401013 \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt new file mode 100644 index 0000000000..98779716f9 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyPushWrapper.kt @@ -0,0 +1,11 @@ +package com.mogo.module.share.strategyreceiver + +data class AccidentStrategyPushWrapper( + /** + * 策略类型，1代表事故 + */ + val type: Int, + /** + * 触发点的poiType + */ + val id: String, val lat: Double, val lon: Double) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt new file mode 100644 index 0000000000..7ed36e0f56 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt @@ -0,0 +1,25 @@ +package com.mogo.module.share.strategyreceiver + +import com.mogo.map.MogoLatLng +import com.mogo.module.share.constant.S_TAG +import com.mogo.service.IMogoServiceApis +import com.mogo.service.connection.IMogoOnMessageListener +import com.mogo.service.tanlu.IMogoTanluProvider +import com.mogo.service.tanlu.TanluUploadParams +import com.mogo.utils.logger.Logger + +/** + * 车辆经过事故事件，上报视频 + * @author tong + */ +class AccidentStrategyReceiver(private val apis: IMogoServiceApis):IMogoOnMessageListener { + override fun target(): Class = AccidentStrategyPushWrapper::class.java + + override fun onMsgReceived(obj: AccidentStrategyPushWrapper?) { + obj?.let { + Logger.d(S_TAG, "Accident strategy share onMessageReceived: $obj") + // 调用探路接口上报，现在只接入了事故事件上报这一种策略上报，所以poiType固定为TypeAccident + apis.tanluApi.uploadRoadCondition(TanluUploadParams(IMogoTanluProvider.TYPE_ACCIDENT, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO, it.id, MogoLatLng(it.lat, it.lon))) + } + } +} \ No newline at end of file diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index d2366e3c2c..576821ada1 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -238,4 +238,10 @@ public class MogoServicePaths { */ @Deprecated public static final String PATH_TANLU_API = "/tanlulib/api"; + + /** + * 策略上报 + */ + @Deprecated + public static final String PATH_STRATEGY_SHARE = "/strategy/share"; } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java index 72cd49df3d..802e883c40 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java @@ -1,5 +1,7 @@ package com.mogo.service.tanlu; +import com.mogo.map.MogoLatLng; + /** * 探路事件上报参数封装 * @author tongchenfei @@ -22,6 +24,15 @@ public class TanluUploadParams { */ private int duration = IMogoTanluProvider.DEFAULT_VIDEO_DURATION; + /** + * 针对策略上报新增字段，用于车辆经过事故事件上报时，记录经过的事故事件id + */ + private String parentId = ""; + /** + * 针对策略上报新增字段，用于车辆经过事故事件上报时，记录触发围栏时的经纬度坐标 + */ + private MogoLatLng location = new MogoLatLng(0, 0); + public TanluUploadParams(String eventType){ this(eventType, IMogoTanluProvider.UPLOAD_FROM_USER); } @@ -37,6 +48,21 @@ public class TanluUploadParams { this.fromType = fromType; } + /** + * 针对策略上报新增构造方法，方便传入parentId和location + * @param eventType 事件类型 + * @param fromType 触发类型，是手动还是被动 + * @param parentId 经过事件id + * @param location 触发围栏的坐标 + */ + public TanluUploadParams(String eventType, String fromType, String parentId, + MogoLatLng location) { + this.eventType = eventType; + this.fromType = fromType; + this.parentId = parentId; + this.location = location; + } + public String getEventType() { return eventType; } @@ -61,6 +87,22 @@ public class TanluUploadParams { this.duration = duration; } + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public MogoLatLng getLocation() { + return location; + } + + public void setLocation(MogoLatLng location) { + this.location = location; + } + @Override public String toString() { return "TanluUploadParams{" + From 6d24a57eaf7a150fc31058b4001b8e3319aed036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 11:14:51 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E3=80=90?= =?UTF-8?q?=E6=99=BA=E6=85=A7=E9=A9=BE=E9=A9=B61.1.2=E3=80=91=E5=87=BA?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E6=80=81=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BA=E7=AC=AC=E4=BA=8C=E6=97=A5=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA=20http:/?= =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-167?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/v2x/V2XModuleProvider.java | 3 --- .../mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index ba01c75bbf..c966d01ef4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -31,7 +31,6 @@ import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario; import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkWindow; import com.mogo.module.v2x.utils.FatigueDrivingUtils; import com.mogo.module.v2x.utils.TimeUtils; -import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.service.module.IMogoModuleLifecycle; @@ -156,8 +155,6 @@ public class V2XModuleProvider implements } // 刷新配置文件 refreshStrategyConfig(); - // 清除V2X事件数据库中过期的数据，数据有效期为24小时 - V2XSQLiteUtils.clearYesterdayScenarioHistoryData(); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index f1ca65c970..9211a4f569 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -19,6 +19,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.ThreadUtils; +import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.view.V2XListEmptyView; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -130,6 +131,8 @@ public class V2XScenarioHistoryFragment @Override public void onResume() { super.onResume(); + // 清除V2X事件数据库中过期的数据，数据有效期为24小时 + V2XSQLiteUtils.clearYesterdayScenarioHistoryData(); mPresenter.loadHistory(); } From aa0081990a65e5ba1a92ed97dd7013c47707a586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 11:53:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8C=B9=E9=85=8D=E7=AD=96=E7=95=A5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/v2x/V2XConst.java | 1 + .../module/v2x/listener/V2XLocationListener.java | 2 ++ .../v2x/listener/V2XMessageListener_401012.java | 2 ++ .../com/mogo/module/v2x/utils/TrackUtils.java | 15 +++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index bb79de34e4..986804044a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -60,6 +60,7 @@ public class V2XConst { public static final String V2X_ROAD_SHOW = "v2x_road_show"; public static final String V2X_ROAD_EVET = "v2x_road_event"; public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; + public static final String V2X_ROAD_PRODUCE = "v2x_road_produce"; /** * V2X 道路事件操作类型 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java index 15654165b7..c70ac2c702 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java @@ -26,6 +26,7 @@ import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.module.v2x.utils.DrivingDirectionUtils; import com.mogo.module.v2x.utils.LocationUtils; import com.mogo.module.v2x.utils.MarkerUtils; +import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -157,6 +158,7 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList ); // Logger.w(MODULE_NAME, "V2X预警--前方数据距离:" + v2XRoadEventEntity.getDistance()); // 触发展示操作 + TrackUtils.trackV2xRoadProduceEvent(1); V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING); v2XMessageEntity.setContent(v2XRoadEventEntity); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java index 2c794c6e75..aeb1c8d287 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java @@ -17,6 +17,7 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.alarm.V2XAlarmServer; import com.mogo.module.v2x.utils.TimeConstants; import com.mogo.module.v2x.utils.TimeUtils; +import com.mogo.module.v2x.utils.TrackUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.logger.Logger; @@ -42,6 +43,7 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener properties = new HashMap<>(); + properties.put("type", type); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_PRODUCE, properties); + } catch (Exception e) { + e.printStackTrace(); + } + } } From 5edc2401b953ec82f2a44d9a61e3a5239a3f9f39 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 14 Aug 2020 15:44:24 +0800 Subject: [PATCH 4/8] modify tl lib --- .../service/CarCorderController.kt | 44 ++++++++++++++----- .../service/CosStatusController.kt | 23 +++++++--- .../roadcondition/service/MainService.kt | 15 ++++--- .../service/MainServiceController.kt | 14 +++--- .../com/zhidao/roadcondition/util/PdUtil.kt | 9 ++-- 5 files changed, 74 insertions(+), 31 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 24002c1042..63bb1e8d6b 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 @@ -34,6 +34,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { var mType: String = "" //1 上报拥堵, 2 封路和查车 var mainInfoId: Long = 0 var mFromType: String = "" + private var mLongitude: Double = 0.0 + private var mLatitude: Double = 0.0 private var getVideoFailed: (() -> Unit)? = null private var interceptors: ArrayList = ArrayList(1) @@ -69,12 +71,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { isCustom: Boolean = false, type: String, mainInfoId: Long, - fromType: String + fromType: String, + longitude: Double, + latitude: Double ) { Log.d(TAG, "takePhoto ---------- type = $type --- mType = $mType ---fromType = $fromType") this.mType = type this.mainInfoId = mainInfoId this.mFromType = fromType + this.mLongitude = longitude + this.mLatitude = latitude CustomStatusHandler.offerPhotoStatus(isCustom) zdCarCoderController.takePhoto(photoType, cameraId, haveVoice) trackGetPhoto(1) @@ -91,13 +97,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { id: Long = 0L, type: String, mainInfoId: Long, - fromType: String + fromType: String, + longitude: Double, + latitude: Double ) { - Log.d(TAG, "takeVideo -------- type = $type") - Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType") + Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType ---type = $type" ) this.mType = type this.mainInfoId = mainInfoId this.mFromType = fromType + this.mLongitude = longitude + this.mLatitude = latitude if (DebugConfig.getCarMachineType() == 0) { //自研车机 outputVideoPath = getCompressVideoPath() CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id)) @@ -118,7 +127,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { videoAndThumbMap, mType, entity, - mainInfoId + mainInfoId, + mLongitude, + mLatitude ) //地图上打点 @@ -177,7 +188,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mutableMapOf("pic" to "" as String), mType, entity, - mainInfoId + mainInfoId, + mLongitude, + mLatitude ); } } @@ -219,7 +232,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { if (!TextUtils.isEmpty(mType)) { Log.d(TAG, "onTakePhotoSuccess mType != null") - CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType, mainInfoId, mFromType) + CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType, mainInfoId, mFromType, mLongitude, + mLatitude) } else { Log.d(TAG, "onTakePhotoSuccess mType == null") Log.d( @@ -234,7 +248,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { entity, mType, mainInfoId, - mFromType + mFromType, + mLongitude, + mLatitude ) } } @@ -247,7 +263,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { entity, mType, mainInfoId, - mFromType + mFromType, + mLongitude, + mLatitude ) } } @@ -336,7 +354,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { videoAndThumbMap, mType, entity, - mainInfoId + mainInfoId, + mLongitude, + mLatitude ) //地图上打点 @@ -375,7 +395,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { entity, mType, mainInfoId, - mFromType + mFromType, + mLongitude, + mLatitude ) //删除压缩前的视频 deletePicFile(videoPath) 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 464744387b..8502395eb3 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 @@ -38,16 +38,21 @@ class CosStatusController : CosStatusCallback { private var mType: String = "" private var mainInfoId: Long = 0 private var mFromType: String = "" + private var mLongitude: Double = 0.0 + private var mLatitude: Double = 0.0 //上传文件 - fun uploadFile(picPath: MutableList, entity: TakeEntity, type: String, mainInfoId: Long, fromType: String) { + fun uploadFile(picPath: MutableList, entity: TakeEntity, type: String, mainInfoId: Long, + fromType: String, longitude: Double, latitude: Double) { CosCallbackMapController.registerCallback(picPath, this) // CosLogger.setLogStatus(true) this.entity = entity this.mType = type this.mainInfoId = mainInfoId - this.mFromType = fromType; + this.mFromType = fromType + this.mLongitude = longitude + this.mLatitude = latitude Log.d(TAG, "uploadFile type===$type ---- mainInfoId =$mainInfoId ----mFromType = $mFromType ---- picPath = $picPath ") trackUploadCos(3) if (picPath.contains("backPic")) return @@ -161,7 +166,9 @@ class CosStatusController : CosStatusCallback { mutableMapOf("pic" to downloadUrl as String), mType, entity, - mainInfoId + mainInfoId, + mLongitude, + mLatitude ) // } } @@ -177,7 +184,7 @@ class CosStatusController : CosStatusCallback { // CosCallbackMapController.mainService?.sendCustomResult(it) // } // } else { - sendInformationDirectly(type, map, mType, entity, mainInfoId) + sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude) // } } @@ -189,7 +196,9 @@ class CosStatusController : CosStatusCallback { map: Map, poiType: String, entity: TakeEntity, - mainInfoId: Long + mainInfoId: Long, + longitude: Double, + latitude: Double ) { Log.d(TAG, "sendInformationDirectly isCustomSend = ${entity?.isCustom}") Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId") @@ -198,7 +207,9 @@ class CosStatusController : CosStatusCallback { url = map, isCustom = entity?.isCustom, poiType = poiType, - mainInfoId = mainInfoId + mainInfoId = mainInfoId, + longitude = longitude, + latitude = latitude ) { success -> CosCallbackMapController.unregisterCallbacks(map) CosCallbackMapController.mainService?.let { 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 91700ea1cc..ea5004e607 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 @@ -62,6 +62,8 @@ class MainService : Service() { var params: UploadParams? = null var mainInfoId: Long = 0 + private var mLongitude: Double = 0.0 + private var mLatitude: Double = 0.0 //发送主动上报结果广播给外部 fun sendCustomResult(result: Boolean) { @@ -88,13 +90,14 @@ class MainService : Service() { shareType = it.eventType fromType = it.fromType mainInfoId = 0 //TODO + Log.d(TAG, "onStartCommand shareType = $shareType") if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK ) { // takePhoto(1, false, true) - if (!fromType.equals(UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO)) { // 是策略触发，不提示 + if (fromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { // 是策略触发，不提示 takeVideo(it.duration, isCustom = true, id = id) } else { takeVideo(it.duration) @@ -131,7 +134,7 @@ class MainService : Service() { override fun onReceive(p0: Context?, p1: Intent) { val id = p1.getLongExtra("id", 0L) if (p1.action == sendInformationAction) { - takeVideo(10, isCustom = true, id = id) + takeVideo(DEFAULT_VIDEO_DURATION, isCustom = true, id = id) } } } @@ -181,7 +184,7 @@ class MainService : Service() { @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 98) fun getImageEvent(getImageSuccessEvent: GetImageSuccessEvent) { var info = LocationUtil.getInstance().getLocationInfo() - Log.e("MainService", "getImageEvent long = ${info.longitude} ----> lat= ${info.latitude}") + Log.d("MainService", "getImageEvent long = ${info.longitude} ----> lat= ${info.latitude}") Log.d( "MainService", "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType() @@ -250,7 +253,7 @@ class MainService : Service() { } if (videoType == 1) { - takeVideo(10) + takeVideo(DEFAULT_VIDEO_DURATION) } else if (videoType == 2) { postVideoAlarmTask(true) } @@ -278,7 +281,7 @@ class MainService : Service() { Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) .subscribe(Consumer { - CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType) + CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude) }) // } @@ -297,7 +300,7 @@ class MainService : Service() { Log.d("MainService", "takeVideo --------1---->") // if (isAuthorization(BaseApplication.getAppContext())) { // log(TAG, "takeVideo --------2---->") - CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT, mainInfoId, fromType) + CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude) // } postVideoAlarmTask(isInterval) 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 9fb7e4ee51..58aff2ab9f 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 @@ -227,16 +227,18 @@ class MainServiceController { isShare:Boolean = false, poiType:String, mainInfoId:Long, + longitude: Double, + latitude: Double, customSend: ((Boolean) -> Unit)? = null ) { Log.d(TAG, " sendInformationMessage poiType = $poiType"); //删除测试数据 var locationInfo = LocationUtil.getInstance().getLocationInfo(); if (locationInfo.address.isNullOrEmpty()) { - geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId) + geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId,longitude,latitude) } else { postInformationMessage( - getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId), + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId,longitude,latitude), customSend ) } @@ -253,19 +255,21 @@ class MainServiceController { isShare: Boolean, customSend: ((Boolean) -> Unit)? = null, poiType: String, - mainInfoId: Long + mainInfoId: Long, + longitude: Double, + latitude: Double ) { Log.d(TAG, " geoLocation -- poiType = $poiType"); LocationUtil.getInstance() .geoCodeLocation(locationInfo.toLatLngPoint(), { locInfo: LocationInfo -> postInformationMessage( - getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId), + getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude), customSend ) }, { //转换失败的情况下再重试一次 geoRetryed = if (!geoRetryed) { - geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId) + geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId,longitude,latitude) true } else { false diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt index 60d97f3871..cc4cb781f1 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt @@ -4,6 +4,7 @@ import com.google.gson.JsonArray import com.google.gson.JsonObject import com.mogo.commons.AbsMogoApplication import com.mogo.commons.network.Utils +import com.zhidao.roadcondition.constant.TANLU_ROAD_CURRENT import com.zhidao.roadcondition.model.InformationBody import com.zhidao.roadcondition.model.LocationInfo import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG @@ -29,7 +30,9 @@ fun getInformationBody( trafficInfoType:String = "", isShare:Boolean, poiType: String, - mainInfoId: Long + mainInfoId: Long, + latitude: Double, + longitude: Double ): InformationBody { var jsonArray = JsonArray() var type: Int @@ -54,8 +57,8 @@ fun getInformationBody( locationInfo.cityCode, locationInfo.cityName, System.currentTimeMillis(), - locationInfo.latitude, - locationInfo.longitude, + if (latitude == 0.0) locationInfo.latitude else latitude, + if (longitude == 0.0) locationInfo.longitude else longitude, locationInfo.provinceName, Utils.getSn(), locationInfo.street, From 4ae64fc939fd1e4f49152c3e1b4a4ca68003bbc8 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 17 Aug 2020 14:34:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?bug=20fix:=20=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=A1=86=E5=92=8C=E5=B7=A6=E4=BE=A7adas=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E5=89=8D=E8=A7=A3=E5=86=B3=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=98=AF=E5=88=86=E4=BA=AB=E6=A1=86=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E9=9A=90=E8=97=8Fadas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/styles.xml | 1 + .../com/mogo/module/share/ShareControl.java | 35 +++++++------------ .../share/dialog/LaucherShareDialog.java | 18 ++++++++++ 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml index 162fe17f3e..5810a99910 100644 --- a/modules/mogo-module-common/src/main/res/values/styles.xml +++ b/modules/mogo-module-common/src/main/res/values/styles.xml @@ -5,6 +5,7 @@ @null true @android:color/transparent + 0.85 true @null @android:color/transparent 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 ee53ecbe2b..44f63c0b82 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 @@ -32,6 +32,8 @@ import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.share.IMogoShareManager; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.tanlu.IMogoTanluProvider; import com.mogo.service.tanlu.TanluUploadParams; import com.mogo.utils.TipToast; @@ -209,29 +211,16 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_CONSTRUCTION, UPLOAD_ROAD_CONSTRUCTION, this); } - -// ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() { -// @Override -// public void showCarLocationInfo(CarLocationInfo info) { -// Logger.d(TAG, "获取到car location info: " + info.carId); -// } -// -// @Override -// public void showOtherInfo(String info) { -// Logger.d(TAG, "获取到other info: " + info); -// } -// -// @Override -// public void showTrafficLightInfo(TrafficLightInfo info) { -// Logger.d(TAG, "获取到traffic light info: " + info.id); -// } -// -// @Override -// public void showCarEventInfo(CarEventInfo info) { -// Logger.d(TAG, "获取到car event info: " + info.describe); -// } -// }); - + if(!DebugConfig.isLauncher()) { + ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() { + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (!isTrue) { + dismissShareDialog(); + } + } + }); + } Logger.d(TAG,"init over===="); } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 24202335b1..a07777a45f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -6,6 +6,7 @@ import android.view.WindowManager; import android.widget.TextView; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.dialog.BaseFloatDialog; import com.mogo.module.share.R; import com.mogo.module.share.manager.ISeekHelpListener; @@ -193,4 +194,21 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL UploadHelper.INSTANCE.upload(mContext, params,true); } + @Override + public void show() { + Logger.d(TAG,"onShow===="); + if(!DebugConfig.isLauncher()) { + mApis.getAdasControllerApi().closeADAS(); + } + super.show(); + } + + @Override + public void dismiss() { + Logger.d(TAG,"onDismiss====="); + if (!DebugConfig.isLauncher()&&mApis.getStatusManagerApi().isMainPageOnResume()) { + mApis.getAdasControllerApi().showADAS(); + } + super.dismiss(); + } } From 3e823f1ac5066fe1d35b26d26bae22b81806d833 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 17 Aug 2020 14:51:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=97=B6=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/share/manager/UploadHelper.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index cf54303b38..770b17831e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -4,6 +4,8 @@ import android.content.Context import android.content.Intent import com.mogo.commons.debug.DebugConfig import com.mogo.commons.voice.AIAssist +import com.mogo.map.MogoLatLng +import com.mogo.map.location.MogoLocation import com.mogo.module.share.ShareControl import com.mogo.module.share.dialog.LaucherShareDialog import com.mogo.service.tanlu.TanluUploadParams @@ -23,6 +25,9 @@ object UploadHelper { if(DebugConfig.getAIType() == DebugConfig.AI_TYPE_TXZ||forcePlayVoice) { AIAssist.getInstance(context).speakTTSVoice("感谢分享，正在上传") } + val location = ServiceApisManager.serviceApis.mapServiceApi.getSingletonLocationClient(context).lastKnowLocation + val latLon = MogoLatLng(location.latitude, location.longitude) + type.location = latLon Logger.d("UploadHelper", "upload ----> $type") ServiceApisManager.serviceApis.tanluApi.uploadRoadCondition(type) // val intent = Intent() From 86c9939475aad090c26ec9134d52ebba609f7813 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 17 Aug 2020 15:44:23 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5push=E6=8E=A5=E6=94=B6=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-share/build.gradle | 3 ++- .../src/main/java/com/mogo/service/MogoServicePaths.java | 2 +- .../main/java/com/mogo/service/tanlu/TanluUploadParams.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index 5a6e9d9be2..93a42fe9e8 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { @@ -38,7 +39,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxccorektx implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler + kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index 576821ada1..f5a78c3c34 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -243,5 +243,5 @@ public class MogoServicePaths { * 策略上报 */ @Deprecated - public static final String PATH_STRATEGY_SHARE = "/strategy/share"; + public static final String PATH_STRATEGY_SHARE = "/share/strategy"; } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java index 802e883c40..7cee36b5de 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java @@ -109,6 +109,8 @@ public class TanluUploadParams { "eventType='" + eventType + '\'' + ", fromType='" + fromType + '\'' + ", duration=" + duration + + ", parentId='" + parentId + '\'' + + ", location=" + location + '}'; } } From 855ca48a9bc342400a993b86ba3323d52126c998 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 17 Aug 2020 16:14:04 +0800 Subject: [PATCH 8/8] opt --- .../java/com/zhidao/roadcondition/service/MainService.kt | 7 ++++--- .../com/zhidao/roadcondition/util/SharedPreferenceUtil.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) 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 ea5004e607..f62dfa7645 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 @@ -89,9 +89,10 @@ class MainService : Service() { params?.let { shareType = it.eventType fromType = it.fromType - mainInfoId = 0 //TODO - - Log.d(TAG, "onStartCommand shareType = $shareType") + mainInfoId = it.parentId.toLong() + mLongitude = it.lon + mLatitude = it.lat + Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt index 57baf80a0a..551415e728 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt @@ -22,7 +22,7 @@ const val PARAM_ACTIVE_STATUS = "PARAM_ACTIVE_STATUS" const val LAST_ENTER_TIME = "LAST_ENTER_TIME" const val PIC_NUMBER = "PIC_NUMBER" //图片拍摄张数 -const val VIDEO_DURATION_DEFAULT = 15_000L //视频拍摄时长 +const val VIDEO_DURATION_DEFAULT = 10_000L //视频拍摄时长 const val PIC_NUMBER_DEFAULT = 1L //图片拍摄张数 const val TIME_QUANTUM = "time_quantum" //时间段