YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix bugs.

Browse Source
This commit is contained in:
骆召亮
2025-12-02 15:37:29 +08:00
parent 7bf2297750
commit 8ce028379c
7 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MainModule/src/main/AndroidManifest.xml
View File

@@ -210,16 +210,6 @@
android:name=".service.CancelNoticeService" android:name=".service.CancelNoticeService"
android:enabled="true" android:enabled="true"
android:exported="true" /> android:exported="true" />
<!-- <provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>-->
</application> </application>
</manifest> </manifest>

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
View File

@@ -1061,8 +1061,10 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
break; break;
} }
} }
if (pitBean.getPit_number().isEmpty())
return;
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) { if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number() != null ? roomPitBean.getPit_number() : "0")); wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
} else { } else {
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()), 1); wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()), 1);
} }

74
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
View File

@@ -233,43 +233,43 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
}else if (id == R.id.ll_send_log){ }else if (id == R.id.ll_send_log){
MvpPre.sendAppLog(); MvpPre.sendAppLog();
}else if (id == R.id.tv_share) { }else if (id == R.id.tv_share) {
showLoading("正在生成分享文件..."); // showLoading("正在生成分享文件...");
Observable.create(new ObservableOnSubscribe<Boolean>() { // Observable.create(new ObservableOnSubscribe<Boolean>() {
@SuppressLint("CheckResult") // @SuppressLint("CheckResult")
@Override // @Override
public void subscribe(ObservableEmitter<Boolean> emitter) throws Exception { // public void subscribe(ObservableEmitter<Boolean> emitter) throws Exception {
try { // try {
File file = new File(Application.Companion.getInstance().getAppContent()); // File file = new File(Application.Companion.getInstance().getAppContent());
//
if (FileUtils.isFileExists(file.getParent() +"/DataInfo.zip")){ // if (FileUtils.isFileExists(file.getParent() +"/DataInfo.zip")){
FileUtils.delete(file.getParent() +"/DataInfo.zip"); // FileUtils.delete(file.getParent() +"/DataInfo.zip");
} // }
boolean isZip = ZipUtils.zipFile(Application.Companion.getInstance().getAppContent(), // boolean isZip = ZipUtils.zipFile(Application.Companion.getInstance().getAppContent(),
file.getParent() +"/DataInfo.zip"); // file.getParent() +"/DataInfo.zip");
emitter.onNext(isZip); // emitter.onNext(isZip);
}catch (Exception e){ // }catch (Exception e){
LogUtils.e("压缩失败",e.toString()); // LogUtils.e("压缩失败",e.toString());
emitter.onNext(false); // emitter.onNext(false);
} // }
} // }
}).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<Boolean>() { // }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<Boolean>() {
@SuppressLint("CheckResult") // @SuppressLint("CheckResult")
@Override // @Override
public void accept(Boolean aBoolean) { // public void accept(Boolean aBoolean) {
disLoading(); // disLoading();
if (aBoolean){ // if (aBoolean){
File file = new File(Application.Companion.getInstance().getAppContent()+"/DataInfo.zip"); // File file = new File(Application.Companion.getInstance().getAppContent()+"/DataInfo.zip");
Uri uri = FileProvider.getUriForFile(SettingActivity.this, getPackageName()+".fileprovider", file); // Uri uri = FileProvider.getUriForFile(SettingActivity.this, getPackageName()+".fileprovider", file);
Intent intent = new Intent(Intent.ACTION_SEND); // Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("*/*"); // intent.setType("*/*");
intent.putExtra(Intent.EXTRA_STREAM, uri); // intent.putExtra(Intent.EXTRA_STREAM, uri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); // intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
startActivity(Intent.createChooser(intent,"分享到")); // startActivity(Intent.createChooser(intent,"分享到"));
}else { // }else {
LogUtils.e("压缩失败"); // LogUtils.e("压缩失败");
} // }
} // }
}); // });
} }
} }
private void showYouthModelDialog() { private void showYouthModelDialog() {

2
MainModule/src/main/res/layout/activity_setting.xml
View File

@@ -411,6 +411,8 @@
android:visibility="gone" android:visibility="gone"
android:layout_gravity="start" android:layout_gravity="start"
android:padding="@dimen/dp_40" android:padding="@dimen/dp_40"
android:clickable="false"
android:focusable="false"
android:layout_marginTop="-50dp" android:layout_marginTop="-50dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>

6
app/build.gradle
View File

@@ -63,8 +63,7 @@ android {
// 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标） // 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
manifestPlaceholders = [ manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher", // 需在main/res/mipmap放置该图标 appIcon: "@mipmap/ic_launcher" // 需在main/res/mipmap放置该图标
fileProviderAuthority: "com.qxcm.qxlive.provider"
] ]
} }
@@ -81,8 +80,7 @@ android {
// //
// // 【测试版图标】替换为测试专用图标 // // 【测试版图标】替换为测试专用图标
manifestPlaceholders = [ manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher_app_bat", // 需在main/res/mipmap放置该图标 appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标
fileProviderAuthority: "com.qxcm.qxlive.beta.provider"
] ]
} }
} }

11
app/src/main/AndroidManifest.xml
View File

@@ -202,17 +202,6 @@
android:exported="true" android:exported="true"
/> />
<!--<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>-->
</application> </application>
<!-- <queries>--> <!-- <queries>-->
<!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;--> <!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;-->

3
app/src/main/java/com/qxcm/qxlive/FileProvider.java
View File

@@ -1,3 +0,0 @@
package com.qxcm.qxlive;
public class FileProvider extends androidx.core.content.FileProvider {}