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/res/layout/fragment_device_detail_name.xml | 1 +
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 24 +++++++-----------------
AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java | 8 --------
AndroidOpenDemo/app/src/main/res/values/styles.xml | 1 +
AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java | 6 +++++-
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 13 +++++++------
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 1 +
7 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java b/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java
index 9ab8766..1f96263 100644
--- a/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java
+++ b/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java
@@ -1,13 +1,5 @@
package com.callBack;
public interface IAddCamera {
- void success(String deviceId);
- /**
- * 閿欒鍥炶皟
- *
- * @param errMsg
- */
- void onError(String errMsg);
-
void back();
}
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;
+// }
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
index fa1a438..40eeb41 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -75,23 +75,13 @@
HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466");
// HdlToLcUtils.getInstance().openActivity();
-// HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
-// @Override
-// public void success(String deviceId) {
-//
-// }
-//
-// @Override
-// public void onError(String errMsg) {
-//
-// }
-//
-// @Override
-// public void back() {
-//
-// }
-// });
- HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
+ HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
+ @Override
+ public void back() {
+
+ }
+ });
+// HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
index 05bef9f..265a8d5 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
@@ -25,8 +25,10 @@
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 static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
@@ -43,6 +45,7 @@
}
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);
@@ -79,6 +82,7 @@
}
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);
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
index a1502d7..c41c296 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -22,6 +22,7 @@
android:layout_marginRight="@dimen/px_30"
android:layout_toLeftOf="@id/iv_device_pic"
android:singleLine="true"
+ android:visibility="gone"
android:textColor="@color/lc_demo_color_2c2c2c"
android:textSize="@dimen/px_36"></TextView>
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_name.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_name.xml
index a8b0b1e..f5bc67d 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_name.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_name.xml
@@ -11,6 +11,7 @@
android:layout_height="@dimen/px_130"
android:background="@color/lc_demo_color_ffffff"
android:gravity="center_vertical"
+ android:visibility="gone"
android:paddingLeft="@dimen/px_30"
android:paddingRight="@dimen/px_30">
diff --git a/AndroidOpenDemo/app/src/main/res/values/styles.xml b/AndroidOpenDemo/app/src/main/res/values/styles.xml
index cca61c2..d7ef3a6 100644
--- a/AndroidOpenDemo/app/src/main/res/values/styles.xml
+++ b/AndroidOpenDemo/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
+ <item name="android:windowNoTitle">true</item>
</style>
<style name="lc_demo_loading" parent="@android:style/Widget.ProgressBar">
<item name="android:indeterminateOnly">true</item>
--
Gitblit v1.8.0