From 4f11141da120098afc3d3c4f26e0e0416a01a312 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 03 七月 2024 13:53:04 +0800
Subject: [PATCH] 2024年07月03日13:52:55
---
app/src/main/res/values-zh/strings.xml | 1 +
app/src/main/res/layout/activity_as_regards.xml | 2 +-
app/src/main/res/values/strings.xml | 2 ++
app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java | 22 +++++++++++++---------
app/src/main/res/values-en/strings.xml | 1 +
app/src/main/java/com/hdl/photovoltaic/internet/TcpClient.java | 3 +++
6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/TcpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/TcpClient.java
index 979fbdc..ab0c1ca 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/TcpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/TcpClient.java
@@ -98,6 +98,7 @@
* 闀垮害(2涓猙yte)=鏍囪瘑绗�(4涓猙yte)+鍔熻兘鐮�(1涓猙yte)+璐熻浇鏁版嵁(N涓猙yte);
* 璐熻浇鏁版嵁=瀵勫瓨鍣ㄥ湴鍧�(2涓猙yte)+瀵勫瓨鍣ㄩ暱搴�(2涓猙yte)+鍐呭闀垮害(1涓猙yte)+鍐呭鏁版嵁(鏁版嵁瀛楄妭鏁�->N涓猙yte)銆愭敞鎰�:鍗曚釜鍐欏叆瀵勫瓨鍣�-->鍘绘帀<瀵勫瓨鍣ㄩ暱搴�>鍜�<鍐呭闀垮害>銆�;
* 瀵勫瓨鍣ㄩ暱搴�=(鍐呭鏁版嵁/2);
+ * 鍐呭闀垮害=鍐呭鏁版嵁鐨勯暱搴�;
* 渚嬪瓙:new byte[]{1,54,0,0,0,9,0,0,200,26,3,1,54,0,1};
*
* @param oidAddresses oid鐗╃悊淇℃伅閲岄潰Addresses鍦板潃
@@ -133,6 +134,7 @@
* 闀垮害(2涓猙yte)=鏍囪瘑绗�(4涓猙yte)+鍔熻兘鐮�(1涓猙yte)+璐熻浇鏁版嵁(N涓猙yte);
* 璐熻浇鏁版嵁=瀵勫瓨鍣ㄥ湴鍧�(2涓猙yte)+瀵勫瓨鍣ㄩ暱搴�(2涓猙yte)+鍐呭闀垮害(1涓猙yte)+鍐呭鏁版嵁(鏁版嵁瀛楄妭鏁�->N涓猙yte)銆愭敞鎰�:鍗曚釜鍐欏叆瀵勫瓨鍣�-->鍘绘帀<瀵勫瓨鍣ㄩ暱搴�>鍜�<鍐呭闀垮害>銆�;
* 瀵勫瓨鍣ㄩ暱搴�=(鍐呭鏁版嵁/2);
+ * 鍐呭闀垮害=鍐呭鏁版嵁鐨勯暱搴�;
* 渚嬪瓙:new byte[]{199, 112, 0, 0, 0, 9, 0, 0, 0, 26, 6, 199, 112, 0, 110};
*
* @param oidAddresses oid鐗╃悊淇℃伅閲岄潰Addresses鍦板潃
@@ -167,6 +169,7 @@
* 闀垮害(2涓猙yte)=鏍囪瘑绗�(4涓猙yte)+鍔熻兘鐮�(1涓猙yte)+璐熻浇鏁版嵁(N涓猙yte);
* 璐熻浇鏁版嵁=瀵勫瓨鍣ㄥ湴鍧�(2涓猙yte)+瀵勫瓨鍣ㄩ暱搴�(2涓猙yte)+鍐呭闀垮害(1涓猙yte)+鍐呭鏁版嵁(鏁版嵁瀛楄妭鏁�->N涓猙yte)銆愭敞鎰�:鍗曚釜鍐欏叆瀵勫瓨鍣�-->鍘绘帀<瀵勫瓨鍣ㄩ暱搴�>鍜�<鍐呭闀垮害>銆�;
* 瀵勫瓨鍣ㄩ暱搴�=(鍐呭鏁版嵁/2);
+ * 鍐呭闀垮害=鍐呭鏁版嵁鐨勯暱搴�;
* 渚嬪瓙:new byte[]{[0, 11, 0, 0, 0, 30, 0, 0, 0, 26, 16, 0, 11, 0, 10, 20, 49, 50, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32]};
*
* @param oidAddresses oid閲岄潰Addresses鐨勫��
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java
index 61fe5f6..96a9bb3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java
@@ -342,15 +342,19 @@
if (TextUtils.isEmpty(result)) {
Toast.makeText(this, R.string.capture_no_result, Toast.LENGTH_SHORT).show();
} else {
- Intent intent = new Intent();
- intent.putExtra("data", result);
- setResult(RESULT_OK, intent);
- finish();
- //EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBusSticky(
- HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
- HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
- result);
+ if (result.startsWith("https://") || result.startsWith("http://")) {
+ Intent intent = new Intent();
+ intent.putExtra("data", result);
+ setResult(RESULT_OK, intent);
+ finish();
+ //EventBus浜嬩欢鍒嗗彂
+ HdlCommonLogic.getInstance().postEventBusSticky(
+ HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+ HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+ result);
+ } else {
+ Toast.makeText(this, R.string.not_delivery_qr_code, Toast.LENGTH_SHORT).show();
+ }
}
}
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index 4668c36..ab6a5d0 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -189,7 +189,7 @@
android:background="@color/text_FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
+ app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">
<TextView
android:id="@+id/contact_us_tv"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index bc7c483..8027623 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -326,5 +326,6 @@
<string name="capture_no_network">The current network is not available. Please check the network and try again</string>
<string name="capture_no_result2">No results were scanned, it may not be a valid QR code</string>
<string name="scan_cancel">Cancel</string>
+ <string name="not_delivery_qr_code">Not delivery of QR code.</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 0fe7a36..6abe93b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -323,6 +323,7 @@
<string name="capture_no_network">褰撳墠缃戠粶涓嶅彲鐢�,璇锋鏌ョ綉缁滃悗鍐嶈瘯</string>
<string name="capture_no_result2">娌℃湁鎵弿鍑虹粨鏋滐紝鍙兘涓嶆槸鏈夋晥鐨勪簩缁寸爜</string>
<string name="scan_cancel">鍙栨秷</string>
+ <string name="not_delivery_qr_code">涓嶆槸浜や粯浜岀淮鐮�.</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a03be6..0b8f341 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -325,5 +325,7 @@
<string name="capture_no_network">褰撳墠缃戠粶涓嶅彲鐢�,璇锋鏌ョ綉缁滃悗鍐嶈瘯</string>
<string name="capture_no_result2">娌℃湁鎵弿鍑虹粨鏋滐紝鍙兘涓嶆槸鏈夋晥鐨勪簩缁寸爜</string>
<string name="scan_cancel">鍙栨秷</string>
+ <string name="not_delivery_qr_code">涓嶆槸浜や粯浜岀淮鐮�.</string>
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0