diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/App.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/App.kt index e081be338..c2a0a7c5e 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/App.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/App.kt @@ -16,6 +16,8 @@ import com.tencent.iot.explorer.link.core.auth.socket.callback.PayloadMessageCal import com.tencent.iot.explorer.link.core.auth.util.Weak import com.tencent.iot.explorer.link.demo.common.log.L import com.tencent.iot.explorer.link.core.link.entity.TRTCParamsEntity +import com.tencent.iot.explorer.link.demo.common.log.L.ld +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.rtc.TRTCSdkDemoSessionManager import com.tencent.iot.explorer.link.rtc.model.* import com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity @@ -56,7 +58,7 @@ class App : Application(), PayloadMessageCallback { IoTAuth.init(APP_KEY, APP_SECRET) IoTAuth.addLoginExpiredListener(object : LoginExpiredListener { override fun expired(user: User) { - L.d("用户登录过期") + ld { "用户登录过期" } } }) IoTAuth.registerSharedBugly(this) //接入共享式bugly @@ -83,7 +85,9 @@ class App : Application(), PayloadMessageCallback { private fun trtcCallDevice(callingType: Int) { IoTAuth.deviceImpl.trtcCallDevice(data.callingDeviceId, object: MyCallback { override fun fail(msg: String?, reqCode: Int) { - if (msg != null) L.e(msg) + msg?.let { + le { it } + } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/BaseActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/BaseActivity.kt index 14b09ad5e..3c4526fca 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/BaseActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/BaseActivity.kt @@ -10,7 +10,7 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.viewbinding.ViewBinding -import com.tencent.iot.explorer.link.demo.common.log.L +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.common.util.Watermark import com.tencent.iot.explorer.link.demo.core.activity.MainActivity import com.tencent.xnet.XP2P @@ -78,10 +78,10 @@ abstract class BaseActivity : AppCompatActivity() { protected fun checkPermissions(permissions: Array): Boolean { for (p in permissions) { if (ActivityCompat.checkSelfPermission(this, p) == PackageManager.PERMISSION_DENIED) { - L.e(p + "被拒绝") + le { "${p}被拒绝" } return false } - L.e(p + "已经申请成功") + le { p + "已经申请成功" } } return true } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/log/L.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/log/L.kt index 668c8328d..778d05fb2 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/log/L.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/log/L.kt @@ -4,37 +4,107 @@ import android.util.Log internal object L { + private const val DEFAULT_TAG = "demo" + var isLog = false + var LOG_LEVEL = 3 // 允许输出log的级别(1:输出所有日志, 6:不输出日志) + const val LEVEL_VERBOSE = 1 // 日志输出级别 V + const val LEVEL_INFO = 2 // 日志输出级别 I + const val LEVEL_DEBUG = 3 // 日志输出级别 D + const val LEVEL_WARN = 4 // 日志输出级别 W + const val LEVEL_ERROR = 5 // 日志输出级别 E + const val LEVEL_NONE = 6 // 不输出日志 - private const val DEFAULT_TAG = "demo" - fun e(msg: String) { - e(DEFAULT_TAG, msg) + fun e(msgBuilder: () -> String) { + e({ DEFAULT_TAG }, msgBuilder) + } + + fun e(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_ERROR >= LOG_LEVEL) { + Log.e(tagBuilder(), msgBuilder()) + } + } + + fun d(msgBuilder: () -> String) { + d({ DEFAULT_TAG }, msgBuilder) + } + + fun d(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_DEBUG >= LOG_LEVEL) { + Log.d(tagBuilder(), msgBuilder()) + } + } + + fun i(msgBuilder: () -> String) { + i({ DEFAULT_TAG }, msgBuilder) + } + + fun i(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_INFO >= LOG_LEVEL) { + Log.i(tagBuilder(), msgBuilder()) + } + } + + inline fun T.lv(msgBuilder: () -> String) { + lv(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder) + } + + inline fun T.lv(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_VERBOSE >= LOG_LEVEL) { + Log.v(tagBuilder(), msgBuilder()) + } + } + + inline fun T.li(msgBuilder: () -> String) { + li(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder) + } + + inline fun T.li(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_INFO >= LOG_LEVEL) { + Log.i(tagBuilder(), msgBuilder()) + } + } + + inline fun T.ld(msgBuilder: () -> String) { + ld(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder) } - fun e(tag: String, msg: String) { - if (isLog) { - Log.e(tag, msg) + inline fun T.ld(tagBuilder: () -> String, msgBuilder: () -> String) { + if (isLog && LEVEL_DEBUG >= LOG_LEVEL) { + Log.d(tagBuilder(), msgBuilder()) } } - fun d(msg: String) { - d(DEFAULT_TAG, msg) + inline fun T.lw(msgBuilder: () -> String) { + lw(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder) } - fun d(tag: String, msg: String) { - if (isLog) { - Log.d(tag, msg) + inline fun T.lw(msgBuilder: () -> String, throwable: Throwable? = null) { + lw(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder, throwable) + } + + inline fun T.lw(tagBuilder: () -> String, msgBuilder: () -> String, throwable: Throwable? = null) { + if (isLog && LEVEL_WARN >= LOG_LEVEL) { + throwable?.let { + Log.w(tagBuilder(), msgBuilder()) + } ?: Log.w(tagBuilder(), msgBuilder(), throwable) } } - fun i(msg: String) { - i(DEFAULT_TAG, msg) + inline fun T.le(msgBuilder: () -> String) { + le(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder) + } + + inline fun T.le(msgBuilder: () -> String, throwable: Throwable? = null) { + le(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder, throwable) } - fun i(tag: String, msg: String) { - if (isLog) { - Log.i(tag, msg) + inline fun T.le(tagBuilder: () -> String, msgBuilder: () -> String, throwable: Throwable? = null) { + if (isLog && LEVEL_ERROR >= LOG_LEVEL) { + throwable?.let { + Log.e(tagBuilder(), msgBuilder()) + } ?: Log.e(tagBuilder(), msgBuilder(), throwable) } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/util/LogcatHelper.java b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/util/LogcatHelper.java index 2c724b9a7..ea2a7cf8a 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/util/LogcatHelper.java +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/common/util/LogcatHelper.java @@ -3,6 +3,9 @@ import android.content.Context; import android.os.Environment; import android.util.Log; + +import com.tencent.iot.explorer.link.demo.common.log.L; + import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -30,12 +33,12 @@ public void init(Context context) { File file = new File(PATH_LOGCAT); if (!file.exists()) { if (file.mkdirs()) { - Log.e(TAG, "创建日志目录成功,目录为:" + PATH_LOGCAT); + L.INSTANCE.e(() -> "创建日志目录成功,目录为:" + PATH_LOGCAT); } else { - Log.e(TAG, "创建日志目录失败"); + L.INSTANCE.e(() -> "创建日志目录失败"); } }else { - Log.e(TAG, "日志目录已存在,目录为:" + PATH_LOGCAT); + L.INSTANCE.e(() -> "日志目录已存在,目录为:" + PATH_LOGCAT); } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddFamilyActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddFamilyActivity.kt index b8fd751c8..a10652484 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddFamilyActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddFamilyActivity.kt @@ -36,7 +36,7 @@ class AddFamilyActivity : BaseActivity() { } IoTAuth.familyImpl.createFamily(familyName, familyAddress, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddRoomActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddRoomActivity.kt index 08104ca26..e9322621b 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddRoomActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddRoomActivity.kt @@ -37,7 +37,7 @@ class AddRoomActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddTimingProjectActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddTimingProjectActivity.kt index 7cb344b60..002bc9541 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddTimingProjectActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/AddTimingProjectActivity.kt @@ -178,7 +178,7 @@ class AddTimingProjectActivity : BaseActivity() } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/BindMobilePhoneActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/BindMobilePhoneActivity.kt index 7d43697a4..01e541d7c 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/BindMobilePhoneActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/BindMobilePhoneActivity.kt @@ -35,7 +35,7 @@ class BindMobilePhoneActivity : BaseActivity() { } IoTAuth.userImpl.sendBindPhoneCode(countryCode, account, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -57,7 +57,7 @@ class BindMobilePhoneActivity : BaseActivity() { } IoTAuth.userImpl.checkBindPhoneCode(countryCode, account, code, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -73,7 +73,7 @@ class BindMobilePhoneActivity : BaseActivity() { private fun bindPhone() { IoTAuth.userImpl.bindPhone(countryCode, account, code, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ConnectDeviceActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ConnectDeviceActivity.kt index acab4ab5e..c297674be 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ConnectDeviceActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ConnectDeviceActivity.kt @@ -66,7 +66,7 @@ class ConnectDeviceActivity : BaseActivity() { override fun onResume() { super.onResume() (applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager)?.connectionInfo?.let { - L.d("当前WIFI名:${it.ssid}") + L.d { "当前WIFI名:${it.ssid}" } var ssidName = it.ssid.replace("\"", "") with(binding) { @@ -187,7 +187,7 @@ class ConnectDeviceActivity : BaseActivity() { override fun onSuccess(deviceInfo: DeviceInfo) { this@ConnectDeviceActivity.deviceInfo = deviceInfo this.onStep(SoftAPStep.STEP_DEVICE_BOUND) - L.e("开始绑定设备") + L.e { "开始绑定设备" } } override fun reconnectedSuccess(deviceInfo: DeviceInfo) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ControlPanelActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ControlPanelActivity.kt index cd7d874b7..95abc61df 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ControlPanelActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ControlPanelActivity.kt @@ -33,6 +33,7 @@ import com.tencent.iot.explorer.link.demo.core.popup.EditPopupWindow import com.tencent.iot.explorer.link.demo.core.popup.EnumPopupWindow import com.tencent.iot.explorer.link.demo.core.popup.NumberPopupWindow import com.tencent.iot.explorer.link.demo.common.customView.MyDivider +import com.tencent.iot.explorer.link.demo.common.log.L.ld import com.tencent.iot.explorer.link.demo.databinding.ActivityControlPanelBinding import com.tencent.iot.explorer.link.rtc.model.RoomKey import com.tencent.iot.explorer.link.rtc.model.TRTCUIManager @@ -185,7 +186,7 @@ class ControlPanelActivity : BaseActivity(), Contro * 控制设备 */ private fun controlDevice(id: String, value: String) { - L.d("上报数据:id=$id value=$value") + L.d { "上报数据:id=$id value=$value" } var data = "{\"$id\":\"$value\"}" if (id == TRTC_VIDEO_CALL_STATUS || id == TRTC_AUDIO_CALL_STATUS) { //如果点击选择的是trtc设备的呼叫状态 if (value == "1") { //并且状态值为1,代表应用正在call设备 @@ -198,11 +199,11 @@ class ControlPanelActivity : BaseActivity(), Contro IoTAuth.deviceImpl.controlDevice(it.ProductId, it.DeviceName, data, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { - L.e(response.msg) + L.e { response.msg } } }) } @@ -217,7 +218,7 @@ class ControlPanelActivity : BaseActivity(), Contro IoTAuth.deviceImpl.modifyDeviceAlias(it.ProductId, it.getAlias(), entity.value, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -405,7 +406,7 @@ class ControlPanelActivity : BaseActivity(), Contro * 设备监听成功回调(内部解析成功) */ override fun success(payload: Payload) { - L.e("Payoad", payload.toString()) + L.e({ "Payoad" }, { payload.toString() }) JSON.parseObject(payload.data).run { keys.forEachIndexed { _, id -> run setData@{ @@ -425,15 +426,15 @@ class ControlPanelActivity : BaseActivity(), Contro * 设备监听成功回调(内部解析失败) */ override fun unknown(json: String, errorMessage: String) { - L.e("unknown-json", json) - L.e("unknown-errorMessage", errorMessage) + L.e({ "unknown-json" }, { json }) + L.e({ "unknown-errorMessage" }, { errorMessage }) } /** * 面板数据返回成功 */ override fun success(panelList: List) { - L.d("面板数据返回成功", JsonManager.toJson(panelList)) + L.d({ "面板数据返回成功" }, { JsonManager.toJson(panelList) }) runOnUiThread { this.panelList.addAll(panelList) showTimingProject() @@ -446,14 +447,14 @@ class ControlPanelActivity : BaseActivity(), Contro * 面板数据更新时 */ override fun refresh() { - L.e("面板数据更新时 refresh()") + L.e { "面板数据更新时 refresh()" } runOnUiThread { adapter.notifyDataSetChanged() } } override fun fail(msg: String) { - L.d(TAG, msg) + ld { msg } } override fun onBackPressed() { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyActivity.kt index ed9a16890..61cddb3a5 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyActivity.kt @@ -153,7 +153,7 @@ class FamilyActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyListActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyListActivity.kt index 7c355eb7f..de191e78e 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyListActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FamilyListActivity.kt @@ -67,14 +67,14 @@ class FamilyListActivity : BaseActivity() { private fun refreshFamilyList() { IoTAuth.familyImpl.familyList(0, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { if (response.isSuccess()) { IoTAuth.familyList.clear() response.parse(FamilyListResponse::class.java)?.run { - L.e("家庭列表:${JsonManager.toJson(FamilyList)}") + L.e { "家庭列表:${JsonManager.toJson(FamilyList)}" } IoTAuth.familyList.addAll(FamilyList) App.data.getCurrentFamily() showFamilyList() diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FeedbackActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FeedbackActivity.kt index 2d6050d82..60104bb4a 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FeedbackActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/FeedbackActivity.kt @@ -74,7 +74,7 @@ class FeedbackActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/InviteMemberActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/InviteMemberActivity.kt index 82769e10f..89ea9a0fc 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/InviteMemberActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/InviteMemberActivity.kt @@ -64,7 +64,7 @@ class InviteMemberActivity : BaseActivity(), MyCall } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MemberActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MemberActivity.kt index 164e55445..d52e5bd93 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MemberActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MemberActivity.kt @@ -99,7 +99,7 @@ class MemberActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MessageActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MessageActivity.kt index 1762acf24..c3863a74d 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MessageActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/MessageActivity.kt @@ -83,7 +83,7 @@ class MessageActivity : BaseActivity(), MyCallback { private fun deleteMessage(position: Int) { IoTAuth.messageImpl.deleteMessage(messageList[position].MsgID, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -135,7 +135,7 @@ class MessageActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/PersonalInfoActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/PersonalInfoActivity.kt index 07a936815..35a62cd9e 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/PersonalInfoActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/PersonalInfoActivity.kt @@ -4,7 +4,6 @@ import android.Manifest import android.content.Intent import android.graphics.Bitmap import android.text.TextUtils -import android.util.Log import com.tencent.iot.explorer.link.demo.core.popup.EditPopupWindow import com.squareup.picasso.Picasso import com.tencent.iot.explorer.link.core.auth.IoTAuth @@ -15,6 +14,8 @@ import com.tencent.iot.explorer.link.core.auth.response.BaseResponse import com.tencent.iot.explorer.link.demo.App import com.tencent.iot.explorer.link.demo.BaseActivity import com.tencent.iot.explorer.link.demo.R +import com.tencent.iot.explorer.link.demo.common.log.L.ld +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.core.popup.CameraPopupWindow import com.tencent.iot.explorer.link.demo.core.popup.CommonPopupWindow import com.tencent.iot.explorer.link.demo.core.response.UserInfoResponse @@ -82,12 +83,12 @@ class PersonalInfoActivity : BaseActivity(), MyCall uploadImpl.uploadSingleFile(this, file.absolutePath, object : UploadCallback { override fun onSuccess(url: String, filePath: String, isOver: Boolean) { - Log.d(TAG, "上传成功:$url") + ld { "上传成功:$url" } modifyAvatar(url) } override fun onFail(filePath: String, isOver: Boolean) { - Log.d(TAG, "上传失败:$filePath") + ld { "上传失败:$filePath" } } }) } @@ -95,7 +96,7 @@ class PersonalInfoActivity : BaseActivity(), MyCall private fun modifyAvatar(url: String) { IoTAuth.userImpl.modifyPortrait(url, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - Log.d(TAG, "头像修改失败") + ld { "头像修改失败" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -108,7 +109,7 @@ class PersonalInfoActivity : BaseActivity(), MyCall private fun modifyNick(nick: String) { IoTAuth.userImpl.modifyAlias(nick, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - Log.d(TAG, "昵称修改失败") + ld { "昵称修改失败" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -181,7 +182,7 @@ class PersonalInfoActivity : BaseActivity(), MyCall } override fun fail(msg: String?, reqCode: Int) { - Log.e(TAG, msg ?: "") + le { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -196,7 +197,7 @@ class PersonalInfoActivity : BaseActivity(), MyCall RequestCode.logout -> logout() } } else { - Log.e(TAG, response.msg) + le { response.msg } } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomActivity.kt index da4f8b963..1302a6536 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomActivity.kt @@ -72,7 +72,7 @@ class RoomActivity : BaseActivity(), MyCallback { * 请求失败 */ override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } /** diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomListActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomListActivity.kt index 7e57a295f..6ad9b35e9 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomListActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/RoomListActivity.kt @@ -69,7 +69,7 @@ class RoomListActivity : BaseActivity(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ScanBindActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ScanBindActivity.kt index 6e8c7997d..eff8318f4 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ScanBindActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ScanBindActivity.kt @@ -37,7 +37,7 @@ class ScanBindActivity : BaseActivity() { App.data.getCurrentFamily().run { IoTAuth.deviceImpl.scanBindDevice(FamilyId, signature, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } show(msg ?: "绑定失败") } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SelectRoomActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SelectRoomActivity.kt index fba026989..3f140f1a6 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SelectRoomActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SelectRoomActivity.kt @@ -99,7 +99,7 @@ class SelectRoomActivity : BaseActivity(),MyCallback FamilyId, selectedRoom.RoomId, device.ProductId, device.DeviceName, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -129,7 +129,7 @@ class SelectRoomActivity : BaseActivity(),MyCallback } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SetPasswordActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SetPasswordActivity.kt index a1bdfd4bd..54a46a319 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SetPasswordActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/SetPasswordActivity.kt @@ -54,7 +54,7 @@ class SetPasswordActivity : BaseActivity() { } IoTAuth.passwordImpl.resetPassword(oldPwd, newPwd, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceActivity.kt index ed3452e34..32910ad4c 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceActivity.kt @@ -69,7 +69,7 @@ class ShareDeviceActivity : BaseActivity(), MyCallba } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceListActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceListActivity.kt index f78f1e046..8a9913acb 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceListActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareDeviceListActivity.kt @@ -63,7 +63,7 @@ class ShareDeviceListActivity : BaseActivity() { private fun getShareDeviceList() { IoTAuth.shareImpl.shareDeviceList(0, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d(msg ?: "") + L.d { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareUserListActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareUserListActivity.kt index f7d3a88f9..78fb5f6e9 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareUserListActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShareUserListActivity.kt @@ -84,7 +84,7 @@ class ShareUserListActivity : BaseActivity(), MyCa } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShowAllDeviceActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShowAllDeviceActivity.kt index 20b40e4df..fffb353e6 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShowAllDeviceActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/ShowAllDeviceActivity.kt @@ -36,7 +36,7 @@ class ShowAllDeviceActivity : BaseActivity(), MyCa } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/TimingProjectActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/TimingProjectActivity.kt index 4491f57d7..3b2aaccd2 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/TimingProjectActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/TimingProjectActivity.kt @@ -75,7 +75,7 @@ class TimingProjectActivity : BaseActivity() { device?.run { IoTAuth.timingImpl.timeList(ProductId, DeviceName, 0, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -86,7 +86,7 @@ class TimingProjectActivity : BaseActivity() { showTimingList() } } else { - L.e(response.msg) + L.e { response.msg } } } }) @@ -102,7 +102,7 @@ class TimingProjectActivity : BaseActivity() { IoTAuth.timingImpl.modifyTimerStatus(ProductId, DeviceName, TimerId, status, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -124,7 +124,7 @@ class TimingProjectActivity : BaseActivity() { IoTAuth.timingImpl.deleteTimer(ProductId, DeviceName, TimerId, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/DeviceFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/DeviceFragment.kt index 375edac82..d81a23495 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/DeviceFragment.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/DeviceFragment.kt @@ -25,6 +25,7 @@ import com.tencent.iot.explorer.link.demo.core.activity.ControlPanelActivity import com.tencent.iot.explorer.link.demo.core.adapter.OnItemListener import com.tencent.iot.explorer.link.demo.core.holder.BaseHolder import com.tencent.iot.explorer.link.demo.common.customView.MyDivider +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.core.activity.ShowAllDeviceActivity import com.tencent.iot.explorer.link.demo.databinding.FragmentDeviceBinding @@ -82,7 +83,7 @@ class DeviceFragment : BaseFragment(), MyCallback { override fun onItemClick(holder: BaseHolder<*, *>, clickView: View, position: Int) { App.data.tabRoom(position) showRoom() - Log.e("onItemClick", "切换房间更新设备列表") + le({ "onItemClick" }, { "切换房间更新设备列表" }) refreshDeviceList() showDevice() } @@ -139,7 +140,7 @@ class DeviceFragment : BaseFragment(), MyCallback { } override fun fail(message: String) { - Log.e("deviceList", message) + le({ "deviceList" }, { message }) } }) } @@ -185,13 +186,13 @@ class DeviceFragment : BaseFragment(), MyCallback { response.parse(RoomListResponse::class.java)?.run { IoTAuth.roomList.addAll(Roomlist) showRoom() - Log.e("success", "首次更新房间列表,更新设备列表") + le({ "success" }, { "首次更新房间列表,更新设备列表" }) refreshDeviceList() } } } } else { - Log.e("DeviceFragment", response.msg) + le { response.msg } } } } \ No newline at end of file diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/MeFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/MeFragment.kt index d2a2ec6f5..25bb96612 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/MeFragment.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/fragment/MeFragment.kt @@ -40,7 +40,7 @@ class MeFragment : BaseFragment(), MyCallback { } override fun fail(msg: String?, reqCode: Int) { - L.e(msg ?: "") + L.e { msg ?: "" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -49,7 +49,7 @@ class MeFragment : BaseFragment(), MyCallback { App.data.userInfo.update(it) } } else { - L.e(response.msg) + L.e { response.msg } } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/holder/EnumHolder.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/holder/EnumHolder.kt index 64a152db5..f6834b5e5 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/holder/EnumHolder.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/holder/EnumHolder.kt @@ -16,7 +16,7 @@ class EnumHolder : BaseHolder { override fun show(holder: BaseHolder<*, *>, position: Int) { data.run { - L.e("key=$key,value=$value") + L.e { "key=$key,value=$value" } binding.tvEnumTitle.text = key binding.ivEnumStatus.setImageResource( if (window.selectValue == value) { diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/upload/UploadService.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/upload/UploadService.kt index 2987ef806..d0a56682b 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/upload/UploadService.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/upload/UploadService.kt @@ -78,7 +78,7 @@ internal class UploadService : BaseService(), UploadImpl { param["path"] = "iotexplorer-app-logs/user_{uin}/" tokenAppCosAuth(param, object : MyCallback { override fun fail(msg: String?, reqCode: Int) { - L.d("获取签名失败:${msg ?: ""}") + L.d { "获取签名失败:${msg ?: ""}" } } override fun success(response: BaseResponse, reqCode: Int) { @@ -94,7 +94,7 @@ internal class UploadService : BaseService(), UploadImpl { } } } - L.d("获取签名返回:${JsonManager.toJson(response)}") + L.d { "获取签名返回:${JsonManager.toJson(response)}" } } }, app_cos_auth) //上传图片 } @@ -120,10 +120,10 @@ internal class UploadService : BaseService(), UploadImpl { //上传对象 transferManager.upload(bucket, cosPath, srcPath, uploadId).let { entity.task = it - L.d("开始上传:$srcPath") + L.d { "开始上传:$srcPath" } it.setCosXmlResultListener(object : CosXmlResultListener { override fun onSuccess(request: CosXmlRequest, result: CosXmlResult) { - L.d("上传成功") + L.d { "上传成功" } entity.url = result.accessUrl onSuccess(entity, callback) } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt index 59c9aca9b..483d3e24d 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt @@ -2,7 +2,6 @@ package com.tencent.iot.explorer.link.demo.video.playback.cloudPlayback import android.graphics.SurfaceTexture import android.text.TextUtils -import android.util.Log import android.view.LayoutInflater import android.view.Surface import android.view.TextureView @@ -19,6 +18,8 @@ import com.tencent.iot.explorer.link.demo.R import com.tencent.iot.explorer.link.demo.common.customView.CalendarView import com.tencent.iot.explorer.link.demo.common.customView.timeline.TimeLineView import com.tencent.iot.explorer.link.demo.common.customView.timeline.TimeLineViewChangeListener +import com.tencent.iot.explorer.link.demo.common.log.L +import com.tencent.iot.explorer.link.demo.common.log.L.ld import com.tencent.iot.explorer.link.demo.common.util.CommonUtils import com.tencent.iot.explorer.link.demo.core.entity.BaseResponse import com.tencent.iot.explorer.link.demo.core.entity.VideoHistory @@ -314,7 +315,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragmenturl", response) + L.d({ "响应mjpeg===>url" }, { response.toString() }) json?.let { it.getJSONObject("Response")?.let { @@ -332,7 +333,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragmentvUrl=${vUrl} \nand aURL===>${aUrl} \nand duration===>${cloudVideoDuration}") + ld { "响应mjpeg===>vUrl=${vUrl} \nand aURL===>${aUrl} \nand duration===>${cloudVideoDuration}" } player.reset() player.setSurface(this.surface) player.dataSource = vUrl diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt index f849cd094..797fd718b 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt @@ -3,7 +3,6 @@ package com.tencent.iot.explorer.link.demo.video.playback.localPlayback import android.graphics.SurfaceTexture import android.os.Environment import android.text.TextUtils -import android.util.Log import android.view.* import android.widget.SeekBar import android.widget.Toast @@ -12,13 +11,14 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.alibaba.fastjson.JSON import com.alibaba.fastjson.JSONArray import com.alibaba.fastjson.JSONObject -import com.tencent.iot.explorer.link.core.log.L import com.tencent.iot.explorer.link.demo.App import com.tencent.iot.explorer.link.demo.BuildConfig import com.tencent.iot.explorer.link.demo.R import com.tencent.iot.explorer.link.demo.common.customView.CalendarView import com.tencent.iot.explorer.link.demo.common.customView.timeline.TimeLineView import com.tencent.iot.explorer.link.demo.common.customView.timeline.TimeLineViewChangeListener +import com.tencent.iot.explorer.link.demo.common.log.L.ld +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.common.util.CommonUtils import com.tencent.iot.explorer.link.demo.common.util.ImageSelect import com.tencent.iot.explorer.link.demo.databinding.FragmentVideoLocalPlaybackBinding @@ -104,7 +104,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment launch(Dispatchers.Main) { @@ -191,7 +192,7 @@ class VideoPreviewActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureSizeChanged: player video size param must > 0.") + le { "onSurfaceTextureSizeChanged: player video size param must > 0." } return } - Log.d(tag, "onSurfaceTextureSizeChanged") + ld { "onSurfaceTextureSizeChanged" } val layoutParams = binding.vPreview.layoutParams if (orientationV) { layoutParams.width = (player.videoWidth * (screenWidth * 16 / 9)) / player.videoHeight @@ -543,13 +544,13 @@ class VideoPreviewActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureUpdated: player video size param must > 0.") + le { "onSurfaceTextureUpdated: player video size param must > 0." } return } @@ -578,9 +579,9 @@ class VideoPreviewActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureSizeChanged: player video size param must > 0.") + le { "onSurfaceTextureSizeChanged: player video size param must > 0." } return } @@ -572,7 +572,7 @@ class VideoPreviewMJPEGActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureUpdated: player video size param must > 0.") + le { "onSurfaceTextureUpdated: player video size param must > 0." } return } @@ -604,9 +604,9 @@ class VideoPreviewMJPEGActivity : VideoPreviewBaseActivity launch(Dispatchers.Main) { @@ -316,9 +317,9 @@ class VideoPushStreamActivity : VideoPreviewBaseActivity(), XP2PCal } private fun checkDeviceState() { - Log.d(tag, "====检测设备状态===") + ld { "====检测设备状态===" } launch(Dispatchers.IO) { getDeviceStatus("${productId}/${deviceName}") { isOnline, msg -> launch(Dispatchers.Main) { @@ -467,7 +468,7 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCal player.setMaxPacketNum(2) while (!::surface.isInitialized) { delay(50) - L.e("delay for waiting surface.") + le { "delay for waiting surface." } } player.setSurface(surface) player.dataSource = url @@ -479,13 +480,13 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCal override fun fail(msg: String?, errorCode: Int) {} override fun commandRequest(id: String?, msg: String?) { - Log.e(tag, "xp2pEventNotify id:$id msg:$msg") + le { "xp2pEventNotify id:$id msg:$msg" } } override fun xp2pEventNotify(id: String?, msg: String?, event: Int) { - Log.e(tag, "xp2pEventNotify id:$id msg:$msg event:$event") + le { "xp2pEventNotify id:$id msg:$msg event:$event" } if (event == 1003) { - Log.e(tag, "====event === 1003") + le { "====event === 1003" } startShowVideoTime = 0L launch(Dispatchers.Main) { val content = getString(R.string.disconnected_and_reconnecting, id) @@ -502,25 +503,25 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCal } else if (event == 1004 || event == 1005) { connectTime = System.currentTimeMillis() - connectStartTime if (event == 1004) { - Log.e(tag, "====event === 1004") + le { "====event === 1004" } checkDeviceState() // delegateHttpFlv() } } else if (event == 1010) { - Log.e(tag, "====event === 1010, 校验失败,info撞库防止串流: $msg") + le { "====event === 1010, 校验失败,info撞库防止串流: $msg" } } } override fun avDataRecvHandle(id: String?, data: ByteArray?, len: Int) { - Log.e(tag, "avDataRecvHandle id:$id data:$data len:$data") + le { "avDataRecvHandle id:$id data:$data len:$data" } } override fun avDataCloseHandle(id: String?, msg: String?, errorCode: Int) { - Log.e(tag, "avDataCloseHandle id:$id msg:$msg errorCode:$errorCode") + le { "avDataCloseHandle id:$id msg:$msg errorCode:$errorCode" } } override fun onDeviceMsgArrived(id: String?, data: ByteArray?, len: Int): String { - Log.e(tag, "onDeviceMsgArrived id:$id data:$data len:$len") + le { "onDeviceMsgArrived id:$id data:$data len:$len" } val reply = JSONObject() reply.put("code", "0") reply.put("msg", "test command reply") @@ -535,7 +536,7 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCal } override fun onSurfaceTextureSizeChanged(surface: SurfaceTexture?, width: Int, height: Int) { - Log.d(tag, "onSurfaceTextureSizeChanged") + ld { "onSurfaceTextureSizeChanged" } val layoutParams = binding.vPreview.layoutParams if (orientationV) { layoutParams.width = (player.videoWidth * (screenWidth * 16 / 9)) / player.videoHeight @@ -547,7 +548,7 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCal } override fun onSurfaceTextureDestroyed(surface: SurfaceTexture?): Boolean { - Log.d(tag, "onSurfaceTextureDestroyed") + ld { "onSurfaceTextureDestroyed" } return false } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt index 0ff7bc43d..b8f6e2219 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt @@ -14,7 +14,6 @@ import android.os.Handler import android.os.Message import android.text.TextUtils import android.util.DisplayMetrics -import android.util.Log import android.view.* import android.widget.Toast import androidx.annotation.RequiresApi @@ -24,6 +23,8 @@ import com.tencent.iot.explorer.link.demo.App import com.tencent.iot.explorer.link.demo.BuildConfig import com.tencent.iot.explorer.link.demo.R import com.tencent.iot.explorer.link.demo.common.log.L +import com.tencent.iot.explorer.link.demo.common.log.L.ld +import com.tencent.iot.explorer.link.demo.common.log.L.le import com.tencent.iot.explorer.link.demo.common.util.CommonUtils import com.tencent.iot.explorer.link.demo.databinding.ActivityVideoWithoutPropertyBinding import com.tencent.iot.explorer.link.demo.video.Command @@ -156,7 +157,7 @@ open class VideoWithoutPropertyActivity : VideoPreviewBaseActivity launch(Dispatchers.Main) { @@ -185,7 +186,7 @@ open class VideoWithoutPropertyActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureSizeChanged: player video size param must > 0.") + le { "onSurfaceTextureSizeChanged: player video size param must > 0." } return } - Log.e( - tag, - "width=${width}, height=${height}, player.videoWidth=${player.videoWidth}, player.videoHeight=${player.videoHeight}" - ) + le { "width=${width}, height=${height}, player.videoWidth=${player.videoWidth}, player.videoHeight=${player.videoHeight}" } val layoutParams = binding.vPreview.layoutParams if (orientationV) { layoutParams.width = (player.videoWidth * (screenWidth * 16 / 9)) / player.videoHeight @@ -370,7 +368,7 @@ open class VideoWithoutPropertyActivity : VideoPreviewBaseActivity 0 && player.videoHeight > 0)) { - Log.e(TAG, "onSurfaceTextureUpdated: player video size param must > 0.") + le { "onSurfaceTextureUpdated: player video size param must > 0." } return } @@ -403,9 +401,9 @@ open class VideoWithoutPropertyActivity : VideoPreviewBaseActivity( private fun startPlayer() { player = IjkMediaPlayer() - Log.e( - tag, - "start startPlayer productid ${App.data.accessInfo?.productId} devname ${deviceName}" - ) + le { "start startPlayer productid ${App.data.accessInfo?.productId} devname ${deviceName}" } if (App.data.accessInfo == null || TextUtils.isEmpty(deviceName)) return mHandler.sendEmptyMessageDelayed(MSG_UPDATE_HUD, 500) Thread(Runnable { val id = "${productId}/${deviceName}" val started = XP2P.startLanService(id, productId, deviceName, address, port.toString()) - Log.e(tag, "===================== after startLanService =====================") + le { "===================== after startLanService =====================" } if (started != 0) { launch(Dispatchers.Main) { var errInfo = "" @@ -143,13 +141,13 @@ class WlanVideoPreviewActivity : VideoBaseActivity( val port = XP2P.getLanProxyPort(id) val command = XP2P.getLanUrl(id) + "voice?_protocol=tcp&_port=$port&channel=${channel}" - Log.e(tag, "start radio url $command") - Log.e(tag, "speakAble id $id") + le { "start radio url $command" } + le { "speakAble id $id" } XP2P.runSendService(id, command, true) audioRecordUtil.start() return true } else { - Log.e(tag, "stop radio") + le { "stop radio" } audioRecordUtil.stop() XP2P.stopSendService(id, null) return true @@ -205,7 +203,7 @@ class WlanVideoPreviewActivity : VideoBaseActivity( binding.ivRight-> command += Command.getPtzRightCommand(channel) binding.ivLeft-> command += Command.getPtzLeftCommand(channel) } - Log.e(tag, "command $command") + le { "command $command" } Thread(Runnable { App.data.accessInfo?.let { @@ -214,7 +212,7 @@ class WlanVideoPreviewActivity : VideoBaseActivity( "${productId}/${deviceName}", command.toByteArray(), command.toByteArray().size.toLong(), 2 * 1000 * 1000 ) ?: "" - Log.d(tag, "command result -> $retContent") + ld { "command result -> $retContent" } launch(Dispatchers.Main) { if (TextUtils.isEmpty(retContent)) { retContent = getString(R.string.command_with_error, command) @@ -288,7 +286,7 @@ class WlanVideoPreviewActivity : VideoBaseActivity( ) it.setSurface(this.surface) - Log.e(tag, "switch url $url") + le { "switch url $url" } it.dataSource = url it.prepareAsync() @@ -316,7 +314,7 @@ class WlanVideoPreviewActivity : VideoBaseActivity( override fun avDataRecvHandle(id: String?, data: ByteArray?, len: Int) {} override fun avDataCloseHandle(id: String?, msg: String?, errorCode: Int) {} override fun onDeviceMsgArrived(id: String?, data: ByteArray?, len: Int): String { - Log.d(tag, "==onDeviceMsgArrived: ${data?.let { String(it, StandardCharsets.UTF_8) }}") + ld { "==onDeviceMsgArrived: ${data?.let { String(it, StandardCharsets.UTF_8) }}" } return "app reply to device" } @@ -326,7 +324,7 @@ class WlanVideoPreviewActivity : VideoBaseActivity( var url = XP2P.getLanUrl(id) val port = XP2P.getLanProxyPort(id) url += "ipc.flv?action=live&_protocol=tcp&quality=high&_crypto=off&_port=$port&channel=${channel}" - Log.e(tag, "proxy ===================== $url") + le { "proxy ===================== $url" } it.reset() it.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzemaxduration", 100) it.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "probesize", 25 * 1024) diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/utils/MultipleChannelChooseDialog.java b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/utils/MultipleChannelChooseDialog.java index 3352d52c6..034c39984 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/utils/MultipleChannelChooseDialog.java +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/utils/MultipleChannelChooseDialog.java @@ -1,13 +1,12 @@ package com.tencent.iot.explorer.link.demo.video.utils; import android.content.Context; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; -import android.widget.CheckBox; import android.widget.Toast; import com.tencent.iot.explorer.link.demo.R; +import com.tencent.iot.explorer.link.demo.common.log.L; import com.tencent.iot.explorer.link.demo.databinding.PopupMultipleChannelLayoutBinding; import java.util.ArrayList; @@ -29,8 +28,10 @@ public void onClick(View view) { if (view.getId() == R.id.tv_multiple_cancel) { dismiss(); } else if (view.getId() == R.id.tv_multiple_confirm) { - Log.d("MultipleChannelChoose", "checkbox selected: channel0: " + binding.cbChannel1.isChecked() - + ", channel1: " + binding.cbChannel2.isChecked() + ", channel2: " + binding.cbChannel3.isChecked() + ", channel3: " + binding.cbChannel4.isChecked()); + L.INSTANCE.d(() -> "MultipleChannelChoose", + () -> "checkbox selected: channel0: " + binding.cbChannel1.isChecked() + ", channel1: " + binding.cbChannel2.isChecked() + + ", channel2: " + binding.cbChannel3.isChecked() + ", channel3: " + binding.cbChannel4.isChecked()); + ArrayList selectChannels = new ArrayList<>(); if (binding.cbChannel1.isChecked()) selectChannels.add(1); if (binding.cbChannel2.isChecked()) selectChannels.add(2);