From 2ae8111cc2bbd17c2a6b94a4e13fda66e711a205 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 十一月 2022 16:01:48 +0800
Subject: [PATCH] 2
---
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 10 ----------
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 | 7 ++++---
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 4 ++--
5 files changed, 7 insertions(+), 23 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 7dfa75a..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
@@ -625,7 +625,7 @@
switchVideoList(true);
getDeviceLocalCache();
// tvDeviceName.setText(deviceListBean.channels.get(deviceListBean.checkedChannel).channelName);
- tvDeviceName.setText(bundle.getString("titleText"));
+ tvDeviceName.setText(bundle.getString("titleString"));
if(deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions!=null&&deviceListBean.channels.get(deviceListBean.checkedChannel).resolutions.size()>0){
showHD = false;
@@ -1500,7 +1500,7 @@
}
// if (resultCode == 100 && data != null) {
// String name = data.getStringExtra(DeviceConstant.IntentKey.DHDEVICE_NEW_NAME);
-// tvDeviceName.setText(bundle.getString("titleText"));
+// 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 8a6ad18..ac6ea41 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
@@ -77,16 +77,6 @@
// HdlToLcUtils.getInstance().openActivity();
HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
@Override
- public void success(String deviceId) {
-
- }
-
- @Override
- public void onError(String errMsg) {
-
- }
-
- @Override
public void back() {
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
index d1d106b..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,10 @@
public class DeviceUtils implements IGetDeviceInfoCallBack.ISubAccountDevice< DeviceDetailListData.Response> {
private String deviceId;
- private String mTitleString;
+ private String titleString;
public DeviceUtils(String deviceId,String title){
this.deviceId=deviceId;
- this.mTitleString = title;
+ this.titleString = title;
}
private static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
@@ -45,7 +45,7 @@
}
Bundle bundle = new Bundle();
bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
- bundle.putString("titleText",mTitleString);
+ bundle.putString("titleString",titleString);
Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
intent.putExtras(bundle);
HdlToLcUtils.getInstance().getActivity().startActivity(intent);
@@ -82,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/values/styles.xml b/AndroidOpenDemo/app/src/main/res/values/styles.xml
index a6b924d..86ab95a 100644
--- a/AndroidOpenDemo/app/src/main/res/values/styles.xml
+++ b/AndroidOpenDemo/app/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="background_color">#FFF2F3F7</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