From f4da62595d189498fb53081f6126eb64f41e6e4f Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Thu, 7 Jul 2022 16:53:50 +0800 Subject: [PATCH] =?UTF-8?q?version:2.6=20fix:=E4=BF=AE=E5=A4=8Duserdebug?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 ++ .../uiui/sn/activity/main/MainActivity.java | 12 ---------- .../com/uiui/sn/base/BaseApplication.java | 18 +++++++++++++++ .../com/uiui/sn/disklrucache/CacheHelper.java | 8 ++++++- .../uiui/sn/network/NetInterfaceManager.java | 22 ++++++++++++++++++- 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5f54204..3f7bd2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,8 +67,8 @@ android { productFlavors { beta { flavorDimensions "default" - versionCode 16 - versionName "2.5" + versionCode 17 + versionName "2.6" } official { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4c172fd..b4d2a57 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,8 @@ + + diff --git a/app/src/main/java/com/uiui/sn/activity/main/MainActivity.java b/app/src/main/java/com/uiui/sn/activity/main/MainActivity.java index 00ea090..55eb28e 100644 --- a/app/src/main/java/com/uiui/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/sn/activity/main/MainActivity.java @@ -110,18 +110,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, NetworkUtils.registerNetworkStatusChangedListener(this); - if (BuildConfig.DEBUG) { -// ApkUtils.openApp(this, "com.android.settings"); - //静音 - AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); - int ringMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_RING); - audioManager.setStreamVolume(AudioManager.STREAM_RING, ringMax, 0); - int musicMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_MUSIC); - int voiceMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_VOICE_CALL); - audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, voiceMax, 0); - audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, musicMax, 0); //音乐音量 - } - setOnClickListener(); tv_customversion.setText(JGYUtils.getCustomVersion()); tv_sn.setText("SN:" + Utils.getSerial()); diff --git a/app/src/main/java/com/uiui/sn/base/BaseApplication.java b/app/src/main/java/com/uiui/sn/base/BaseApplication.java index 4b3a19d..51693e7 100644 --- a/app/src/main/java/com/uiui/sn/base/BaseApplication.java +++ b/app/src/main/java/com/uiui/sn/base/BaseApplication.java @@ -1,6 +1,9 @@ package com.uiui.sn.base; import android.app.Application; +import android.content.Context; +import android.media.AudioManager; +import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -34,6 +37,21 @@ public class BaseApplication extends Application { super.onCreate(); //非主进程不初始化 // if (SystemUtils.isMainProcessName(this, android.os.Process.myPid())) { + if (BuildConfig.DEBUG) { +// ApkUtils.openApp(this, "com.android.settings"); + //静音 + AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + int ringMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_RING); + audioManager.setStreamVolume(AudioManager.STREAM_RING, ringMax, 0); + int musicMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_MUSIC); + int voiceMax = audioManager.getStreamMinVolumeInt(AudioManager.STREAM_VOICE_CALL); + audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, voiceMax, 0); + audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, musicMax, 0); //音乐音量 + Log.e(TAG, "debugTest: " + getExternalCacheDir()); + Log.e(TAG, "debugTest: " + getExternalFilesDir("cache")); + Log.e(TAG, "debugTest: " + getCacheDir()); + Log.e(TAG, "debugTest: " + Environment.getExternalStorageDirectory()); + } utilsInint(); // } } diff --git a/app/src/main/java/com/uiui/sn/disklrucache/CacheHelper.java b/app/src/main/java/com/uiui/sn/disklrucache/CacheHelper.java index c3c1f1a..4912b17 100644 --- a/app/src/main/java/com/uiui/sn/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/uiui/sn/disklrucache/CacheHelper.java @@ -457,7 +457,13 @@ public class CacheHelper { String cachePath; if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()) || !Environment.isExternalStorageRemovable()) { - cachePath = context.getExternalCacheDir().getPath(); + if (context.getExternalCacheDir() != null) { + cachePath = context.getExternalCacheDir().getPath(); + } else if (context.getExternalFilesDir("cache") != null) { + cachePath = context.getExternalFilesDir("cache").getPath(); + } else { + cachePath = context.getCacheDir().getPath(); + } } else { cachePath = context.getCacheDir().getPath(); } diff --git a/app/src/main/java/com/uiui/sn/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/sn/network/NetInterfaceManager.java index c40b25f..3f64472 100644 --- a/app/src/main/java/com/uiui/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/sn/network/NetInterfaceManager.java @@ -203,7 +203,7 @@ public class NetInterfaceManager { // builder.addNetworkInterceptor(mRequestInterceptor); // 设置缓存文件路径 - String cacheDirectory = mContext.getExternalCacheDir().getAbsolutePath() + "/OkHttpCache"; + String cacheDirectory = getCacheDir() + "/OkHttpCache"; Cache cache = new Cache(new File(cacheDirectory), cacheSize); builder.cache(cache);// 设置缓存 okHttpClient = builder.build(); @@ -226,7 +226,27 @@ public class NetInterfaceManager { // } } + private String getCacheDir() { + String cachePath; + if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()) + || !Environment.isExternalStorageRemovable()) { + if (mContext.getExternalCacheDir() != null) { + cachePath = mContext.getExternalCacheDir().getPath(); + } else if (mContext.getExternalFilesDir("cache") != null) { + cachePath = mContext.getExternalFilesDir("cache").getPath(); + } else { + cachePath = mContext.getCacheDir().getPath(); + } + } else { + cachePath = mContext.getCacheDir().getPath(); + } + return cachePath; + } + public static void init(Context context) { + if (context == null) { + throw new RuntimeException("context is NULL"); + } if (INSTANCE == null) { INSTANCE = new NetInterfaceManager(context); }