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/HdlToLcUtils.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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..8dba175 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,8 +97,24 @@
}
public void addCamera(IAddCamera iAddCamera) {
+ if(!EventBus.getDefault().isRegistered(this)){
+ EventBus.getDefault().register(this);
+ }
//寮�鍚坊鍔犻〉闈�
activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class));
+
+ }
+
+ @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){
--
Gitblit v1.8.0