diff --git a/app/build.gradle b/app/build.gradle index 6c02781..fb218f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,9 +105,9 @@ android { newl { flavorDimensions "default" -// versionCode 168 - versionCode 1036 - versionName "1.2.8" + versionCode 169 +// versionCode 1036 + versionName "1.2.9" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java index 31f5f92..12a4960 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java @@ -621,7 +621,7 @@ public class MainPresenter implements MainContact.Presenter { int code = jsonObject.get("code").getAsInt(); if (code == 200) { String data = jsonObject.get("data").getAsJsonObject().get("result").getAsString(); - JGYUtils.getInstance().writeAppPackageList(data); + JGYUtils.getInstance().writeAppPackageList(mContext,data); mView.getAppLimitFinished(data); } else { mView.getAppLimitFinished(""); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java index 275de1c..fa7faf1 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java @@ -8,6 +8,7 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.provider.Settings; import android.util.Log; import android.webkit.WebSettings; import android.webkit.WebView; @@ -60,10 +61,10 @@ public class SplashActivity extends AppCompatActivity { // setWebView(); // hideStatusBar(); Log.e(TAG, "DebugTest: " + HttpHeaders.getUserAgent()); + boolean qch_force_app = Settings.System.putString(getContentResolver(), "qch_launcher_icon_app", ""); + Log.e(TAG, "DebugTest: "+ Settings.System.getString(getContentResolver(), "qch_launcher_icon_app")); } - - @SuppressLint("NewApi") private void hideStatusBar() { StatusBarManager mStatusBarManager = (StatusBarManager) getApplicationContext().getSystemService(Context.STATUS_BAR_SERVICE); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java b/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java index da50fc8..89f5852 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java @@ -54,6 +54,7 @@ public class MainService extends Service implements MainContact.MainView { mPresenter = new MainPresenter(this); mPresenter.attachView(this); registerReceivers(); + addShortcut(); super.onCreate(); } @@ -90,6 +91,11 @@ public class MainService extends Service implements MainContact.MainView { return START_STICKY; } + private void addShortcut(){ + String result = Settings.System.getString(getContentResolver(), "qch_app_forbid"); + ApkUtils.addShortcut(MainService.this, result); + } + private void registerReceivers() { registerLockScreenReceiver(); registerTimeReceiver(); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java index 8c3e19a..b9a3fb5 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java @@ -994,14 +994,16 @@ public class ApkUtils { } public static void addShortcut(Context context, String packageList) { + Log.e("addShortcut", "addShortcut: " + packageList); if (TextUtils.isEmpty(packageList)) { + Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", ""); return; } String[] stringList = packageList.split(","); List packages = new ArrayList<>(Arrays.asList(stringList)); String installedList = ""; for (String s : packages) { - if (s.equals("com.jiaoguanyi.store") || s.equals("com.jiaoguanyi.appstore")) { + if ("com.jiaoguanyi.store".equals(s) || "com.jiaoguanyi.appstore".equals(s)) { continue; } if (!ApkUtils.isAvailable(context, s)) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java index 0055d3e..932decd 100644 --- a/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java @@ -427,7 +427,8 @@ public class JGYUtils { SysSettingUtils.setSystemSetting(mContext, data); } - public void writeAppPackageList(String result) { + public void writeAppPackageList(Context context, String result) { + ApkUtils.addShortcut(context, result); String appstore = "com.jiaoguanyi.appstore"; String store = "com.jiaoguanyi.store"; String info = "com.info.sn";