Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -78,10 +78,10 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
protected fun checkPermissions(permissions: Array<String>): 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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <reified T> T.lv(msgBuilder: () -> String) {
lv(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder)
}

inline fun <reified T> T.lv(tagBuilder: () -> String, msgBuilder: () -> String) {
if (isLog && LEVEL_VERBOSE >= LOG_LEVEL) {
Log.v(tagBuilder(), msgBuilder())
}
}

inline fun <reified T> T.li(msgBuilder: () -> String) {
li(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder)
}

inline fun <reified T> T.li(tagBuilder: () -> String, msgBuilder: () -> String) {
if (isLog && LEVEL_INFO >= LOG_LEVEL) {
Log.i(tagBuilder(), msgBuilder())
}
}

inline fun <reified T> 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 <reified T> 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 <reified T> 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 <reified T> T.lw(msgBuilder: () -> String, throwable: Throwable? = null) {
lw(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder, throwable)
}

inline fun <reified T> 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 <reified T> T.le(msgBuilder: () -> String) {
le(tagBuilder = { T::class.simpleName ?: DEFAULT_TAG }, msgBuilder = msgBuilder)
}

inline fun <reified T> 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 <reified T> 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)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class AddFamilyActivity : BaseActivity<ActivityAddFamilyBinding>() {
}
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AddRoomActivity : BaseActivity<ActivityAddRoomBinding>(), MyCallback {
}

override fun fail(msg: String?, reqCode: Int) {
L.e(msg ?: "")
L.e { msg ?: "" }
}

override fun success(response: BaseResponse, reqCode: Int) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class AddTimingProjectActivity : BaseActivity<ActivityAddTimingProjectBinding>()
}

override fun fail(msg: String?, reqCode: Int) {
L.e(msg ?: "")
L.e { msg ?: "" }
}

override fun success(response: BaseResponse, reqCode: Int) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class BindMobilePhoneActivity : BaseActivity<ActivityBindMobilePhoneBinding>() {
}
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) {
Expand All @@ -57,7 +57,7 @@ class BindMobilePhoneActivity : BaseActivity<ActivityBindMobilePhoneBinding>() {
}
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) {
Expand All @@ -73,7 +73,7 @@ class BindMobilePhoneActivity : BaseActivity<ActivityBindMobilePhoneBinding>() {
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class ConnectDeviceActivity : BaseActivity<ActivityConnectDeviceBinding>() {
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) {
Expand Down Expand Up @@ -187,7 +187,7 @@ class ConnectDeviceActivity : BaseActivity<ActivityConnectDeviceBinding>() {
override fun onSuccess(deviceInfo: DeviceInfo) {
[email protected] = deviceInfo
this.onStep(SoftAPStep.STEP_DEVICE_BOUND)
L.e("开始绑定设备")
L.e { "开始绑定设备" }
}

override fun reconnectedSuccess(deviceInfo: DeviceInfo) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -185,7 +186,7 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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设备
Expand All @@ -198,11 +199,11 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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 }
}
})
}
Expand All @@ -217,7 +218,7 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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) {
Expand Down Expand Up @@ -405,7 +406,7 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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@{
Expand All @@ -425,15 +426,15 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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<ControlPanel>) {
L.d("面板数据返回成功", JsonManager.toJson(panelList))
L.d({ "面板数据返回成功" }, { JsonManager.toJson(panelList) })
runOnUiThread {
this.panelList.addAll(panelList)
showTimingProject()
Expand All @@ -446,14 +447,14 @@ class ControlPanelActivity : BaseActivity<ActivityControlPanelBinding>(), 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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class FamilyActivity : BaseActivity<ActivityFamilyBinding>(), MyCallback {
}

override fun fail(msg: String?, reqCode: Int) {
L.d(msg ?: "")
L.d { msg ?: "" }
}

override fun success(response: BaseResponse, reqCode: Int) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ class FamilyListActivity : BaseActivity<ActivityFamilyListBinding>() {
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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>(), MyCallback {
}

override fun fail(msg: String?, reqCode: Int) {
L.e(msg ?: "")
L.e { msg ?: "" }
}

override fun success(response: BaseResponse, reqCode: Int) {
Expand Down
Loading