From 2bee35fbadbc4d7e259317f933bbbe4e306a01cd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期日, 12 一月 2025 10:26:22 +0800
Subject: [PATCH] 2025年01月12日10:26:09 已发布
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/QrcodeUrlBean.java | 28 ++++++++++++++++++++++++++++
app/src/main/AndroidManifest.xml | 7 +------
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 6 +++---
app/build.gradle | 2 +-
4 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index e7a9f8a..c424848 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@
applicationId "com.hdl.photovoltaic"
minSdkVersion 23
targetSdkVersion 34
- versionCode 5
+ versionCode 6
versionName "1.0.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 77fc6a4..2f87fa9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,18 +26,15 @@
<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_BACKGROUND_LOCATION" /><!–鏉冮檺鍏佽搴旂敤绋嬪簭鍦ㄥ悗鍙拌闂綅缃俊鎭� 璋锋瓕play涓婃灦涓嶄簡 –>-->
<uses-permission android:name="android.permission.CAMERA" />
<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" />
<!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 -->
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 璁块棶闂厜鐏� -->
<uses-permission android:name="android.permission.READ_PHONE_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" />
@@ -49,9 +46,7 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /><!–璋锋瓕play涓婃灦涓嶄簡–>-->
<uses-permission android:name="android.permission.ACCESS_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_BACKGROUND_LOCATION" /> <!-- 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 -->
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /> <!-- 鍗庝负瑙掓爣 -->
<uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /> <!-- VIVO瑙掓爣鏉冮檺 -->
<uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /> <!-- honor 瑙掓爣 -->
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 bc70bde..e70f0e8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -55,6 +55,7 @@
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
@@ -1008,9 +1009,8 @@
public void onSuccess(String obj) {
try {
Gson g = new Gson();
- JsonObject jObject = g.fromJson(obj, JsonObject.class);
- String deliveryUrl = jObject.get("deliveryUrl").toString();
- uniSuccessCallback(type, deliveryUrl, callback);
+ QrcodeUrlBean qrcodeUrlBean = g.fromJson(obj, QrcodeUrlBean.class);
+ uniSuccessCallback(type, qrcodeUrlBean.getDeliveryUrl(), callback);
} catch (Exception ignored) {
uniSuccessCallback(type, obj, callback);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrcodeUrlBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrcodeUrlBean.java
new file mode 100644
index 0000000..1e14840
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrcodeUrlBean.java
@@ -0,0 +1,28 @@
+package com.hdl.photovoltaic.ui.bean;
+
+import java.io.Serializable;
+
+/**
+ * 鐢电珯浜や粯URL锛圔绔級瀹炰綋绫�
+ */
+public class QrcodeUrlBean implements Serializable {
+
+ private String qrcodeUrl;
+ private String deliveryUrl;
+
+ public String getQrcodeUrl() {
+ return qrcodeUrl == null ? "" : qrcodeUrl;
+ }
+
+ public void setQrcodeUrl(String qrcodeUrl) {
+ this.qrcodeUrl = qrcodeUrl;
+ }
+
+ public String getDeliveryUrl() {
+ return deliveryUrl == null ? "" : deliveryUrl;
+ }
+
+ public void setDeliveryUrl(String deliveryUrl) {
+ this.deliveryUrl = deliveryUrl;
+ }
+}
--
Gitblit v1.8.0