From bd6a8872438a35d47821c5d5da7fe149e5fed3ab Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 21 六月 2023 09:53:36 +0800
Subject: [PATCH] 处理收不到广播
---
app/release/app-release.apk | 0
app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt | 5 +++++
app/release/output.json | 2 +-
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt | 4 ++++
app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt | 2 ++
app/src/main/java/com/okgoincar/netUtls/Api.java | 2 +-
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt | 8 ++------
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 4 +++-
app/build.gradle | 6 +++---
app/src/main/java/com/okgoincar/base/MyApplication.kt | 21 +++++++++++++++++++--
10 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 104231c..f875874 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,9 +24,9 @@
defaultConfig {
applicationId "com.okgoincar"
minSdkVersion 19
- targetSdkVersion 29
- versionCode 12
- versionName "12"
+ targetSdkVersion 25
+ versionCode 13
+ versionName "13"
// versionCode 22
// versionName "22"
multiDexEnabled true
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index f7154f4..9cd1704 100644
--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
Binary files differ
diff --git a/app/release/output.json b/app/release/output.json
index 91691db..f8590d8 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"13","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
index 8c58ed5..54057fb 100644
--- a/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -5,6 +5,7 @@
import android.content.Intent
import android.os.Handler
import android.os.Looper
+import android.util.Log
import cn.sinata.rxnetty.netStatus.NetUtils
import cn.sinata.xldutils.utils.toast
import com.google.gson.Gson
@@ -23,6 +24,8 @@
class MainBroadCastReceiver : BroadcastReceiver() {
override fun onReceive(contexts: Context?, intent: Intent?) {
+ MyApplication.upLog("收到广播，Action:${intent?.action}")
+ Log.e("MoneyBroadCastReceiver","收到广播，Action:${intent?.action}")
if (intent == null) {
toast("内容获取为空，广播接收消息错误")
return
@@ -43,6 +46,7 @@
if (driverCertificate == null) {
// toast("身份证获取失败")
} else {
+ MyApplication.upLog("广播参数：driverCertificate:${driverCertificate}，开始登录")
if (contexts == null) {
// toast("上下文为空，使用全局跳转")
toLoginActivity(MyApplication.getInstance(), driverCertificate)
diff --git a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
index b2fab44..e98e7f3 100644
--- a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
@@ -5,6 +5,7 @@
import android.content.Intent
import android.os.Handler
import android.os.Looper
+import android.util.Log
import cn.sinata.xldutils.netstatus.NetUtils
import cn.sinata.xldutils.utils.toast
import com.google.gson.Gson
@@ -40,6 +41,8 @@
*/
class MoneyBroadCastReceiver : BroadcastReceiver() {
override fun onReceive(contexts: Context?, intent: Intent?) {
+ MyApplication.upLog("收到广播，Action:${intent?.action}")
+ Log.e("MoneyBroadCastReceiver","收到广播，Action:${intent?.action}")
if (intent == null && contexts == null) {
toast("内容获取为空，广播接收消息错误")
return
@@ -49,6 +52,7 @@
when (intent!!.action) {
"wisdom.intent.action.ledLight" -> {
val isHeavy = intent!!.getBooleanExtra("isHeavy", true)
+ MyApplication.upLog("广播内容，isHeavy:${isHeavy}")
if (isHeavy) {
callStatue(contexts!!, 5) //代表让订单到进行中
}
@@ -69,6 +73,7 @@
companion object {
fun callStatue(contexts: Context, i: Int) {
if (MyApplication.currentOrderId.isEmpty()) {
+ MyApplication.upLog("callStatue error，MyApplication.currentOrderId.isEmpty")
toast("没有进行中的订单，无法开始")
return
}
diff --git a/app/src/main/java/com/okgoincar/base/MyApplication.kt b/app/src/main/java/com/okgoincar/base/MyApplication.kt
index 88a58f6..147ba26 100644
--- a/app/src/main/java/com/okgoincar/base/MyApplication.kt
+++ b/app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -8,10 +8,11 @@
import android.os.Looper
import android.util.Log
import androidx.multidex.MultiDex
-import cn.sinata.rxnetty.Cache.CacheUtil
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.BaseApplication
+import cn.sinata.xldutils.utils.TimeUtils
import cn.sinata.xldutils.utils.sysErr
+import cn.sinata.xldutils.utils.toast
import com.amap.api.location.AMapLocation
import com.amap.api.track.AMapTrackClient
import com.amap.api.track.ErrorCode
@@ -26,9 +27,12 @@
import com.okgoincar.bean.OrderSimpleData
import com.okgoincar.bean.websocket.HeartBean
import com.okgoincar.netUtls.Api
+import com.okgoincar.netUtls.callNet
+import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.netUtls.getUserId
import com.okgoincar.slab.MySlabBaseActivity
import com.okgoincar.utils.Cache.CacheKey
+import com.okgoincar.utils.LogUtils
import com.tencent.bugly.crashreport.CrashReport
import org.jetbrains.anko.toast
import org.json.JSONObject
@@ -69,7 +73,7 @@
registerActivityLifecycleCallbacks(this)
// PlatformConfig.setWeixin("wx65d2c03f04352f90", "7a3a57f9ba78c1f400b75298eec4c7c0")
// PlatformConfig.setQQZone("101877032", "eab94b262bf9789eec770cde42a6e71e") //qq互联
-// LogUtils.OpenLog(true)
+ LogUtils.OpenLog(true)
CrashReport.initCrashReport(applicationContext, "666d35fada", false)
initUpPoint()
initSocket()
@@ -88,6 +92,9 @@
currentTime = System.currentTimeMillis()
val json = JSONObject(message)
val method = json.optString("method")
+ if (method!= "OK"&&method!= "PONG")
+ upLog("收到服务端推送，method:${method}")
+
Handler(Looper.getMainLooper()).post {
// toast("收到websocket=$method")
}
@@ -385,6 +392,16 @@
fun removeOrderView(view: OrderStatueView?) {
orderStatueViews.remove(view)
}
+
+
+ fun upLog(msg:String){
+// val map = getMapByAny()
+// map["content"] = "${TimeUtils.getCurrentTime()}:=====》$msg"
+// if (appContext!=null)
+// callNet(appContext!!,Api.saveVehicleTerminalLog,map,{}){
+// toast("丢失一条日志")
+// }
+ }
}
private val activities = ArrayList<Activity?>()
diff --git a/app/src/main/java/com/okgoincar/netUtls/Api.java b/app/src/main/java/com/okgoincar/netUtls/Api.java
index 6e7d021..d5d18bf 100644
--- a/app/src/main/java/com/okgoincar/netUtls/Api.java
+++ b/app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -114,5 +114,5 @@
public static String queryNewData_ = "api/version/queryNewData_"; ///api/version/queryNewData_ 获取最新版本数据
-
+ public static String saveVehicleTerminalLog = "base/log/saveVehicleTerminalLog"; //日志埋点
}
diff --git a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
index 79dab30..9dfe808 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -1,12 +1,9 @@
package com.okgoincar.slab
import android.content.Context
-import android.content.Intent
import android.os.Handler
import android.os.Looper
import android.widget.Toast
-import cn.sinata.xldutils.netstatus.NetUtils
-import cn.sinata.xldutils.utils.DialogUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import com.google.gson.Gson
@@ -14,14 +11,12 @@
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.utils.Cache.CacheKey
import com.okgoincar.R
-import com.okgoincar.base.BaseEvent
+import com.okgoincar.base.MyApplication
import com.okgoincar.bean.LoginBean
import com.okgoincar.netUtls.Api
import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.slab_activity_login.*
-import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
-import org.jetbrains.anko.toast
class SlabLoginActivity : MySlabBaseActivity() {
@@ -86,6 +81,7 @@
var map = getMapByAny()
map["taxiAptitudeCard"] = driverCertificate
callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
+ MyApplication.upLog("登录车载端，taxiAptitudeCard:${driverCertificate}")
cn.sinata.xldutils.utils.toast("登录成功")
var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
CacheKey.putKeyStr("appid", bean.data.appid)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt
index eaf0cb8..5bbcbc3 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabStartActivity.kt
@@ -8,6 +8,7 @@
import com.okgoincar.R
import com.okgoincar.base.BaseEvent
import com.okgoincar.base.Const
+import com.okgoincar.base.MyApplication
import com.okgoincar.netUtls.getToken
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
@@ -23,6 +24,7 @@
setContentView(R.layout.activity_start)
EventBus.getDefault().register(this)
setRxpermiss()
+ MyApplication.upLog("SlabStartActivity:车载端启动")
}
private fun callLast() {
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index 226e275..433350c 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -455,6 +455,7 @@
map["orderType"] = orderType
callNet(this, Api.queryOrderInfo, map) {
orderBean = gson.fromJson(it, OrderBean::class.java)
+ MyApplication.upLog("TripActivity callOrder 订单状态：${orderBean.data.orderState}")
showUi(orderBean)
// Handler(Looper.getMainLooper()).postDelayed({
// startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
@@ -619,7 +620,8 @@
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK;
intent.action = "wisdom.intent.action.topLight";
intent.putExtra("state", 0)
- sendBroadcast(intent);
+ sendBroadcast(intent)
+ MyApplication.upLog("TripActivity clickBroad():发送广播 ${intent.action} state:${0}")
}
private fun startTimeStart(waitTime: Int) {
--
Gitblit v1.7.1