From 073e5d5103870246fe33029e5f6d36536a1bb76c Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 30 六月 2023 10:33:05 +0800 Subject: [PATCH] 2023年06月30日10:33:03 --- app/src/main/AndroidManifest.xml | 71 ++++++++++++++++++++--- local.properties | 4 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 46 +++++++++++++++ app/build.gradle | 4 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 24 +++++--- 5 files changed, 126 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 726ffc1..3819430 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,14 @@ //蹇呴』閰嶇疆uni def mfph = [ //瀹夸富鍖呭悕 - "apk.applicationId": "com.hdl.photovoltaic1", + "apk.applicationId": "com.hdl.photovoltaic", ] android { compileSdk 32 defaultConfig { - applicationId "com.hdl.photovoltaic1" + applicationId "com.hdl.photovoltaic" minSdk 23 targetSdk 32 versionCode 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 31b6e0a..c346c9e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,19 +7,72 @@ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" tools:ignore="ProtectedPermissions" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.CAMERA" /> +<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />--> +<!-- <uses-permission android:name="android.permission.CAMERA" />--> <uses-permission android:name="android.permission.VIBRATE" /> - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> +<!-- <uses-permission android:name="android.permission.INTERNET" />--> +<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />--> +<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />--> +<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />--> +<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />--> +<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />--> +<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />--> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" /> +<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />--> + <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> + <!-- wifi鐘舵�佹潈闄� --> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> + <uses-permission android:name="android.permission.INTERNET" /> <!-- 浣嶇疆淇℃伅 --> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 濡傛灉鏄畨鍗�10.0锛岄渶瑕佸悗鍙拌幏鍙栬繛鎺ョ殑wifi鍚嶇О鍒欐坊鍔犺繘绋嬭幏鍙栦綅缃俊鎭潈闄� --> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- android 10.0浣跨敤wifi api鏂版坊鍔犵殑鏉冮檺 --> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- bugly鎵�闇�鏉冮檺 --> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> + <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> --> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 start --> + <uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> + <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> --> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 --> + <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> + <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> --> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 start --> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> + <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> --> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 end --> + <!-- UNI SDK 鍩哄骇鍒犻櫎鐨勯儴鍒嗘潈闄� start --> + <uses-permission android:name="android.permission.CAMERA" /> + <uses-permission android:name="android.permission.INTERNET" /> <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> --> + <!-- <uses-feature android:name="android.hardware.camera.autofocus" /> --> + <!-- <uses-permission android:name="android.permission.CAMERA" /> --> + <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> --> + <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> --> + <!-- 璁块棶闂厜鐏� --> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> + <uses-permission android:name="android.permission.GET_TASKS" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> + <uses-permission android:name="android.permission.FLASHLIGHT" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="com.hdl.debugtreasure.permission.JPUSH_MESSAGE" /> + <uses-permission android:name="android.permission.CALL_PHONE" /> + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> + <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 鍩哄骇鍒犻櫎鐨勯儴鍒嗘潈闄� --> <application diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java index f914f0e..6ecf796 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -20,6 +20,7 @@ import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; +import com.hdl.sdk.link.common.exception.HDLLinkCode; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.callback.GatewayCallBack; @@ -58,18 +59,23 @@ /** * 娣诲姞閫嗗彉鍣� * - * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞� - * @param cloudCallBeak 鍥炶皟 + * @param mac - + * @param spk - + * @param sid - + * @param oid - + * @param name - + * @param cloudCallBeak */ - public void addInverterDevice(InverterDeviceBean inverterDeviceBean, CloudCallBeak<Boolean> cloudCallBeak) { + public void addInverterDevice(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) { + String requestUrl = HttpApi.POST_Device_Add; JsonObject json = new JsonObject(); json.addProperty("homeId", UserConfigManage.getInstance().getHomeId()); - json.addProperty("mac", inverterDeviceBean.getDevice_mac()); - json.addProperty("spk", inverterDeviceBean.getGateway_type()); - json.addProperty("sid", inverterDeviceBean.getSid()); - json.addProperty("oid", inverterDeviceBean.getOid()); - json.addProperty("name", inverterDeviceBean.getDevice_name()); + json.addProperty("mac", mac); + json.addProperty("spk", spk); + json.addProperty("sid", sid); + json.addProperty("oid", oid); + json.addProperty("name", name); // json.addProperty("zoneType", "password");//鍖哄煙 HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() { @@ -271,7 +277,7 @@ * @param mac 璁惧mac * @param cloudCallBeak 鍥炶皟update */ - public void steEditGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { + public void editGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) { String requestUrl = TopicApi.GATEWAY_SEND_EDIT; JsonObject json = new JsonObject(); json.addProperty("master", "true"); diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java index 5914e25..0cc1d91 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java @@ -24,6 +24,7 @@ import com.hdl.sdk.link.core.callback.GatewayCallBack; import com.hdl.sdk.link.core.callback.ModbusCallBack; import com.hdl.sdk.link.core.connect.HDLModBusConnect; +import com.hdl.sdk.link.gateway.HDLLinkLocalGateway; import org.greenrobot.eventbus.EventBus; import org.json.JSONObject; @@ -97,7 +98,50 @@ //璁惧妯″潡 switch (type) { case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: { - //娣诲姞 + //娣诲姞璁惧鍒颁簯绔� + String mac = getKeyValue("mac", getKeyValue("data", data)); + HdlDeviceLogic.getInstance().editGatewayParam(mac, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlDeviceLogic.getInstance().steGatewayParam(mac, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac); + if (gatewayBean == null) { + uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback); + return; + } + HdlDeviceLogic.getInstance().addInverterDevice(mac, + gatewayBean.getGateway_type(), + gatewayBean.getSid(), + gatewayBean.getOid(), + gatewayBean.getDevice_name(), + new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + uniCallbackData(null, callback); + } + + @Override + public void onFailure(Exception exception) { + uniCallbackData(null, -100, exception.getMessage(), callback); + } + }); + } + + @Override + public void onFailure(Exception exception) { + uniCallbackData(null, -100, exception.getMessage(), callback); + } + }); + } + + @Override + public void onFailure(Exception exception) { + uniCallbackData(null, -100, exception.getMessage(), callback); + } + }); + } break; diff --git a/local.properties b/local.properties index 5f60bb5..fbc2482 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Thu Jun 29 15:41:36 CST 2023 -sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx +#Thu Jun 29 18:00:39 CST 2023 +sdk.dir=/Users/wenjucheng/Library/Android/sdk -- Gitblit v1.8.0