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

version:3.8 mtk

Browse Source 
fix:
update:优化解锁后默认桌面
This commit is contained in:
tongtongstudio
2022-08-10 11:13:19 +08:00
parent a8c0e5b9bc
commit 7c9f21ed73
4 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@@ -80,16 +80,16 @@ android {
//酷比魔方 //酷比魔方
cube { cube {
flavorDimensions "default" flavorDimensions "default"
versionCode 57 versionCode 58
versionName "6.5" versionName "6.6"
buildConfigField "String", "platform", '"ZhanRuiCube"' buildConfigField "String", "platform", '"ZhanRuiCube"'
} }
//MTK //MTK
MTKnewly { MTKnewly {
flavorDimensions "default" flavorDimensions "default"
versionCode 27 versionCode 29
versionName "3.6" versionName "3.8"
buildConfigField "String", "platform", '"MTK"' buildConfigField "String", "platform", '"MTK"'
} }
} }

2
app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl
View File

@@ -15,6 +15,6 @@ interface SystemInfoInterface {
List<String> getHideIcon(); List<String> getHideIcon();
List<String> getDisableIcon(); List<String> getDisableIcon();
String getTopAppPackage(); String getTopAppPackage();
boolean SystemPutInt(String name , int value); boolean SystemPutInt(String name, int value);
void setDefaultDesktop(String pkg); void setDefaultDesktop(String pkg);
} }

36
app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
View File

@@ -1006,7 +1006,7 @@ public class NetInterfaceManager {
JSONObject data = JSON.parseObject(jsonString); JSONObject data = JSON.parseObject(jsonString);
cacheHelper.put(UrlAddress.GET_DESKTOP, jsonString); cacheHelper.put(UrlAddress.GET_DESKTOP, jsonString);
JGYUtils.getInstance().installDesktop(data); JGYUtils.getInstance().installDesktop(data);
JGYUtils.getInstance().setDefaultDesktop(desktopInfo.getApp_package()); setDefaultDesktop(desktopInfo.getApp_package());
} else { } else {
Log.e("getDefaultDesktop", "onNext: " + "删除定制桌面"); Log.e("getDefaultDesktop", "onNext: " + "删除定制桌面");
cacheHelper.put(UrlAddress.GET_DESKTOP, ""); cacheHelper.put(UrlAddress.GET_DESKTOP, "");
@@ -1663,7 +1663,7 @@ public class NetInterfaceManager {
}.getType(); }.getType();
DefaultApp defaultApp = gson.fromJson(jsonString, type); DefaultApp defaultApp = gson.fromJson(jsonString, type);
if (defaultApp != null) { if (defaultApp != null) {
JGYUtils.getInstance().setDefaultDesktop(defaultApp.getDefault_launcher()); setDefaultDesktop(defaultApp.getDefault_launcher());
} }
callback.onComplete(); callback.onComplete();
} }
@@ -1685,18 +1685,9 @@ public class NetInterfaceManager {
int code = defaultAppBaseResponse.code; int code = defaultAppBaseResponse.code;
if (code == OK) { if (code == OK) {
DefaultApp defaultApp = defaultAppBaseResponse.data; DefaultApp defaultApp = defaultAppBaseResponse.data;
JGYUtils.getInstance().setDefaultDesktop(defaultApp.getDefault_launcher()); setDefaultDesktop(defaultApp.getDefault_launcher());
if (defaultApp.getDefault_launcher() != null) {
SPUtils.put(mContext, "default_launcher", defaultApp.getDefault_launcher());
}
} else { } else {
String default_launcher = (String) SPUtils.get(mContext, "default_launcher", ""); setDefaultDesktop(null);
Log.e("getDefaultApp", "onNext: " + default_launcher);
if (TextUtils.isEmpty(default_launcher)) {
JGYUtils.getInstance().setDefaultDesktop();
} else {
JGYUtils.getInstance().setDefaultDesktop(default_launcher);
}
Log.e("getDefaultApp", "onNext: " + defaultAppBaseResponse.msg); Log.e("getDefaultApp", "onNext: " + defaultAppBaseResponse.msg);
} }
} }
@@ -1715,6 +1706,25 @@ public class NetInterfaceManager {
}); });
} }
private void setDefaultDesktop(String defaultApp) {
int aihuaUnlock = Settings.System.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0);
if (aihuaUnlock == 1) {
JGYUtils.getInstance().setDefaultDesktop(PackageNames.DESKTOP);
} else {
if (!TextUtils.isEmpty(defaultApp)) {
JGYUtils.getInstance().setDefaultDesktop(defaultApp);
SPUtils.put(mContext, "default_launcher", defaultApp);
} else {
String default_launcher = (String) SPUtils.get(mContext, "default_launcher", "");
Log.e("getDefaultApp", "onNext: " + default_launcher);
if (TextUtils.isEmpty(default_launcher)) {
JGYUtils.getInstance().setDefaultDesktop();
} else {
JGYUtils.getInstance().setDefaultDesktop(default_launcher);
}
}
}
}
public interface StudesInfoListener { public interface StudesInfoListener {
void setStudentsInfo(StudentsInfo studentsInfo); void setStudentsInfo(StudentsInfo studentsInfo);

4
app/src/main/java/com/aoleyun/sn/service/RemoteService.java
View File

@@ -8,6 +8,7 @@ import android.provider.Settings;
import android.util.Log; import android.util.Log;
import com.aoleyun.sn.SystemInfoInterface; import com.aoleyun.sn.SystemInfoInterface;
import com.aoleyun.sn.comm.PackageNames;
import com.aoleyun.sn.utils.ForegroundAppUtil; import com.aoleyun.sn.utils.ForegroundAppUtil;
import com.aoleyun.sn.utils.JGYUtils; import com.aoleyun.sn.utils.JGYUtils;
import com.aoleyun.sn.utils.SPUtils; import com.aoleyun.sn.utils.SPUtils;
@@ -72,6 +73,9 @@ public class RemoteService extends Service {
public void setDefaultDesktop(String pkg) throws RemoteException { public void setDefaultDesktop(String pkg) throws RemoteException {
JGYUtils.getInstance().setDefaultDesktop(pkg); JGYUtils.getInstance().setDefaultDesktop(pkg);
SPUtils.put(RemoteService.this, "default_launcher", pkg); SPUtils.put(RemoteService.this, "default_launcher", pkg);
if (PackageNames.DESKTOP.equals(pkg)) {
JGYUtils.getInstance().killPackage("com.aoleyunos.dop2");
}
} }
}; };
} }