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 | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 75d5ed4..0286378 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -66,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);
// }
@@ -107,17 +107,18 @@
@Subscribe(threadMode = ThreadMode.MAIN)
public void onGetMessage(String obj) {
- if(obj.equals("backXamarin")){
- iAddCamera.back();
-
- if(EventBus.getDefault().isRegistered(this)){
+ if (obj.equals("backXamarin")) {
+ if (EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
+
+ if (iAddCamera != null)
+ iAddCamera.back();
}
}
- public void play(String deviceId){
- new DeviceUtils(deviceId).play();
+ public void play(String deviceId,String title){
+ new DeviceUtils(deviceId,title).play();
}
--
Gitblit v1.8.0