From 9d7d3963cc54eb145c1767f5f124f2881e8e06d4 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 24 十一月 2022 12:11:56 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wxr/HdlToLc
---
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index fce5f7a..0fdee9f 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -8,6 +8,7 @@
import android.support.v4.app.ActivityCompat;
import android.widget.Toast;
+import com.callBack.IAddCamera;
import com.common.openapi.ClassInstanceManager;
import com.lechange.demo.tools.MediaPlayHelper;
import com.mm.android.deviceaddmodule.CommonParam;
@@ -18,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;
}
@@ -60,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);
// }
@@ -90,9 +96,24 @@
}
}
- public void addCamera() {
+ 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")){
+ iAddCamera.back();
+
+ if(EventBus.getDefault().isRegistered(this)){
+ EventBus.getDefault().unregister(this);
+ }
+ }
}
public void play(String deviceId){
--
Gitblit v1.8.0