yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2021-02-23 16:10:17 +08:00
parent b58eed7512
commit 3d01e0ef59
4 changed files with 96 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
zdCarCoderController.init()
}
fun takePhoto(
photoType: Int,
cameraId: Int,
@@ -87,7 +88,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
fromType: String,
longitude: Double,
latitude: Double,
speed: Float
speed: Float,
address: String,
direction: Float,
areaCode: String,
cityCode: String
) {
Log.d(TAG, "takePhoto ---------- type = $type --- mType = $mType ---fromType = $fromType")
this.mType = type
@@ -96,6 +101,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
this.mLongitude = longitude
this.mLatitude = latitude
this.mSpeed = speed
this.mAddress = address
this.mDirection = direction
this.mAreaCode = areaCode
this.mCityCode = cityCode
CustomStatusHandler.offerPhotoStatus(isCustom)
zdCarCoderController.takePhoto(photoType, cameraId, haveVoice)
trackGetPhoto(1)
@@ -115,7 +125,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
fromType: String,
longitude: Double,
latitude: Double,
speed: Float
speed: Float,
address: String,
direction: Float,
areaCode: String,
cityCode: String
) {
Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType ---type = $type ---speed = $speed")
this.mType = type
@@ -124,6 +138,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
this.mLongitude = longitude
this.mLatitude = latitude
this.mSpeed = speed
this.mAddress = address
this.mDirection = direction
this.mAreaCode = areaCode
this.mCityCode = cityCode
if (DebugConfig.getCarMachineType() == 0) { //自研车机
outputVideoPath = getCompressVideoPath()
CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id, fromType))

15
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
View File

@@ -76,6 +76,12 @@ class MainService : Service() {
private var mLatitude: Double = 0.0
private lateinit var serviceApis: IMogoServiceApis
private var mAddress: String = ""
private var mDirection: Float = 0f
private var mAreaCode: String = ""
private var mCityCode: String = ""
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
//清理多媒体资源和sp策略数据
clearStrategyType(this)
@@ -95,6 +101,11 @@ class MainService : Service() {
mainInfoId = it.parentId
mLongitude = it.lon
mLatitude = it.lat
mAddress = it.addr
mDirection = it.direction
mAreaCode = it.areaCode
mCityCode = it.cityCode
Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ")
if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) {
// 如果是策略上报，isCustom = false
@@ -274,7 +285,7 @@ class MainService : Service() {
Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude, speed)
CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude, speed, mAddress, mDirection, mAreaCode, mCityCode)
}
// }
@@ -292,7 +303,7 @@ class MainService : Service() {
) {
Log.d("MainService", "takeVideo --------1----> fromType = $fromType --isCustom = $isCustom")
// if (isAuthorization(BaseApplication.getAppContext())) {
CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed)
CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed, mAddress, mDirection, mAreaCode, mCityCode)
// }
postVideoAlarmTask(isInterval)