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/utils/DeviceUtils.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
index ac96eb4..265a8d5 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
@@ -25,10 +25,12 @@
public class DeviceUtils implements IGetDeviceInfoCallBack.ISubAccountDevice< DeviceDetailListData.Response> {
private String deviceId;
- public DeviceUtils(String deviceId){
+ private String titleString;
+ public DeviceUtils(String deviceId,String title){
this.deviceId=deviceId;
+ this.titleString = title;
}
- private List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
+ private static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
private void getDeviceList() {
DeviceSubAccountListService deviceSubAccountListService = ClassInstanceManager.newInstance().getDeviceSubAccountListService();
@@ -36,22 +38,22 @@
}
public void play() {
- if (datas.size() == 0) {
- getDeviceList();
- } else {
- for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
- if (deviceListBean.deviceId.equals(deviceId)) {
- if (!deviceListBean.status.equals("online")) {
- return;
- }
- Bundle bundle = new Bundle();
- bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
- Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
- intent.putExtras(bundle);
- HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+ for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
+ if (deviceListBean.deviceId.equals(deviceId)) {
+ if (!deviceListBean.status.equals("online")) {
+ return;
}
+ Bundle bundle = new Bundle();
+ bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
+ bundle.putString("titleString",titleString);
+ Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
+ intent.putExtras(bundle);
+ HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+
+ return;
}
}
+ getDeviceList();
}
@Override
public void DeviceList(DeviceDetailListData.Response responseData) {
@@ -73,7 +75,21 @@
datas.addAll(responseData.data.deviceList);
- play();
+ for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
+ if (deviceListBean.deviceId.equals(deviceId)) {
+ if (!deviceListBean.status.equals("online")) {
+ return;
+ }
+ Bundle bundle = new Bundle();
+ bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
+ bundle.putString("titleString",titleString);
+ Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
+ intent.putExtras(bundle);
+ HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+
+ return;
+ }
+ }
}
@Override
public void onError(Throwable throwable) {
--
Gitblit v1.8.0