From 8ce028379cbcf4827e8010e64cf3a22f94952b35 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Tue, 2 Dec 2025 15:37:29 +0800 Subject: [PATCH] fix bugs. --- MainModule/src/main/AndroidManifest.xml | 10 --- .../room/fragment/SingSongFragment.java | 4 +- .../user/activity/SettingActivity.java | 74 +++++++++---------- .../src/main/res/layout/activity_setting.xml | 2 + app/build.gradle | 6 +- app/src/main/AndroidManifest.xml | 11 --- .../java/com/qxcm/qxlive/FileProvider.java | 3 - 7 files changed, 44 insertions(+), 66 deletions(-) delete mode 100644 app/src/main/java/com/qxcm/qxlive/FileProvider.java diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml index e5d5ffc4..a67567df 100644 --- a/MainModule/src/main/AndroidManifest.xml +++ b/MainModule/src/main/AndroidManifest.xml @@ -210,16 +210,6 @@ android:name=".service.CancelNoticeService" android:enabled="true" android:exported="true" /> - - \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java index 6652ccee..739268c6 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java @@ -1061,8 +1061,10 @@ public class SingSongFragment extends BaseRoomFragment() { - @SuppressLint("CheckResult") - @Override - public void subscribe(ObservableEmitter emitter) throws Exception { - try { - File file = new File(Application.Companion.getInstance().getAppContent()); - - if (FileUtils.isFileExists(file.getParent() +"/DataInfo.zip")){ - FileUtils.delete(file.getParent() +"/DataInfo.zip"); - } - boolean isZip = ZipUtils.zipFile(Application.Companion.getInstance().getAppContent(), - file.getParent() +"/DataInfo.zip"); - emitter.onNext(isZip); - }catch (Exception e){ - LogUtils.e("压缩失败",e.toString()); - emitter.onNext(false); - } - } - }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer() { - @SuppressLint("CheckResult") - @Override - public void accept(Boolean aBoolean) { - disLoading(); - if (aBoolean){ - File file = new File(Application.Companion.getInstance().getAppContent()+"/DataInfo.zip"); - Uri uri = FileProvider.getUriForFile(SettingActivity.this, getPackageName()+".fileprovider", file); - Intent intent = new Intent(Intent.ACTION_SEND); - intent.setType("*/*"); - intent.putExtra(Intent.EXTRA_STREAM, uri); - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - startActivity(Intent.createChooser(intent,"分享到")); - }else { - LogUtils.e("压缩失败"); - } - } - }); +// showLoading("正在生成分享文件..."); +// Observable.create(new ObservableOnSubscribe() { +// @SuppressLint("CheckResult") +// @Override +// public void subscribe(ObservableEmitter emitter) throws Exception { +// try { +// File file = new File(Application.Companion.getInstance().getAppContent()); +// +// if (FileUtils.isFileExists(file.getParent() +"/DataInfo.zip")){ +// FileUtils.delete(file.getParent() +"/DataInfo.zip"); +// } +// boolean isZip = ZipUtils.zipFile(Application.Companion.getInstance().getAppContent(), +// file.getParent() +"/DataInfo.zip"); +// emitter.onNext(isZip); +// }catch (Exception e){ +// LogUtils.e("压缩失败",e.toString()); +// emitter.onNext(false); +// } +// } +// }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer() { +// @SuppressLint("CheckResult") +// @Override +// public void accept(Boolean aBoolean) { +// disLoading(); +// if (aBoolean){ +// File file = new File(Application.Companion.getInstance().getAppContent()+"/DataInfo.zip"); +// Uri uri = FileProvider.getUriForFile(SettingActivity.this, getPackageName()+".fileprovider", file); +// Intent intent = new Intent(Intent.ACTION_SEND); +// intent.setType("*/*"); +// intent.putExtra(Intent.EXTRA_STREAM, uri); +// intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); +// startActivity(Intent.createChooser(intent,"分享到")); +// }else { +// LogUtils.e("压缩失败"); +// } +// } +// }); } } private void showYouthModelDialog() { diff --git a/MainModule/src/main/res/layout/activity_setting.xml b/MainModule/src/main/res/layout/activity_setting.xml index 7e992d8f..4a950f97 100644 --- a/MainModule/src/main/res/layout/activity_setting.xml +++ b/MainModule/src/main/res/layout/activity_setting.xml @@ -411,6 +411,8 @@ android:visibility="gone" android:layout_gravity="start" android:padding="@dimen/dp_40" + android:clickable="false" + android:focusable="false" android:layout_marginTop="-50dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/app/build.gradle b/app/build.gradle index b33c02b1..ba69b8ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,8 +63,7 @@ android { // 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标） manifestPlaceholders = [ - appIcon: "@mipmap/ic_launcher", // 需在main/res/mipmap放置该图标 - fileProviderAuthority: "com.qxcm.qxlive.provider" + appIcon: "@mipmap/ic_launcher" // 需在main/res/mipmap放置该图标 ] } @@ -81,8 +80,7 @@ android { // // // 【测试版图标】替换为测试专用图标 manifestPlaceholders = [ - appIcon: "@mipmap/ic_launcher_app_bat", // 需在main/res/mipmap放置该图标 - fileProviderAuthority: "com.qxcm.qxlive.beta.provider" + appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标 ] } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a93d35d9..dbd0b611 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -202,17 +202,6 @@ android:exported="true" /> - - - diff --git a/app/src/main/java/com/qxcm/qxlive/FileProvider.java b/app/src/main/java/com/qxcm/qxlive/FileProvider.java deleted file mode 100644 index 1b378129..00000000 --- a/app/src/main/java/com/qxcm/qxlive/FileProvider.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.qxcm.qxlive; - -public class FileProvider extends androidx.core.content.FileProvider {}