Merge branch 'dev'

README.md

@@ -16,3 +16,4 @@ git push
 git checkout master
 git merge --no-ff dev
 git push
+git checkout dev

app/src/main/AndroidManifest.xml

@@ -35,9 +35,9 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+<!--    <uses-permission android:name="android.permission.RECEIVE_SMS" />-->
     <uses-permission android:name="android.permission.REORDER_TASKS" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
+<!--    <uses-permission android:name="android.permission.SEND_SMS" />-->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- SD卡读取权限，用户写入离线定位数据 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 如果没有VOIP功能可以忽略 -->

app/src/main/assets/data/dcloud_control.xml

@@ -1,4 +1,5 @@
 <hbuilder version="1.9.9.80110" debug="false" syncDebug ="false">
+<!--<hbuilder version="1.9.9.80110" debug="false" syncDebug ="true">-->
     <apps>
         <app appid="unimp" appver="1.0"/>
     </apps>

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");

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,8 +1103,13 @@ public abstract class BaseActivity extends AppCompatActivity implements
 		if (internalReceiver == null) {
 			internalReceiver = new InternalReceiver();
 		}
+		// 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);
 		}
+	}
 
 
 

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,8 +124,13 @@ public abstract class ECSuperActivity extends ECFragmentActivity implements Gest
         if (internalReceiver == null) {
             internalReceiver = new InternalReceiver();
         }
+        // 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
     public boolean dispatchTouchEvent(MotionEvent ev) {

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,8 +891,13 @@ public class LauncherActivity extends ECFragmentActivity implements
 		if (internalReceiver == null) {
 			internalReceiver = new InternalReceiver();
 		}
+		// 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 {