From 434f134f537772d01069a485e679432fc55d7dc3 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 19 Nov 2025 14:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=89=E5=8D=9313+?=
=?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 1 +
app/src/main/AndroidManifest.xml | 4 ++--
app/src/main/assets/data/dcloud_control.xml | 1 +
.../java/cn/shangyu/gdxzExpert/activity/MainActivity.java | 2 ++
.../java/cn/shangyu/gdxzExpert/base/BaseActivity.java | 8 +++++++-
.../cn/shangyu/gdxzExpert/ecdemo/ui/ECSuperActivity.java | 8 +++++++-
.../cn/shangyu/gdxzExpert/ecdemo/ui/LauncherActivity.java | 8 +++++++-
build/reports/problems/problems-report.html | 2 +-
8 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index f43108f..7dda074 100644
--- a/README.md
+++ b/README.md
@@ -16,3 +16,4 @@ git push
git checkout master
git merge --no-ff dev
git push
+git checkout dev
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4e59e9..b23d818 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,9 +35,9 @@
-
+
-
+
diff --git a/app/src/main/assets/data/dcloud_control.xml b/app/src/main/assets/data/dcloud_control.xml
index 1b76541..bd05edd 100644
--- a/app/src/main/assets/data/dcloud_control.xml
+++ b/app/src/main/assets/data/dcloud_control.xml
@@ -1,4 +1,5 @@
+
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/MainActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/MainActivity.java
index 0a9f45d..6b9c3a9 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/MainActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/MainActivity.java
@@ -25,6 +25,7 @@ import static cn.shangyu.gdxzExpert.utils.Url.getAccessToken;
import static cn.shangyu.gdxzExpert.utils.Url.getShowMagazine;
import static cn.shangyu.gdxzExpert.utils.Url.scanurl;
import static cn.shangyu.gdxzExpert.utils.Url.umVerifyLogin;
+import static cn.shangyu.gdxzExpert.utils.Url.urlmyLan;
import static cn.shangyu.gdxzExpert.utils.Url.yxrefresh;
import static cn.shangyu.gdxzExpert.utils.Url.yxregist;
@@ -1665,6 +1666,7 @@ public class MainActivity extends BaseActivity implements
uniMPOpenConfiguration.splashClass = UniappSplashView.class;
// uniMPOpenConfiguration.path= "pages/live/live";
uniMPOpenConfiguration.extraData.put("darkmode", "light");
+ uniMPOpenConfiguration.extraData.put("apiHost", urlmyLan);
uniMPOpenConfiguration.extraData.put("token", access_token);
uniMPOpenConfiguration.extraData.put("userInfo", userInfo);
uniMPOpenConfiguration.extraData.put("targetPath", "/pages/live/live");
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/base/BaseActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/base/BaseActivity.java
index 94f0329..01ac692 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/base/BaseActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/base/BaseActivity.java
@@ -9,6 +9,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.graphics.drawable.AnimationDrawable;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -1102,7 +1103,12 @@ public abstract class BaseActivity extends AppCompatActivity implements
if (internalReceiver == null) {
internalReceiver = new InternalReceiver();
}
- registerReceiver(internalReceiver, intentfilter);
+ // Android 13 (API 33) 及以上版本需要指定 RECEIVER_EXPORTED 或 RECEIVER_NOT_EXPORTED
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ registerReceiver(internalReceiver, intentfilter, Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ registerReceiver(internalReceiver, intentfilter);
+ }
}
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/ECSuperActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/ECSuperActivity.java
index f789357..d2346a8 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/ECSuperActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/ECSuperActivity.java
@@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Rect;
+import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import androidx.fragment.app.FragmentActivity;
@@ -123,7 +124,12 @@ public abstract class ECSuperActivity extends ECFragmentActivity implements Gest
if (internalReceiver == null) {
internalReceiver = new InternalReceiver();
}
- registerReceiver(internalReceiver, intentfilter);
+ // Android 13 (API 33) 及以上版本需要指定 RECEIVER_EXPORTED 或 RECEIVER_NOT_EXPORTED
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ registerReceiver(internalReceiver, intentfilter, Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ registerReceiver(internalReceiver, intentfilter);
+ }
}
/*@Override
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/LauncherActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/LauncherActivity.java
index 8cca3d7..8d04047 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/LauncherActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/ecdemo/ui/LauncherActivity.java
@@ -19,6 +19,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
+import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.KeyEvent;
@@ -890,7 +891,12 @@ public class LauncherActivity extends ECFragmentActivity implements
if (internalReceiver == null) {
internalReceiver = new InternalReceiver();
}
- registerReceiver(internalReceiver, intentfilter);
+ // Android 13 (API 33) 及以上版本需要指定 RECEIVER_EXPORTED 或 RECEIVER_NOT_EXPORTED
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ registerReceiver(internalReceiver, intentfilter, Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ registerReceiver(internalReceiver, intentfilter);
+ }
}
private class InternalReceiver extends BroadcastReceiver {
diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
index 90eb11a..8d4ad07 100644
--- a/build/reports/problems/problems-report.html
+++ b/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {