From 7307444d2d7c8d48fbf44c1770aa63187e795e28 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 17 八月 2023 11:39:18 +0800
Subject: [PATCH] 切换为打包模式
---
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 0286378..5f98b60 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
@@ -16,6 +16,7 @@
import com.mm.android.deviceaddmodule.LCDeviceEngine;
import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.ProviderManager;
import com.mm.android.deviceaddmodule.openapi.CONST;
+import com.mm.android.deviceaddmodule.openapi.HttpClient;
import com.usermodule.net.IUserDataCallBack;
import com.usermodule.net.UserNetManager;
@@ -56,7 +57,7 @@
return instance;
}
- public void initData(Activity activity, String appKey, String secretKey,String url) {
+ public void initData(Activity activity, String appKey, String secretKey, String url) {
this.activity = activity;
MediaPlayHelper.initContext(activity.getApplication().getApplicationContext());
ClassInstanceManager.newInstance().init(activity.getApplication().getApplicationContext());
@@ -69,9 +70,8 @@
// secretKey = "017fc27bb987496f9a677e4e6f0c88";
// appKey = "lc0285433bc7e8423d";
// url = CONST.Envirment.OVERSEAS_PRO.url;
- ProviderManager.getAppProvider().setAppType(1);
+ ProviderManager.getAppProvider().setAppType(1);
// }
-
try {
@@ -87,22 +87,28 @@
Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show();
}
}
- public void openActivity() {
+
+ public void openActivity() {
try {
-// getSubAccountToken("827a98c98da7469b8bc19bb6a3c7651906");
activity.startActivity(new Intent(activity, com.lechange.demo.ui.DeviceListActivity.class));
} catch (Throwable e) {
Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show();
}
}
- public void addCamera(IAddCamera iAddCamera) {
- if(!EventBus.getDefault().isRegistered(this)){
+ public void addCamera(IAddCamera iAddCamera) {
+ if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
+ this.iAddCamera = iAddCamera;
//寮�鍚坊鍔犻〉闈�
activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class));
+ HdlToLcUtils.getInstance().requestCameraPermissions();
+ }
+
+ public void ShowErrorInfo(boolean isShow) {
+ HttpClient.SetShowErrorInfo(isShow);
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -117,8 +123,8 @@
}
}
- public void play(String deviceId,String title){
- new DeviceUtils(deviceId,title).play();
+ public void play(String deviceId, String title) {
+ new DeviceUtils(deviceId, title).play();
}
@@ -141,7 +147,7 @@
public void setToken(String token) {
this.token = token;
- LCDeviceEngine.newInstance().accessToken=(token);
+ LCDeviceEngine.newInstance().accessToken = (token);
}
public String getSubAccessToken() {
@@ -153,16 +159,16 @@
LCDeviceEngine.newInstance().setSubAccessToken(subAccessToken);
}
- private void getSubAccountToken(String openId){
+ private void getSubAccountToken(String openId) {
UserNetManager.getInstance().subAccountToken(openId, new IUserDataCallBack() {
@Override
public void onCallBackOpenId(String str) {
- if (str!=null){
+ if (str != null) {
//鏆備笉淇濆瓨鍒皊p涓簡锛屽洜涓鸿幏鍙栭渶瑕乧ontext銆�
// PreferencesHelper.getInstance(getApplicationContext()).set(Constants.SUBACCOUNTTOKEN,str);
LCDeviceEngine.newInstance().setSubAccessToken(str);
- activity.startActivity(new Intent(activity,com.lechange.demo.ui.DeviceListActivity.class));
+ activity.startActivity(new Intent(activity, com.lechange.demo.ui.DeviceListActivity.class));
}
}
@@ -173,11 +179,52 @@
});
}
+ public boolean checkCameraPermissions() {
+ boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
+ && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+ && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+ return isGranted;
+ }
+
+ /**
+ * 璇锋眰鎽勫儚澶存潈闄�
+ */
+ public void requestCameraPermissions() {
+ boolean isMinSDKM = Build.VERSION.SDK_INT < 23;
+ boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
+ && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+ && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+ if (isMinSDKM || isGranted) {
+ return;
+ }
+ requestRecordCameraPermission();
+ }
+
+
+ private void requestRecordCameraPermission() {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA)
+ || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+ || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+ ActivityCompat.requestPermissions(activity,
+ new String[]{
+ Manifest.permission.CAMERA,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.READ_EXTERNAL_STORAGE},
+ 1);
+ } else {
+ ActivityCompat.requestPermissions(activity,
+ new String[]{
+ Manifest.permission.CAMERA,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.READ_EXTERNAL_STORAGE},
+ 1);
+ }
+ }
/**
* 璇锋眰瀵硅鏉冮檺
*/
- public void requestPermission() {
+ public void requestPermission() {
boolean isMinSDKM = Build.VERSION.SDK_INT < 23;
boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
&& ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
@@ -190,7 +237,7 @@
requestRecordAudioPermission();
}
- private void requestRecordAudioPermission() {
+ private void requestRecordAudioPermission() {
if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.RECORD_AUDIO)
|| ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_COARSE_LOCATION)
|| ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA)
--
Gitblit v1.8.0