diff --git a/app/build.gradle b/app/build.gradle index 2efdfea..77ae473 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 30004 - versionName "3.0.4" + versionCode 30005 + versionName "3.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // ndk { diff --git a/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt b/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt index 83ce4ca..680f6ce 100644 --- a/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt +++ b/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt @@ -50,16 +50,16 @@ data class ClassActiveInfo( fun getImgUrls():MutableList{ val list = mutableListOf() attachments.forEach { - if (it.file_id?.isNotEmpty()) - list.add(it.file_identity.getImgUrl(it.file_id)) + if (it.file_id?.isNotEmpty() == true) + list.add(it.file_identity?.getImgUrl(it.file_id?:"")?:"") } return list } } data class ActiveAttachment( - val file_id: String = "", - val file_identity: String = "", + val file_id: String ?= "", + val file_identity: String ?= "", ) data class ClassStylePic( diff --git a/app/src/main/java/com/yzx/ebrand/utils/Monitor.kt b/app/src/main/java/com/yzx/ebrand/utils/Monitor.kt index dddca5e..4689e99 100644 --- a/app/src/main/java/com/yzx/ebrand/utils/Monitor.kt +++ b/app/src/main/java/com/yzx/ebrand/utils/Monitor.kt @@ -11,12 +11,12 @@ import com.lzy.okgo.model.HttpHeaders import com.lzy.okgo.model.Response import com.yzx.ebrand.model.User import java.text.SimpleDateFormat -import java.util.* +import java.util.Date object Monitor { val DT_URL = - "https://oapi.dingtalk.com/robot/send?access_token=886b2c609ddbcc1c8ff80abfd847e9c192bbde80815721204799b0b300cd7418" + "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=78f41a5d-0d2d-452d-ae57-b0fd1a6aaa98" fun postDingTalkMsg() { val monitorText = SPUtils.getInstance().getString("crashData") @@ -81,7 +81,7 @@ object Monitor { fun postNetError(errorInfo:StringBuilder){ val stringBuffer = StringBuffer() - stringBuffer.append("电子屏异常上报:").append("\n") + stringBuffer.append("电子班牌异常上报:").append("\n") stringBuffer.append("异常类型:").append("接口异常").append("\n") stringBuffer.append("系统信息:").append(AppUtils.getAppInfo().versionName).append("\n") val user = User.getUser()