From 49c135d23c6038a8c456cf1fcf450e5fb649047a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:06 +0800
Subject: [PATCH] 合并代码
---
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
index ecdcd9a..57a8016 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
@@ -624,7 +624,8 @@
deviceListBean = (DeviceDetailListData.ResponseData.DeviceListBean) bundle.getSerializable(MethodConst.ParamConst.deviceDetail);
switchVideoList(true);
getDeviceLocalCache();
- tvDeviceName.setText(deviceListBean.channels.get(deviceListBean.checkedChannel).channelName);
+// tvDeviceName.setText(deviceListBean.channels.get(deviceListBean.checkedChannel).channelName);
+ tvDeviceName.setText(bundle.getString("titleString"));
if(deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions!=null&&deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions.size()>0){
showHD = false;
@@ -1497,11 +1498,11 @@
finish();
}
}
- if (resultCode == 100 && data != null) {
- String name = data.getStringExtra(DeviceConstant.IntentKey.DHDEVICE_NEW_NAME);
- tvDeviceName.setText(name);
- deviceListBean.channels.get(deviceListBean.checkedChannel).channelName = name;
- }
+// if (resultCode == 100 && data != null) {
+// String name = data.getStringExtra(DeviceConstant.IntentKey.DHDEVICE_NEW_NAME);
+// tvDeviceName.setText(name);
+// deviceListBean.channels.get(deviceListBean.checkedChannel).channelName = name;
+// }
}
--
Gitblit v1.8.0