tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.0.1.9

Browse Source 
update:2020.08.5
fix:修复锁屏后 相机管控失效
add:
This commit is contained in:
Administrator
2020-08-05 09:47:34 +08:00
parent c5478df95c
commit c803fd6353
6 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -38,8 +38,8 @@ android {
productFlavors {
official {
flavorDimensions "default"
versionCode 1009
versionName "2.0.1.9"// 正式jiaoguanyi.com 双数正式 单数测试
versionCode 1020
versionName "2.0.2.0"// 正式jiaoguanyi.com 双数正式 单数测试
/*********************************极光推送************************************/
manifestPlaceholders = [
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",

3
app/src/main/AndroidManifest.xml
View File

@@ -43,7 +43,8 @@
<uses-permission
android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
android:maxSdkVersion="22" />
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
android:maxSdkVersion="23"/>
<application
android:name=".MyApplication"
android:allowBackup="true"

17
app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
View File

@@ -30,7 +30,6 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.alibaba.fastjson.JSON;
import com.arialyy.aria.core.Aria;
@@ -59,7 +58,6 @@ import com.mjsheng.myappstore.bean.NetAndLaunchBean;
import com.mjsheng.myappstore.bean.NetAndLaunchData;
import com.mjsheng.myappstore.bean.StudentsInfo;
import com.mjsheng.myappstore.bean.UploadAppInfo;
import com.mjsheng.myappstore.bean.UserInfo;
import com.mjsheng.myappstore.comm.CommonDatas;
import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
import com.mjsheng.myappstore.network.HTTPInterface;
@@ -73,7 +71,6 @@ import com.mjsheng.myappstore.network.api.NetAndLaunchApi;
import com.mjsheng.myappstore.network.api.SystemSettingApi;
import com.mjsheng.myappstore.network.api.UploadAppInfoApi;
import com.mjsheng.myappstore.server.MyDownloadService;
import com.mjsheng.myappstore.utils.ApkUtils;
import com.mjsheng.myappstore.utils.Configure;
import com.mjsheng.myappstore.utils.ExampleUtil;
import com.mjsheng.myappstore.utils.MySQLData;
@@ -923,6 +920,7 @@ public class MainActivity extends AppCompatActivity {
private void initJpush() {
JPushInterface.init(this);
setAlias();
String rid = JPushInterface.getRegistrationID(MainActivity.this);
if (!rid.isEmpty()) {
// ToastUtil.debugShow("RegId:" + rid);
@@ -1050,6 +1048,7 @@ public class MainActivity extends AppCompatActivity {
String appstore = "com.jiaoguanyi.appstore";
String store = "com.jiaoguanyi.store";
String iflytek = "iflytek.eface2sdk";
// String iflytek = "com.estrongs.android.pop";
if (!TextUtils.isEmpty(result)) {
LogUtils.e(result);
if (!result.contains(appstore)) {
@@ -1483,12 +1482,12 @@ public class MainActivity extends AppCompatActivity {
}
Intent intent2 = new Intent("qch_camera_forbid");
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
sendBroadcast(intent2);
Intent intent1 = new Intent("qch_camera_open");
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
sendBroadcast(intent1);
// Intent intent2 = new Intent("qch_camera_forbid");
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
// sendBroadcast(intent2);
// Intent intent1 = new Intent("qch_camera_open");
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
// sendBroadcast(intent1);
}

12
app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
View File

@@ -733,12 +733,12 @@ public class HTTPInterface {
}
Intent intent2 = new Intent("qch_camera_forbid");
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
context.sendBroadcast(intent2);
Intent intent1 = new Intent("qch_camera_open");
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
context.sendBroadcast(intent1);
// Intent intent2 = new Intent("qch_camera_forbid");
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
// context.sendBroadcast(intent2);
// Intent intent1 = new Intent("qch_camera_open");
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
// context.sendBroadcast(intent1);
}
}

12
app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java
View File

@@ -633,12 +633,12 @@ public class InitJpushServer extends Service {
}
Intent intent2 = new Intent("qch_camera_forbid");
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
sendBroadcast(intent2);
Intent intent1 = new Intent("qch_camera_open");
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
sendBroadcast(intent1);
// Intent intent2 = new Intent("qch_camera_forbid");
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
// sendBroadcast(intent2);
// Intent intent1 = new Intent("qch_camera_open");
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
// sendBroadcast(intent1);
}

18
app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
View File

@@ -603,13 +603,17 @@ public class ApkUtils {
}};
public static List<String> systemapp = new ArrayList<String>() {{
//需要管控的系统应用
this.add("com.android.gallery3d");
this.add("com.android.deskclock");
this.add("com.android.music");
this.add("com.mediatek.camera");
this.add("com.android.documentsui");
this.add("com.android.soundrecorder");
this.add("com.android.browser");
this.add("com.android.gallery3d");//图库
this.add("com.android.deskclock");//时钟
this.add("com.android.music");//音乐
this.add("com.mediatek.camera");//相机
this.add("com.android.documentsui");//文件
this.add("com.android.soundrecorder");//录音机
this.add("com.android.browser");//浏览器
this.add("com.android.mms");//信息
this.add("com.android.fmradio");//FM电台
this.add("com.android.dialer");//电话
this.add("com.android.contacts");//通讯录
}};