version:2.0.1.9
update:2020.08.5 fix:修复锁屏后 相机管控失效 add:
This commit is contained in:
@@ -38,8 +38,8 @@ android {
|
|||||||
productFlavors {
|
productFlavors {
|
||||||
official {
|
official {
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
versionCode 1009
|
versionCode 1020
|
||||||
versionName "2.0.1.9"// 正式jiaoguanyi.com 双数正式 单数测试
|
versionName "2.0.2.0"// 正式jiaoguanyi.com 双数正式 单数测试
|
||||||
/*********************************极光推送************************************/
|
/*********************************极光推送************************************/
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
|
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
|
||||||
|
|||||||
@@ -43,7 +43,8 @@
|
|||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
|
android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
|
||||||
android:maxSdkVersion="22" />
|
android:maxSdkVersion="22" />
|
||||||
|
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
|
||||||
|
android:maxSdkVersion="23"/>
|
||||||
<application
|
<application
|
||||||
android:name=".MyApplication"
|
android:name=".MyApplication"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ import android.widget.Button;
|
|||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.arialyy.aria.core.Aria;
|
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.NetAndLaunchData;
|
||||||
import com.mjsheng.myappstore.bean.StudentsInfo;
|
import com.mjsheng.myappstore.bean.StudentsInfo;
|
||||||
import com.mjsheng.myappstore.bean.UploadAppInfo;
|
import com.mjsheng.myappstore.bean.UploadAppInfo;
|
||||||
import com.mjsheng.myappstore.bean.UserInfo;
|
|
||||||
import com.mjsheng.myappstore.comm.CommonDatas;
|
import com.mjsheng.myappstore.comm.CommonDatas;
|
||||||
import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
|
import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
|
||||||
import com.mjsheng.myappstore.network.HTTPInterface;
|
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.SystemSettingApi;
|
||||||
import com.mjsheng.myappstore.network.api.UploadAppInfoApi;
|
import com.mjsheng.myappstore.network.api.UploadAppInfoApi;
|
||||||
import com.mjsheng.myappstore.server.MyDownloadService;
|
import com.mjsheng.myappstore.server.MyDownloadService;
|
||||||
import com.mjsheng.myappstore.utils.ApkUtils;
|
|
||||||
import com.mjsheng.myappstore.utils.Configure;
|
import com.mjsheng.myappstore.utils.Configure;
|
||||||
import com.mjsheng.myappstore.utils.ExampleUtil;
|
import com.mjsheng.myappstore.utils.ExampleUtil;
|
||||||
import com.mjsheng.myappstore.utils.MySQLData;
|
import com.mjsheng.myappstore.utils.MySQLData;
|
||||||
@@ -923,6 +920,7 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
private void initJpush() {
|
private void initJpush() {
|
||||||
JPushInterface.init(this);
|
JPushInterface.init(this);
|
||||||
setAlias();
|
setAlias();
|
||||||
|
|
||||||
String rid = JPushInterface.getRegistrationID(MainActivity.this);
|
String rid = JPushInterface.getRegistrationID(MainActivity.this);
|
||||||
if (!rid.isEmpty()) {
|
if (!rid.isEmpty()) {
|
||||||
// ToastUtil.debugShow("RegId:" + rid);
|
// ToastUtil.debugShow("RegId:" + rid);
|
||||||
@@ -1050,6 +1048,7 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
String appstore = "com.jiaoguanyi.appstore";
|
String appstore = "com.jiaoguanyi.appstore";
|
||||||
String store = "com.jiaoguanyi.store";
|
String store = "com.jiaoguanyi.store";
|
||||||
String iflytek = "iflytek.eface2sdk";
|
String iflytek = "iflytek.eface2sdk";
|
||||||
|
// String iflytek = "com.estrongs.android.pop";
|
||||||
if (!TextUtils.isEmpty(result)) {
|
if (!TextUtils.isEmpty(result)) {
|
||||||
LogUtils.e(result);
|
LogUtils.e(result);
|
||||||
if (!result.contains(appstore)) {
|
if (!result.contains(appstore)) {
|
||||||
@@ -1483,12 +1482,12 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Intent intent2 = new Intent("qch_camera_forbid");
|
// Intent intent2 = new Intent("qch_camera_forbid");
|
||||||
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
||||||
sendBroadcast(intent2);
|
// sendBroadcast(intent2);
|
||||||
Intent intent1 = new Intent("qch_camera_open");
|
// Intent intent1 = new Intent("qch_camera_open");
|
||||||
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
||||||
sendBroadcast(intent1);
|
// sendBroadcast(intent1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -733,12 +733,12 @@ public class HTTPInterface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Intent intent2 = new Intent("qch_camera_forbid");
|
// Intent intent2 = new Intent("qch_camera_forbid");
|
||||||
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
||||||
context.sendBroadcast(intent2);
|
// context.sendBroadcast(intent2);
|
||||||
Intent intent1 = new Intent("qch_camera_open");
|
// Intent intent1 = new Intent("qch_camera_open");
|
||||||
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
||||||
context.sendBroadcast(intent1);
|
// context.sendBroadcast(intent1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -633,12 +633,12 @@ public class InitJpushServer extends Service {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Intent intent2 = new Intent("qch_camera_forbid");
|
// Intent intent2 = new Intent("qch_camera_forbid");
|
||||||
intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
// intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
|
||||||
sendBroadcast(intent2);
|
// sendBroadcast(intent2);
|
||||||
Intent intent1 = new Intent("qch_camera_open");
|
// Intent intent1 = new Intent("qch_camera_open");
|
||||||
intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
// intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
|
||||||
sendBroadcast(intent1);
|
// sendBroadcast(intent1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -603,13 +603,17 @@ public class ApkUtils {
|
|||||||
}};
|
}};
|
||||||
public static List<String> systemapp = new ArrayList<String>() {{
|
public static List<String> systemapp = new ArrayList<String>() {{
|
||||||
//需要管控的系统应用
|
//需要管控的系统应用
|
||||||
this.add("com.android.gallery3d");
|
this.add("com.android.gallery3d");//图库
|
||||||
this.add("com.android.deskclock");
|
this.add("com.android.deskclock");//时钟
|
||||||
this.add("com.android.music");
|
this.add("com.android.music");//音乐
|
||||||
this.add("com.mediatek.camera");
|
this.add("com.mediatek.camera");//相机
|
||||||
this.add("com.android.documentsui");
|
this.add("com.android.documentsui");//文件
|
||||||
this.add("com.android.soundrecorder");
|
this.add("com.android.soundrecorder");//录音机
|
||||||
this.add("com.android.browser");
|
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");//通讯录
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user