diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b1bbf6b..e1a60d8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.MyLiveWallpaper" diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/tools/AppTools.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/tools/AppTools.kt index 4606429..93bae63 100644 --- a/app/src/main/java/com/timber/soft/mylivewallpaper/tools/AppTools.kt +++ b/app/src/main/java/com/timber/soft/mylivewallpaper/tools/AppTools.kt @@ -40,7 +40,7 @@ object AppTools { } else if (Build.VERSION.SDK_INT < 29) { dirName = MyApplication.appContext.getExternalFilesDir(DIR_FILE_NAME)!!.absolutePath } - } else {//外部存储不可用 + } else { dirName = MyApplication.appContext.filesDir.absolutePath } return dirName diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt index 655894d..a11a381 100644 --- a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt +++ b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/DetailActivity.kt @@ -58,7 +58,6 @@ class DetailActivity : BaseActivity(), View.OnClickListener { target: Target?, isFirstResource: Boolean ): Boolean { - // 加载失败时的处理 binding.detailsProgressbar.visibility = View.INVISIBLE binding.detailsLoadingErr.visibility = View.VISIBLE Toast.makeText( @@ -74,7 +73,6 @@ class DetailActivity : BaseActivity(), View.OnClickListener { dataSource: DataSource?, isFirstResource: Boolean ): Boolean { - // 图片加载完成时的处理 binding.detailsProgressbar.visibility = View.INVISIBLE binding.detailsPlayButton.visibility = View.VISIBLE return false @@ -151,5 +149,4 @@ class DetailActivity : BaseActivity(), View.OnClickListener { return isExist(wallpaperData.preview) } - } \ No newline at end of file diff --git a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/StartActivity.kt b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/StartActivity.kt index 1912831..54f2c60 100644 --- a/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/StartActivity.kt +++ b/app/src/main/java/com/timber/soft/mylivewallpaper/ui/activity/StartActivity.kt @@ -33,12 +33,12 @@ class StartActivity : BaseActivity() { private fun startMainActivity() { val intent = Intent(this, MainActivity::class.java) startActivity(intent) - finish() // 结束当前的启动页 + finish() } override fun onDestroy() { super.onDestroy() - coroutineScope.cancel() // 取消协程以防止内存泄漏 + coroutineScope.cancel() } } \ No newline at end of file diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..3fc3b82 --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,6 @@ + + + + d.c-launcher.com + + \ No newline at end of file