From 2588ab0681d9ef96f98114a1de018b420e3ee1da Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 11:16:14 +0800
Subject: [PATCH] Merge branch 'dev' into library
---
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 602d5f4..0286378 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -19,14 +19,19 @@
import com.usermodule.net.IUserDataCallBack;
import com.usermodule.net.UserNetManager;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
public class HdlToLcUtils {
- private Activity activity;
+ private Activity activity;
private String homeId;
private String token;
private String subAccessToken;
+ private IAddCamera iAddCamera;
- public Activity getActivity() {
+ public Activity getActivity() {
return activity;
}
@@ -61,9 +66,9 @@
// mUrl = CONST.Envirment.CHINA_TEST.url;
// ProviderManager.getAppProvider().setAppType(0);
// } else {
-// mAppSecret = "017fc27bb987496f9a677e4e6f0c88";
-// mAppid = "lc0285433bc7e8423d";
-// mUrl = CONST.Envirment.OVERSEAS_PRO.url;
+// secretKey = "017fc27bb987496f9a677e4e6f0c88";
+// appKey = "lc0285433bc7e8423d";
+// url = CONST.Envirment.OVERSEAS_PRO.url;
ProviderManager.getAppProvider().setAppType(1);
// }
@@ -92,12 +97,28 @@
}
public void addCamera(IAddCamera iAddCamera) {
+ if(!EventBus.getDefault().isRegistered(this)){
+ EventBus.getDefault().register(this);
+ }
//寮�鍚坊鍔犻〉闈�
activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class));
+
}
- public void play(String deviceId){
- new DeviceUtils(deviceId).play();
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onGetMessage(String obj) {
+ if (obj.equals("backXamarin")) {
+ if (EventBus.getDefault().isRegistered(this)) {
+ EventBus.getDefault().unregister(this);
+ }
+
+ if (iAddCamera != null)
+ iAddCamera.back();
+ }
+ }
+
+ public void play(String deviceId,String title){
+ new DeviceUtils(deviceId,title).play();
}
--
Gitblit v1.8.0