From 3b798b30c64ae8a819b81b924a96033637e98902 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 1 Apr 2021 18:05:48 +0800
Subject: [PATCH] ..

---
 gradle.properties                                | 16 ++++++++--------
 .../roadcondition/service/CarCorderController.kt | 10 ++--------
 .../module/push/adapter/PushMessageAdapter.kt    |  8 ++++----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a2007126a0..73f8f9dadb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -155,21 +155,21 @@ LOGLIB_VERSION = 1.0.4
 
 ######## MogoAiCloudSDK Version
 # 网络请求
-MOGO_NETWORK_VERSION=1.0.60
+MOGO_NETWORK_VERSION=1.0.61
 # 鉴权
-MOGO_PASSPORT_VERSION=1.0.60
+MOGO_PASSPORT_VERSION=1.0.61
 # 常链接
-MOGO_SOCKET_VERSION=1.0.60
+MOGO_SOCKET_VERSION=1.0.61
 # 数据采集
-MOGO_REALTIME_VERSION=1.0.60
+MOGO_REALTIME_VERSION=1.0.61
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.0.60
+MOGO_TANLU_VERSION=1.0.61
 # 直播推流
-MOGO_LIVE_VERSION=1.0.60
+MOGO_LIVE_VERSION=1.0.61
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.0.60
+MOGO_TRAFFICLIVE_VERSION=1.0.61
 
-######## Foundation MogoAiCloud Module
+######## Foundation MogoAiCloud Moduletruetr
 # mogoAiCloud apk services
 MOGO_AICLOUD_SERVICES_APK_VERSION=1.0.0-SNAPSHOT
 # mogoAiCloud sdk services
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 c64ffaec9a..faee34d0e5 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
@@ -18,8 +18,6 @@ import com.zhidao.auto.carcorder.controller.ZdCarCoderController
 import com.zhidao.roadcondition.constant.STRATEGY_UPLOAD_TYPE_ARRAY
 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.*
 import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyMaxSpeed
 import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyMinSpeed
@@ -154,7 +152,6 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 //                TipToast.shortTip("分享失败，请检查网络")
 //            } else {
             //失败了，传空地址，发起请求
-            val entity = TakeEntity(isCustom, id, fromType)
 //            videoAndThumbMap["video"] = ""
 //            videoAndThumbMap["thumb"] = ""
 
@@ -197,7 +194,6 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
             it.onTakePhotoFail(photoType, camera)
         }
         val isCustom = CustomStatusHandler.pollPhotoStatus()
-        val entity = TakeEntity(isCustom, 0L)
         Log.e(TAG, "onTakePhotoFail -----mType = $mType --- isCustom = $isCustom")
         //获取图片失败也上报，图片不打点
         if (isCustom) {
@@ -224,7 +220,6 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
         trackGetPhoto(2)
         Log.d(TAG, "onTakePhotoSuccess -----mType = $mType --- mainInfoId = $mainInfoId")
         val isCustom = CustomStatusHandler.pollPhotoStatus()
-        val entity = TakeEntity(isCustom, 0L)
 
         if (!isCustom) {
             trackNormalEvent(CarNet_auto_upload, null)
@@ -470,10 +465,10 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     /**
      * 上报路况的视频和图片
      */
-    fun uploadRoadInfo(info: UploadInfo) {
+    private fun uploadRoadInfo(info: UploadInfo) {
         MogoUploadManager.getInstance(AbsMogoApplication.getApp().applicationContext).uploadInfo(info, object : ITanluUploadCallback {
             override fun onSuccess(result: BaseData<UploadResult>) {
-                if (result != null) {
+                if (result.result != null) {
                     Log.d(TAG, "result =" + result.result);
                 }
             }
@@ -514,7 +509,6 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 
     override fun onTakeVideoCancel(camera: Int) {
         Log.d(TAG, "onTakeVideoCancel -----camera = $camera")
-        val entity = CustomStatusHandler.pollVideoStatus()
         //失败了，传空地址，发起请求
         videoAndThumbMap["video"] = ""
         videoAndThumbMap["thumb"] = ""
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt
index 25f45bd3c3..b920fedc77 100644
--- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt
@@ -89,7 +89,7 @@ class PushMessageAdapter : RecyclerView.Adapter<PushMessageAdapter.MessageViewHo
             pushDelete.setOnClickListener {
                 deletePushBean.deleteBean(bean, false)
             }
-            if (!bean.mainSchema.isNullOrEmpty()) {
+            if (bean.mainSchema.isNotEmpty()) {
                 pushClick.setOnClickListener {
                     dealSchema(bean.mainSchema, itemView.context)
                     deletePushBean.deleteBean(bean, true)
@@ -100,11 +100,11 @@ class PushMessageAdapter : RecyclerView.Adapter<PushMessageAdapter.MessageViewHo
 //            getApis(itemView.context).imageLoaderApi.displayImage(bean.appIcon, pushAppIcon)
             pushTitle.text = bean.title
             pushContent.text = bean.content
-            pushContent.visibility = if (bean.content.isNullOrEmpty()) View.GONE else View.VISIBLE
-            if (bean.QRCode.isNullOrEmpty() && bean.imageUrl.isNotEmpty()) {
+            pushContent.visibility = if (bean.content.isEmpty()) View.GONE else View.VISIBLE
+            if (bean.QRCode.isEmpty() && bean.imageUrl.isNotEmpty()) {
                 getApis(itemView.context).imageLoaderApi.displayImage(bean.imageUrl, pushImage)
             }
-            if (!bean.QRCode.isNullOrEmpty()) {
+            if (bean.QRCode.isNotEmpty()) {
                 pushImage.setImageBitmap(
                     stringConverterBitmap(
                         bean.QRCode,