version:1.5.0707
bugfixes:allwinner接口优化至manager
This commit is contained in:
@@ -6,7 +6,6 @@ import android.bluetooth.BluetoothAdapter;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.cube.SuperPower;
|
||||
import android.cubemdm.cubemdmmanager.CubeMdmManager;
|
||||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
@@ -18,6 +17,7 @@ import com.aoleyun.sn.bean.SnSetting;
|
||||
import com.aoleyun.sn.comm.CommonConfig;
|
||||
import com.aoleyun.sn.comm.JGYActions;
|
||||
import com.aoleyun.sn.gson.GsonUtils;
|
||||
import com.aoleyun.sn.manager.AllwinnerCubeMdmManager;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
@@ -197,9 +197,7 @@ public class SysSettingUtils {
|
||||
if (!BuildConfig.DEBUG) {
|
||||
if (JgyUtils.isCubeDevice()) {
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setUsbStatus(state);
|
||||
Log.e(TAG, "setUsbStatus: state = " + state);
|
||||
AllwinnerCubeMdmManager.getInstance().setUsbStatus(state);
|
||||
} else {
|
||||
SuperPower mService = (SuperPower) context.getSystemService("mdm");
|
||||
mService.setUsbDataDisabled(true);
|
||||
@@ -259,16 +257,15 @@ public class SysSettingUtils {
|
||||
break;
|
||||
}
|
||||
} else if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
switch (setting_usb) {
|
||||
case "usb_charge":
|
||||
cubeMdmManager.setUsbStatus(0);
|
||||
AllwinnerCubeMdmManager.getInstance().setUsbStatus(0);
|
||||
break;
|
||||
case "usb_mtp":
|
||||
cubeMdmManager.setUsbStatus(1);
|
||||
AllwinnerCubeMdmManager.getInstance().setUsbStatus(1);
|
||||
break;
|
||||
case "usb_midi":
|
||||
cubeMdmManager.setUsbStatus(2);
|
||||
AllwinnerCubeMdmManager.getInstance().setUsbStatus(2);
|
||||
break;
|
||||
default:
|
||||
}
|
||||
@@ -361,11 +358,7 @@ public class SysSettingUtils {
|
||||
}
|
||||
|
||||
JgyUtils.getInstance().setBluetoothEnable(state == 0);
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setBluetoothEnable(state == 0);
|
||||
Log.e(TAG, "setBluetoothEnable: " + (state == 0));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setBluetoothEnable(state == 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -469,11 +462,7 @@ public class SysSettingUtils {
|
||||
|
||||
JgyUtils.getInstance().setBluetoothEnable(setting_bht == 0);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setBluetoothEnable(setting_bht == 0);
|
||||
Log.e(TAG, "setBluetoothEnable: " + (setting_bht == 0));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setBluetoothEnable(setting_bht == 0);
|
||||
}
|
||||
|
||||
private static void setHotspot(Context context, int state) {
|
||||
@@ -485,11 +474,7 @@ public class SysSettingUtils {
|
||||
boolean aole_hotspot_forbid_on = Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_HOTSPOT_FORBID_ON, state);
|
||||
Log.e(TAG, "aole_hotspot_forbid_on:" + aole_hotspot_forbid_on);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setWifiHotSpotStatus(state);
|
||||
Log.e(TAG, "setWifiHotSpotStatus: " + state);
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setWifiHotSpotStatus(state);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setHotspot: " + e.getMessage());
|
||||
}
|
||||
@@ -508,11 +493,7 @@ public class SysSettingUtils {
|
||||
Log.e(TAG, "aole_hotspot_forbid_on---------" + setting_hotspot);
|
||||
Log.e(TAG, "aole_hotspot_forbid_on---------" + aole_hotspot_forbid_on);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setWifiHotSpotStatus(setting_hotspot);
|
||||
Log.e(TAG, "setWifiHotSpotStatus: " + setting_hotspot);
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setWifiHotSpotStatus(setting_hotspot);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setHotspot: " + e.getMessage());
|
||||
}
|
||||
@@ -585,11 +566,7 @@ public class SysSettingUtils {
|
||||
Intent navIntent = new Intent(navigationStatus);
|
||||
context.sendBroadcast(navIntent);
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setNavigationStatus(setting_navigation == 0);
|
||||
Log.e(TAG, "setBar: setNavigationStatus = " + (setting_navigation == 0));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setNavigationStatus(setting_navigation == 0);
|
||||
|
||||
//状态栏显示开关
|
||||
int setting_statusbar = changeNum(jsonObject.get("setting_statusbar").getAsInt());
|
||||
@@ -615,11 +592,7 @@ public class SysSettingUtils {
|
||||
context.sendBroadcast(statusIntent);
|
||||
// }
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setStatusBarEnable(setting_statusbar == 0);
|
||||
Log.e(TAG, "setBar: setStatusBarEnable = " + (setting_statusbar == 0));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setStatusBarEnable(setting_statusbar == 0);
|
||||
}
|
||||
|
||||
private static void setCamera(Context context, int state) {
|
||||
@@ -672,40 +645,36 @@ public class SysSettingUtils {
|
||||
|
||||
private static void setTF(Context context, int state) {
|
||||
//存储卡
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setSDEnable(state == 0);
|
||||
Log.e(TAG, "setTF: setSDEnable = " + (state == 0));
|
||||
} else {
|
||||
JgyUtils.getInstance().setSDOTGEnable(state == 0);
|
||||
boolean aole_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_SDCARD_FORBID_ON, state);
|
||||
Log.e(TAG, "setTF: aole_sdcard_forbid_on = " + aole_sdcard_forbid_on);
|
||||
AllwinnerCubeMdmManager.getInstance().setSDEnable(state == 0);
|
||||
|
||||
try {
|
||||
//tfmedia开关
|
||||
JgyUtils.getInstance().setSDOTGEnable(state == 0);
|
||||
boolean aole_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_SDCARD_FORBID_ON, state);
|
||||
Log.e(TAG, "setTF: aole_sdcard_forbid_on = " + aole_sdcard_forbid_on);
|
||||
|
||||
try {
|
||||
//tfmedia开关
|
||||
// int setting_tfmedia = 1;
|
||||
boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", state);
|
||||
Log.e(TAG, "setting_tfmedia---------" + qch_tfmedia_forbid);
|
||||
String tfmediaStatus = "";
|
||||
switch (state) {
|
||||
case 0:
|
||||
tfmediaStatus = "qch_tfmedia_open";
|
||||
break;
|
||||
case 1:
|
||||
tfmediaStatus = "qch_tfmedia_forbid";
|
||||
break;
|
||||
}
|
||||
Intent tfmediaIntent = new Intent(tfmediaStatus).setPackage("com.android.settings");
|
||||
context.sendBroadcast(tfmediaIntent);
|
||||
if (state == 1) {
|
||||
boolean qch_tfmedia_filetypes = Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", "Empty");//影音管控
|
||||
Log.e(TAG, "qch_tfmedia_filetypes:" + qch_tfmedia_filetypes);
|
||||
} else {
|
||||
Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setTF: " + e.getMessage());
|
||||
boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", state);
|
||||
Log.e(TAG, "setting_tfmedia---------" + qch_tfmedia_forbid);
|
||||
String tfmediaStatus = "";
|
||||
switch (state) {
|
||||
case 0:
|
||||
tfmediaStatus = "qch_tfmedia_open";
|
||||
break;
|
||||
case 1:
|
||||
tfmediaStatus = "qch_tfmedia_forbid";
|
||||
break;
|
||||
}
|
||||
Intent tfmediaIntent = new Intent(tfmediaStatus).setPackage("com.android.settings");
|
||||
context.sendBroadcast(tfmediaIntent);
|
||||
if (state == 1) {
|
||||
boolean qch_tfmedia_filetypes = Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", "Empty");//影音管控
|
||||
Log.e(TAG, "qch_tfmedia_filetypes:" + qch_tfmedia_filetypes);
|
||||
} else {
|
||||
Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setTF: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -716,53 +685,49 @@ public class SysSettingUtils {
|
||||
private static void setTF(Context context, JsonObject jsonObject) {
|
||||
//存储卡
|
||||
int setting_memory = changeNum(jsonObject.get("setting_memory").getAsInt());
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setSDEnable(setting_memory == 0);
|
||||
Log.e(TAG, "setTF: setSDEnable = " + (setting_memory == 0));
|
||||
} else {
|
||||
Log.e(TAG, "setTF: setting_memory = " + setting_memory);
|
||||
JgyUtils.getInstance().setSDOTGEnable(setting_memory == 0);
|
||||
boolean aole_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_SDCARD_FORBID_ON, setting_memory);
|
||||
Log.e(TAG, "setTF: aole_sdcard_forbid_on = " + aole_sdcard_forbid_on);
|
||||
AllwinnerCubeMdmManager.getInstance().setSDEnable(setting_memory == 0);
|
||||
|
||||
try {
|
||||
int setting_tfmedia = jsonObject.get("setting_tfmedia").getAsInt();
|
||||
Log.e(TAG, "setTF: setting_memory = " + setting_memory);
|
||||
JgyUtils.getInstance().setSDOTGEnable(setting_memory == 0);
|
||||
boolean aole_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_SDCARD_FORBID_ON, setting_memory);
|
||||
Log.e(TAG, "setTF: aole_sdcard_forbid_on = " + aole_sdcard_forbid_on);
|
||||
|
||||
try {
|
||||
int setting_tfmedia = jsonObject.get("setting_tfmedia").getAsInt();
|
||||
// if (JgyUtils.isOfficialVersion() ) {
|
||||
// setting_tfmedia = changeNum(setting_tfmedia);
|
||||
// }
|
||||
boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", setting_tfmedia);
|
||||
Log.e(TAG, "setting_tfmedia---------" + qch_tfmedia_forbid);
|
||||
String tfmediaStatus = "";
|
||||
switch (setting_tfmedia) {
|
||||
case 0:
|
||||
Log.e(TAG, "setting_tfmedia: " + "打开");
|
||||
tfmediaStatus = "qch_tfmedia_open";
|
||||
break;
|
||||
case 1:
|
||||
Log.e(TAG, "setting_tfmedia: " + "禁止");
|
||||
tfmediaStatus = "qch_tfmedia_forbid";
|
||||
break;
|
||||
}
|
||||
Intent tfmediaIntent = new Intent(tfmediaStatus).setPackage("com.android.settings");
|
||||
context.sendBroadcast(tfmediaIntent);
|
||||
if (setting_tfmedia == 1) {
|
||||
JsonArray jSONArray = jsonObject.get("setting_tfmedia_format").getAsJsonArray();
|
||||
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
for (int i = 0; i < jSONArray.size(); i++) {
|
||||
stringBuffer.append(jSONArray.get(i).toString());
|
||||
stringBuffer.append(",");
|
||||
}
|
||||
stringBuffer.deleteCharAt(stringBuffer.length() - 1);
|
||||
Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", stringBuffer.toString());//影音管控
|
||||
Log.e(TAG, "qch_tfmedia_filetypes---------" + stringBuffer.toString());
|
||||
} else {
|
||||
Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setTF: " + e.getMessage());
|
||||
boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", setting_tfmedia);
|
||||
Log.e(TAG, "setting_tfmedia---------" + qch_tfmedia_forbid);
|
||||
String tfmediaStatus = "";
|
||||
switch (setting_tfmedia) {
|
||||
case 0:
|
||||
Log.e(TAG, "setting_tfmedia: " + "打开");
|
||||
tfmediaStatus = "qch_tfmedia_open";
|
||||
break;
|
||||
case 1:
|
||||
Log.e(TAG, "setting_tfmedia: " + "禁止");
|
||||
tfmediaStatus = "qch_tfmedia_forbid";
|
||||
break;
|
||||
}
|
||||
Intent tfmediaIntent = new Intent(tfmediaStatus).setPackage("com.android.settings");
|
||||
context.sendBroadcast(tfmediaIntent);
|
||||
if (setting_tfmedia == 1) {
|
||||
JsonArray jSONArray = jsonObject.get("setting_tfmedia_format").getAsJsonArray();
|
||||
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
for (int i = 0; i < jSONArray.size(); i++) {
|
||||
stringBuffer.append(jSONArray.get(i).toString());
|
||||
stringBuffer.append(",");
|
||||
}
|
||||
stringBuffer.deleteCharAt(stringBuffer.length() - 1);
|
||||
Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", stringBuffer.toString());//影音管控
|
||||
Log.e(TAG, "qch_tfmedia_filetypes---------" + stringBuffer.toString());
|
||||
} else {
|
||||
Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "setTF: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -785,11 +750,7 @@ public class SysSettingUtils {
|
||||
Log.e(TAG, "setCanReset: state = " + state);
|
||||
Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_RESTORE_FORBID_ON, state);
|
||||
//默认打开
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setResetFactoryEnable(state == 0);
|
||||
Log.e(TAG, "setCanReset: setResetFactoryEnable = " + (state == 0));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setResetFactoryEnable(state == 0);
|
||||
}
|
||||
|
||||
//aole_restore_forbid_on=1,禁止恢复出厂设置
|
||||
@@ -803,11 +764,7 @@ public class SysSettingUtils {
|
||||
Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_RESTORE_FORBID_ON, 1);
|
||||
}
|
||||
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setResetFactoryEnable(mode == 1);
|
||||
Log.e(TAG, "setCanReset: setResetFactoryEnable = " + (mode == 1));
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setResetFactoryEnable(mode == 1);
|
||||
}
|
||||
|
||||
//系统默认“使用网络提供时间”且不可点击
|
||||
@@ -962,10 +919,7 @@ public class SysSettingUtils {
|
||||
int is_app_install = appInstall.getAsInt();
|
||||
Log.e(TAG, "setAdminApp: is_app_install = " + is_app_install);
|
||||
Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, is_app_install);
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setInstallPackageEnable(is_app_install == 1);
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setInstallPackageEnable(is_app_install == 1);
|
||||
} else {
|
||||
Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, 0);
|
||||
}
|
||||
@@ -991,10 +945,7 @@ public class SysSettingUtils {
|
||||
|
||||
private static void setAdminApp(Context context, int state) {
|
||||
Log.e(TAG, "setAdminApp: state = " + state);
|
||||
if (JgyUtils.isAllWinnerDevice()) {
|
||||
CubeMdmManager cubeMdmManager = (CubeMdmManager) context.getSystemService("cube_mdm");
|
||||
cubeMdmManager.setInstallPackageEnable(state == 0);
|
||||
}
|
||||
AllwinnerCubeMdmManager.getInstance().setInstallPackageEnable(state == 0);
|
||||
Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, changeNum(state));
|
||||
Settings.Global.putInt(context.getContentResolver(), "is_admin_app", changeNum(state));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user