From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 22 八月 2024 13:43:47 +0800 Subject: [PATCH] 2024年08月22日13:43:45 --- app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 6 +++++- app/src/main/res/drawable/ffffff_18.xml | 4 ++-- app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java index bd7da51..84c22ac 100644 --- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java +++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java @@ -8,7 +8,7 @@ public class AppConfigManage { /*********鏄惁姝e紡鏈嶅姟鍣�*********/ - private static final boolean isOnlineServer = true; + private static final boolean isOnlineServer = false; /*********姝e紡鐜*********/ private static final String APP_KEY_ONLINE = "CSZEMDJL"; private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR"; @@ -70,6 +70,10 @@ return BuildConfig.DEBUG; } + public static boolean getOnlineServer() { + return isOnlineServer; + } + /** * 鑾峰彇褰撳墠搴旂敤鐨勭増鏈悕 */ diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java index ba40c24..3b5ccb1 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java @@ -12,6 +12,7 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.AppConfigManage; +import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityAsRegardsBinding; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.listener.CloudCallBeak; @@ -70,8 +71,12 @@ } }); - //todo 绛夋帴鍙� - String content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.html"; + //姝e紡鐜 + String content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDownload.html"; + if (!AppConfigManage.getOnlineServer()) { + //娴嬭瘯鐜 + content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.html"; + } Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE); viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap); diff --git a/app/src/main/res/drawable/ffffff_18.xml b/app/src/main/res/drawable/ffffff_18.xml index 7f057f1..ad7828a 100644 --- a/app/src/main/res/drawable/ffffff_18.xml +++ b/app/src/main/res/drawable/ffffff_18.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners - android:topLeftRadius="@dimen/dp_18" - android:topRightRadius="@dimen/text_18" /> + android:topLeftRadius="@dimen/dp_13" + android:topRightRadius="@dimen/text_13" /> <solid android:color="@color/text_FFFFFFFF" /> </shape> \ No newline at end of file -- Gitblit v1.8.0