UI 代码格式修改

neilyhe · neilyhe · commit fc02beb689b9 · 2025-02-21T17:31:18.000+08:00
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoDeviceFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoDeviceFragment.kt
@@ -17,22 +17,33 @@ import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.core.fragment.BaseFragment
 import com.tencent.iot.explorer.link.demo.video.nvr.VideoNvrActivity
 import com.tencent.iot.explorer.link.demo.video.playback.VideoPlaybackActivity
-import com.tencent.iot.explorer.link.demo.video.preview.*
+import com.tencent.iot.explorer.link.demo.video.preview.DevUrl2Preview
+import com.tencent.iot.explorer.link.demo.video.preview.VideoPreviewActivity
+import com.tencent.iot.explorer.link.demo.video.preview.VideoPreviewMJPEGActivity
+import com.tencent.iot.explorer.link.demo.video.preview.VideoPushStreamActivity
 import com.tencent.iot.explorer.link.demo.video.utils.ListOptionsDialog
-import com.tencent.iot.explorer.link.demo.video.utils.MultipleChannelChooseDialog
 import com.tencent.iot.explorer.link.demo.video.utils.ToastDialog
 import com.tencent.iot.video.link.callback.VideoCallback
 import com.tencent.iot.video.link.consts.VideoConst
 import com.tencent.iot.video.link.consts.VideoRequestCode
 import com.tencent.iot.video.link.service.VideoBaseService
-import kotlinx.android.synthetic.main.fragment_video_device.*
-import kotlinx.coroutines.*
+import kotlinx.android.synthetic.main.fragment_video_device.gv_devs
+import kotlinx.android.synthetic.main.fragment_video_device.radio_complete
+import kotlinx.android.synthetic.main.fragment_video_device.radio_edit
+import kotlinx.android.synthetic.main.fragment_video_device.rg_edit_dev
+import kotlinx.android.synthetic.main.fragment_video_device.smart_refresh_layout
+import kotlinx.android.synthetic.main.fragment_video_device.tv_tip_txt
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 
 class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemClicked,
     CoroutineScope by MainScope() {
-    private var devs : MutableList<DevInfo> = ArrayList()
-    private var adapter : DevsAdapter? = null
-    private var videoProductInfo : VideoProductInfo? = null
+    private var devs: MutableList<DevInfo> = ArrayList()
+    private var adapter: DevsAdapter? = null
+    private var videoProductInfo: VideoProductInfo? = null
 
     override fun getContentView(): Int {
         return R.layout.fragment_video_device
@@ -41,7 +52,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
     override fun startHere(view: View) {
         setListener()
 
-        var devGridLayoutManager = GridLayoutManager(context, 2)
+        val devGridLayoutManager = GridLayoutManager(context, 2)
         context?.let {
             adapter = DevsAdapter(it, devs)
             adapter?.let {
@@ -50,8 +61,8 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
             }
             adapter?.radioComplete = radio_complete
             adapter?.radioEdit = radio_edit
-            gv_devs.setLayoutManager(devGridLayoutManager)
-            gv_devs.setAdapter(adapter)
+            gv_devs.layoutManager = devGridLayoutManager
+            gv_devs.adapter = adapter
             loadAllVideoInfo()
         }
         adapter?.switchBtnStatus(false)
@@ -64,12 +75,8 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
 
     private fun setListener() {
         radio_edit.setOnClickListener {
-            var options = arrayListOf(getString(R.string.edit_devs_2_show))
-            var dlg =
-                ListOptionsDialog(
-                    context,
-                    options
-                )
+            val options = arrayListOf(getString(R.string.edit_devs_2_show))
+            val dlg = ListOptionsDialog(context, options)
             dlg.show()
             dlg.setOnDismisListener {
                 adapter?.switchBtnStatus(true)
@@ -101,10 +108,10 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
         }
 
         adapter?.let {
-            var allUrl = ArrayList<DevUrl2Preview>()
+            val allUrl = ArrayList<DevUrl2Preview>()
             for (i in 0 until it.list.size) {
                 if (it.checkedIds.contains(i)) {
-                    var dev = DevUrl2Preview()
+                    val dev = DevUrl2Preview()
                     dev.devName = it.list.get(i).DeviceName
                     dev.Status = it.list.get(i).Status
                     allUrl.add(dev)
@@ -117,28 +124,45 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
 
     override fun onItemClicked(pos: Int, dev: DevInfo) {
         if (videoProductInfo?.DeviceType == VideoProductInfo.DEV_TYPE_NVR) {
-            var intent = Intent(context, VideoNvrActivity::class.java)
-            var bundle = Bundle()
+            val intent = Intent(context, VideoNvrActivity::class.java)
+            val bundle = Bundle()
             bundle.putString(VideoConst.VIDEO_NVR_INFO, JSON.toJSONString(dev))
             intent.putExtra(VideoConst.VIDEO_NVR_INFO, bundle)
             startActivity(intent)
             return
         }
 
-        var options = arrayListOf(getString(R.string.preview), getString(R.string.playback), getString(R.string.preview_mjpeg), getString(R.string.video_without_property), getString(R.string.video_push_stream), getString(R.string.multiple_channel_choose))
-        var dlg =
+        val options = arrayListOf(
+            getString(R.string.preview),
+            getString(R.string.playback),
+            getString(R.string.preview_mjpeg),
+            getString(R.string.video_without_property),
+            getString(R.string.video_push_stream),
+            getString(R.string.multiple_channel_choose)
+        )
+        val dlg =
             ListOptionsDialog(
                 context,
                 options
             )
         dlg.show()
         dlg.setOnDismisListener { it ->
-            when(it) {
-                0 -> { VideoPreviewActivity.startPreviewActivity(context, dev) }
-                1 -> { VideoPlaybackActivity.startPlaybackActivity(context, dev) }
-                2 -> { VideoPreviewMJPEGActivity.startPreviewActivity(context, dev) }
+            when (it) {
+                0 -> {
+                    VideoPreviewActivity.startPreviewActivity(context, dev)
+                }
+
+                1 -> {
+                    VideoPlaybackActivity.startPlaybackActivity(context, dev)
+                }
+
+                2 -> {
+                    VideoPreviewMJPEGActivity.startPreviewActivity(context, dev)
+                }
 //                3 -> { VideoWithoutPropertyActivity.startPreviewActivity(context, dev) }
-                4 -> { VideoPushStreamActivity.startPreviewActivity(context, dev) }
+                4 -> {
+                    VideoPushStreamActivity.startPreviewActivity(context, dev)
+                }
 //                5 -> {
 //                    val multipleChannelChooseDialog = MultipleChannelChooseDialog(context)
 //                    multipleChannelChooseDialog.show()
@@ -158,6 +182,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
             }
         }
     }
+
     override fun onItemMoreClicked(pos: Int, dev: DevInfo) {}
     override fun onItemCheckedClicked(pos: Int, checked: Boolean) {}
     override fun onItemCheckedLimited() {
@@ -176,7 +201,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
     }
 
     override fun fail(msg: String?, reqCode: Int) {
-        launch (Dispatchers.Main) {
+        launch(Dispatchers.Main) {
             adapter?.notifyDataSetChanged()
             smart_refresh_layout?.finishRefresh()
             Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
@@ -192,12 +217,12 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
                 if (jsonResponset.containsKey("Devices")) {
                     val dataArray: JSONArray = jsonResponset.getJSONArray("Devices")
                     for (i in 0 until dataArray.size) {
-                        var dev = JSON.parseObject(dataArray.getString(i), DevInfo::class.java)
+                        val dev = JSON.parseObject(dataArray.getString(i), DevInfo::class.java)
                         devs.add(dev)
                     }
                 }
 
-                launch (Dispatchers.Main) {
+                launch(Dispatchers.Main) {
                     adapter?.videoProductInfo = videoProductInfo
                     adapter?.notifyDataSetChanged()
                     if (adapter?.videoProductInfo?.DeviceType == VideoProductInfo.DEV_TYPE_IPC) {
@@ -222,7 +247,12 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
         videoProductInfo?.let {
             App.data.accessInfo?.let {
                 devs.clear()
-                VideoBaseService(it.accessId, it.accessToken).describeDevices(it.productId, 99, 0, this)
+                VideoBaseService(it.accessId, it.accessToken).describeDevices(
+                    it.productId,
+                    99,
+                    0,
+                    this
+                )
             }
         }
     }
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoInputAuthorizeActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoInputAuthorizeActivity.kt
@@ -18,7 +18,7 @@ import kotlinx.android.synthetic.main.blue_title_layout.*
 import kotlinx.android.synthetic.main.input_item_layout.view.*
 import kotlinx.coroutines.*
 
-class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by MainScope() {
+class VideoInputAuthorizeActivity : VideoBaseActivity(), CoroutineScope by MainScope() {
 
     override fun getContentView(): Int {
         return R.layout.activity_video_input_authorize
@@ -37,20 +37,24 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
         access_token_layout.iv_more.visibility = View.GONE
         product_id_layout.iv_more.visibility = View.GONE
 
-        launch (Dispatchers.Main) {
-            var jsonArrStr = SharePreferenceUtil.getString(this@VideoInputAuthorizeActivity, VideoConst.VIDEO_CONFIG, VideoConst.VIDEO_ACCESS_INFOS)
+        launch(Dispatchers.Main) {
+            val jsonArrStr = SharePreferenceUtil.getString(
+                this@VideoInputAuthorizeActivity,
+                VideoConst.VIDEO_CONFIG,
+                VideoConst.VIDEO_ACCESS_INFOS
+            )
             jsonArrStr?.let {
-                var accessInfos = JSONArray.parseArray(jsonArrStr, AccessInfo::class.java)
+                val accessInfos = JSONArray.parseArray(jsonArrStr, AccessInfo::class.java)
                 accessInfos?.let {
                     if (accessInfos.size > 0) {
-                        var accessInfo = accessInfos.get(accessInfos.size - 1)
+                        val accessInfo = accessInfos.get(accessInfos.size - 1)
                         access_id_layout.ev_content.setText(accessInfo.accessId)
                         access_token_layout.ev_content.setText(accessInfo.accessToken)
                         product_id_layout.ev_content.setText(accessInfo.productId)
                         access_id_layout.ev_content.setSelection(accessInfo.accessId.length)
                     }
 
-                }?:let{
+                } ?: let {
                     access_id_layout.ev_content.setText(BuildConfig.TencentIotLinkVideoSDKDemoSecretId)
                     access_token_layout.ev_content.setText(BuildConfig.TencentIotLinkVideoSDKDemoSecretKey)
                     product_id_layout.ev_content.setText(BuildConfig.TencentIotLinkVideoSDKDemoProductId)
@@ -64,10 +68,7 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
         iv_back.setOnClickListener { finish() }
         btn_login.setOnClickListener(loginClickedListener)
         access_id_layout.setOnClickListener {
-            var dlg =
-                HistoryAccessInfoDialog(
-                    this@VideoInputAuthorizeActivity
-                )
+            val dlg = HistoryAccessInfoDialog(this@VideoInputAuthorizeActivity)
             dlg.show()
             dlg.setOnDismissListener(onDlgDismissListener)
         }
@@ -78,7 +79,7 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
         cancel()
     }
 
-    var loginClickedListener = object : View.OnClickListener {
+    private var loginClickedListener = object : View.OnClickListener {
         override fun onClick(v: View?) {
             if (!btn_use_sdk.isChecked) {
                 Toast.makeText(
@@ -113,17 +114,17 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
                 return
             }
 
-            var accessInfo = AccessInfo()
+            val accessInfo = AccessInfo()
             accessInfo.accessId = access_id_layout.ev_content.text.toString()
             accessInfo.accessToken = access_token_layout.ev_content.text.toString()
             accessInfo.productId = product_id_layout.ev_content.text.toString()
 
-            launch (Dispatchers.Main) {
+            launch(Dispatchers.Main) {
                 checkAccessInfo(accessInfo)
             }
 
-            var intent = Intent(this@VideoInputAuthorizeActivity, VideoMainActivity::class.java)
-            var bundle = Bundle()
+            val intent = Intent(this@VideoInputAuthorizeActivity, VideoMainActivity::class.java)
+            val bundle = Bundle()
             bundle.putString(VideoConst.VIDEO_CONFIG, JSONObject.toJSONString(accessInfo))
             intent.putExtra(VideoConst.VIDEO_CONFIG, bundle)
             startActivity(intent)
@@ -132,14 +133,16 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
 
     private fun checkAccessInfo(accessInfo: AccessInfo) {
 
-        var jsonArrStr = SharePreferenceUtil.getString(this@VideoInputAuthorizeActivity, VideoConst.VIDEO_CONFIG, VideoConst.VIDEO_ACCESS_INFOS)
+        val jsonArrStr = SharePreferenceUtil.getString(
+            this@VideoInputAuthorizeActivity,
+            VideoConst.VIDEO_CONFIG,
+            VideoConst.VIDEO_ACCESS_INFOS
+        )
         var accessInfos: MutableList<AccessInfo> = ArrayList()
         jsonArrStr?.let {
             try {
                 accessInfos = JSONArray.parseArray(it, AccessInfo::class.java)
-                accessInfos?.let {
-                    if(it.contains(accessInfo)) it.remove(accessInfo)
-                }
+                accessInfos.let { info -> if (info.contains(accessInfo)) info.remove(accessInfo) }
             } catch (e: Exception) {
                 e.printStackTrace()
                 accessInfos = ArrayList()
@@ -148,10 +151,15 @@ class VideoInputAuthorizeActivity : VideoBaseActivity() , CoroutineScope by Main
 
         // 保证最后一条是最新使用过的数据
         accessInfos.add(accessInfo)
-        SharePreferenceUtil.saveString(this@VideoInputAuthorizeActivity, VideoConst.VIDEO_CONFIG, VideoConst.VIDEO_ACCESS_INFOS, JSONArray.toJSONString(accessInfos))
+        SharePreferenceUtil.saveString(
+            this@VideoInputAuthorizeActivity,
+            VideoConst.VIDEO_CONFIG,
+            VideoConst.VIDEO_ACCESS_INFOS,
+            JSONArray.toJSONString(accessInfos)
+        )
     }
 
-    var onDlgDismissListener = object : HistoryAccessInfoDialog.OnDismisListener {
+    private var onDlgDismissListener = object : HistoryAccessInfoDialog.OnDismisListener {
         override fun onOkClicked(accessInfo: AccessInfo?) {
             accessInfo?.let {
                 access_id_layout.ev_content.setText(accessInfo.accessId)
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoMainActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoMainActivity.kt
@@ -6,11 +6,10 @@ import com.alibaba.fastjson.JSONObject
 import com.google.android.material.tabs.TabLayout
 import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.R
-import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.demo.VideoBaseActivity
 import com.tencent.iot.video.link.consts.VideoConst
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.title_layout.*
+import kotlinx.android.synthetic.main.activity_main.tb_bottom
+import kotlinx.android.synthetic.main.title_layout.tv_title
 
 class VideoMainActivity : VideoBaseActivity() {
     private val fragments = arrayListOf<Fragment>()
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt
@@ -56,6 +56,7 @@ import kotlinx.android.synthetic.main.dash_board_layout.tv_tcp_speed
 import kotlinx.android.synthetic.main.dash_board_layout.tv_v_cache
 import kotlinx.android.synthetic.main.dash_board_layout.tv_video_w_h
 import kotlinx.android.synthetic.main.title_layout.iv_back
+import kotlinx.android.synthetic.main.title_layout.tv_title
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
@@ -114,6 +115,7 @@ class VideoTestActivity : VideoBaseActivity(), XP2PCallback, CoroutineScope by M
         deviceName = intent.getStringExtra("deviceName")?.toString() ?: ""
         xp2pInfo = intent.getStringExtra("p2pInfo")?.toString() ?: ""
         xP2PAppConfig.autoConfigFromDevice = intent.getBooleanExtra("isStartCross", false)
+        tv_title.text = deviceName
         val protocol = intent.getStringExtra("protocol")?.toString() ?: "auto"
         if (protocol == "udp") {
             xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_UDP
