Compare commits

..

No commits in common. "069c37e4ba27e3b88a1ad1b90874fd0a5240db6a" and "4f1794a466f9fd2e0c91a1a27f1601b9f4def707" have entirely different histories.

8 changed files with 6 additions and 28 deletions

View File

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

View File

@ -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功能可以忽略 -->

View File

@ -1,5 +1,4 @@
<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>

View File

@ -25,7 +25,6 @@ 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;
@ -1666,7 +1665,6 @@ 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");

View File

@ -9,7 +9,6 @@ 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;
@ -1103,12 +1102,7 @@ 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);
}
registerReceiver(internalReceiver, intentfilter);
}

View File

@ -7,7 +7,6 @@ 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;
@ -124,12 +123,7 @@ 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);
}
registerReceiver(internalReceiver, intentfilter);
}
/*@Override

View File

@ -19,7 +19,6 @@ 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;
@ -891,12 +890,7 @@ 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);
}
registerReceiver(internalReceiver, intentfilter);
}
private class InternalReceiver extends BroadcastReceiver {

File diff suppressed because one or more lines are too long