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

1.4.0515 修改c2上蓝牙问题

Browse Source
This commit is contained in:
Fanhuitong
2024-05-15 15:46:07 +08:00
parent 58c36173fd
commit 367832516f
5 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -29,8 +29,8 @@ android {
defaultConfig { defaultConfig {
applicationId "com.aoleyun.sn" applicationId "com.aoleyun.sn"
versionCode 129 versionCode 130
versionName "1.4.0509" versionName "1.4.0515"
//There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature.
minSdkVersion 24 minSdkVersion 24

38
app/src/main/java/com/aoleyun/sn/base/BaseActivityLight.java
View File

@@ -1,38 +0,0 @@
package com.aoleyun.sn.base;
import android.os.Bundle;
import androidx.annotation.CallSuper;
import androidx.annotation.Nullable;
import com.aoleyun.sn.R;
import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
public abstract class BaseActivityLight extends BaseRxActivity {
public BaseActivityLight() {
super();
}
@Override
@CallSuper
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// StatusBarUtil.init(this);
UltimateBarX.statusBar(this)
.transparent()
.colorRes(R.color.colorPrimaryDark)
.light(true)
.apply();
UltimateBarX.navigationBar(this)
.transparent()
.colorRes(R.color.colorPrimaryDark)
.light(true)
.apply();
}
/**
* 设置布局
*/
protected abstract int getLayoutId();
}

1
app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java
View File

@@ -410,6 +410,7 @@ public class ApkUtils {
this.add("com.shoufei.aole"); this.add("com.shoufei.aole");
this.add("com.ygyb.yischool"); this.add("com.ygyb.yischool");
this.add("com.gaomuxuexi34");
}}; }};

1
app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
View File

@@ -2022,6 +2022,7 @@ public class JGYUtils {
public void openOTA() { public void openOTA() {
Intent intent = new Intent(Intent.ACTION_MAIN); Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
/*知道要跳转应用的包命与目标Activity*/ /*知道要跳转应用的包命与目标Activity*/
ComponentName componentName = new ComponentName("com.adups.fota", "com.adups.fota.GoogleOtaClient"); ComponentName componentName = new ComponentName("com.adups.fota", "com.adups.fota.GoogleOtaClient");
intent.setComponent(componentName); intent.setComponent(componentName);

26
app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
View File

@@ -77,10 +77,12 @@ public class SysSettingUtils {
Log.e("setDisableSetting", "Close all settings: "); Log.e("setDisableSetting", "Close all settings: ");
setPhoneList(context, 1); setPhoneList(context, 1);
setUSBstate(context, 1); setUSBstate(context, 1);
if (JGYUtils.getInstance().getAppPlatform().equals(JGYUtils.YXPD1TAG)) { if (JGYUtils.getInstance().getAppPlatform().equals(JGYUtils.YXPD1TAG)
setBluetooth(context, 1); || JGYUtils.getInstance().getAppPlatform().equals(JGYUtils.C2Tag)
} else { ) {
setBluetooth(context, 0); setBluetooth(context, 0);
} else {
setBluetooth(context, 1);
} }
setHotspot(context, 1); setHotspot(context, 1);
setBar(context, 1); setBar(context, 1);
@@ -324,7 +326,7 @@ public class SysSettingUtils {
Log.e(TAG, "setBluetooth: setting_bhtvideo no changed"); Log.e(TAG, "setBluetooth: setting_bhtvideo no changed");
} }
JGYUtils.getInstance().setBluetoothEnable(state == 1); JGYUtils.getInstance().setBluetoothEnable(state == 0);
} }
/** /**
@@ -367,13 +369,15 @@ public class SysSettingUtils {
if (old_setting_bhtvideo != setting_bhtvideo) { if (old_setting_bhtvideo != setting_bhtvideo) {
mmkv.encode(CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, setting_bhtvideo); mmkv.encode(CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, setting_bhtvideo);
String setting_context = jsonObject.get("setting_context").getAsString();
if (setting_bhtvideo == 0) { if (setting_bhtvideo == 0) {
if (null != setting_context && !"".equals(setting_context) && !" ".equals(setting_context) && !"null".equals(setting_context)) { if (jsonObject.get("setting_context").isJsonNull()) {
Log.e(TAG, "setting_context:" + setting_context); String setting_context = jsonObject.get("setting_context").getAsString();
Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, setting_context); if (null != setting_context && !"".equals(setting_context) && !" ".equals(setting_context) && !"null".equals(setting_context)) {
} else { Log.e(TAG, "setting_context:" + setting_context);
Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, "Empty"); Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, setting_context);
} else {
Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, "Empty");
}
} }
} else if (setting_bhtvideo == 1) { } else if (setting_bhtvideo == 1) {
Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, "Empty"); Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, "Empty");
@@ -382,7 +386,7 @@ public class SysSettingUtils {
Log.e(TAG, "setBluetooth: setting_bhtvideo no changed"); Log.e(TAG, "setBluetooth: setting_bhtvideo no changed");
} }
JGYUtils.getInstance().setBluetoothEnable(setting_bht == 1); JGYUtils.getInstance().setBluetoothEnable(setting_bht == 0);
} }
private static void setHotspot(Context context, int state) { private static void setHotspot(Context context, int state) {