Merge pull request #29 from aoe-iu/sync
解决MyApplication.SimInfoList 为空问题
This commit is contained in:
commit
747123abba
|
@ -21,6 +21,7 @@
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
|
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
|
||||||
<!--Android 9(API 级别 28)或更高版本并使用前台服务,则其必须请求 FOREGROUND_SERVICE 权限-->
|
<!--Android 9(API 级别 28)或更高版本并使用前台服务,则其必须请求 FOREGROUND_SERVICE 权限-->
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".MyApplication"
|
android:name=".MyApplication"
|
||||||
|
|
|
@ -10,9 +10,10 @@ import android.os.Build;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
|
|
||||||
import com.idormy.sms.forwarder.utils.OSUtils;
|
import com.idormy.sms.forwarder.utils.OSUtils;
|
||||||
|
import com.idormy.sms.forwarder.utils.PhoneUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
|
|
||||||
public class FrontService extends Service {
|
public class FrontService extends Service {
|
||||||
|
@ -60,6 +61,11 @@ public class FrontService extends Service {
|
||||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
|
// 手机重启,未打开app时,主动获取SIM卡信息
|
||||||
|
if (MyApplication.SimInfoList.isEmpty()) {
|
||||||
|
PhoneUtils.init(this);
|
||||||
|
MyApplication.SimInfoList = PhoneUtils.getSimMultiInfo();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|
|
@ -18,9 +18,6 @@ import android.widget.AdapterView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.appcompat.app.AlertDialog;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
|
|
||||||
import com.idormy.sms.forwarder.BroadCastReceiver.SmsForwarderBroadcastReceiver;
|
import com.idormy.sms.forwarder.BroadCastReceiver.SmsForwarderBroadcastReceiver;
|
||||||
import com.idormy.sms.forwarder.adapter.LogAdapter;
|
import com.idormy.sms.forwarder.adapter.LogAdapter;
|
||||||
import com.idormy.sms.forwarder.model.vo.LogVo;
|
import com.idormy.sms.forwarder.model.vo.LogVo;
|
||||||
|
@ -34,6 +31,9 @@ import com.umeng.analytics.MobclickAgent;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity implements ReFlashListView.IReflashListener {
|
public class MainActivity extends AppCompatActivity implements ReFlashListView.IReflashListener {
|
||||||
|
|
||||||
ServiceConnection conn = new ServiceConnection() {
|
ServiceConnection conn = new ServiceConnection() {
|
||||||
|
@ -73,8 +73,6 @@ public class MainActivity extends AppCompatActivity implements ReFlashListView.I
|
||||||
|
|
||||||
//获取SIM信息
|
//获取SIM信息
|
||||||
PhoneUtils.init(this);
|
PhoneUtils.init(this);
|
||||||
MyApplication.SimInfoList = PhoneUtils.getSimMultiInfo();
|
|
||||||
Log.d(TAG, "SimInfoList = " + MyApplication.SimInfoList);
|
|
||||||
|
|
||||||
//短信&网络组件初始化
|
//短信&网络组件初始化
|
||||||
SmsUtil.init(this);
|
SmsUtil.init(this);
|
||||||
|
@ -301,6 +299,11 @@ public class MainActivity extends AppCompatActivity implements ReFlashListView.I
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
MobclickAgent.onResume(this);
|
MobclickAgent.onResume(this);
|
||||||
|
//第一次打开,申请权限前无法获取SIM信息,尝试在此重新获取
|
||||||
|
if (MyApplication.SimInfoList.isEmpty()) {
|
||||||
|
MyApplication.SimInfoList = PhoneUtils.getSimMultiInfo();
|
||||||
|
}
|
||||||
|
Log.d(TAG, "SimInfoList = " + MyApplication.SimInfoList.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -9,11 +9,13 @@ import android.widget.CompoundButton;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.Switch;
|
import android.widget.Switch;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.idormy.sms.forwarder.utils.KeepAliveUtils;
|
||||||
|
import com.idormy.sms.forwarder.utils.SettingUtil;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import com.idormy.sms.forwarder.utils.SettingUtil;
|
|
||||||
|
|
||||||
|
|
||||||
public class SettingActivity extends AppCompatActivity {
|
public class SettingActivity extends AppCompatActivity {
|
||||||
private String TAG = "SettingActivity";
|
private String TAG = "SettingActivity";
|
||||||
|
@ -223,4 +225,11 @@ public class SettingActivity extends AppCompatActivity {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void batterySetting(View view) {
|
||||||
|
if (KeepAliveUtils.isIgnoreBatteryOptimization(this)) {
|
||||||
|
Toast.makeText(this,R.string.isIgnored,Toast.LENGTH_SHORT).show();
|
||||||
|
} else {
|
||||||
|
KeepAliveUtils.ignoreBatteryOptimization(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
package com.idormy.sms.forwarder.utils;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.PowerManager;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.idormy.sms.forwarder.R;
|
||||||
|
|
||||||
|
public class KeepAliveUtils {
|
||||||
|
|
||||||
|
public static boolean isIgnoreBatteryOptimization(Activity activity) {
|
||||||
|
PowerManager powerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
|
||||||
|
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M && powerManager != null) {
|
||||||
|
return powerManager.isIgnoringBatteryOptimizations(activity.getPackageName());
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ignoreBatteryOptimization(Activity activity) {
|
||||||
|
if (isIgnoreBatteryOptimization(activity)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
|
||||||
|
intent.setData(Uri.parse("package:" + activity.getPackageName()));
|
||||||
|
ResolveInfo resolveInfo = activity.getPackageManager().resolveActivity(intent, 0);
|
||||||
|
if (resolveInfo != null) {
|
||||||
|
activity.startActivity(intent);
|
||||||
|
} else {
|
||||||
|
Toast.makeText(activity, R.string.unsupport, Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -293,6 +293,16 @@
|
||||||
android:padding="0dp"
|
android:padding="0dp"
|
||||||
android:text="恢复初始化配置" />
|
android:text="恢复初始化配置" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnBatterySetting"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="35dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:background="@color/colorPrimary"
|
||||||
|
android:onClick="batterySetting"
|
||||||
|
android:padding="0dp"
|
||||||
|
android:text="设置电池优化" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
|
@ -21,4 +21,6 @@
|
||||||
<string name="log_tips">提示:置顶下拉刷新,长按删除单条记录</string>
|
<string name="log_tips">提示:置顶下拉刷新,长按删除单条记录</string>
|
||||||
<string name="rule_tips">提示:新建规则点击“添加”,长按删除/点击编辑已有</string>
|
<string name="rule_tips">提示:新建规则点击“添加”,长按删除/点击编辑已有</string>
|
||||||
<string name="sender_tips">提示:新建发送方点击“添加”,长按删除/点击编辑已有</string>
|
<string name="sender_tips">提示:新建发送方点击“添加”,长按删除/点击编辑已有</string>
|
||||||
|
<string name="unsupport">您的手机不支持此设置</string>
|
||||||
|
<string name="isIgnored">已设置成功!</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue