From 409c13d0886117d5ee4ff42186d90b19a692b804 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 二月 2023 14:06:36 +0800
Subject: [PATCH] 增加品牌认证
---
AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java
index 8dba175..09ffed0 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;
@@ -30,6 +31,7 @@
private String token;
private String subAccessToken;
private IAddCamera iAddCamera;
+ private String productBrandldentity;
public Activity getActivity() {
return activity;
@@ -100,9 +102,15 @@
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 +125,8 @@
}
}
- public void play(String deviceId){
- new DeviceUtils(deviceId).play();
+ public void play(String deviceId,String title){
+ new DeviceUtils(deviceId,title).play();
}
@@ -133,6 +141,14 @@
public void setHomeId(String homeId) {
this.homeId = homeId;
LCDeviceEngine.newInstance().setHomeId(homeId);
+ }
+
+ public String getProductBrandldentity() { return productBrandldentity;}
+
+ public void setProductBrandldentity(String productBrandldentity){
+ this.productBrandldentity = productBrandldentity;
+ LCDeviceEngine.newInstance().setProductBrandldentity(productBrandldentity);
+
}
public String getToken() {
@@ -173,6 +189,47 @@
});
}
+ 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);
+ }
+ }
/**
* 璇锋眰瀵硅鏉冮檺
--
Gitblit v1.8.0