Skip to content

HBHAndroid
HBHAndroid
Commit 87cb65f6 authored by 杨秀秀's avatar 杨秀秀
Browse files
Options

基础搭建 

功能开发
1.1.0
parent ea1d9555
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 88 deletions
.idea/workspace.xml
View file @ 87cb65f6
This diff is collapsed.
app/build.gradle
View file @ 87cb65f6
...@@ -38,7 +38,7 @@ android { ...@@ -38,7 +38,7 @@ android {
minSdk 23 minSdk 23
targetSdk 31 targetSdk 31
versionCode 2 versionCode 2
versionName "1.0.1" versionName "1.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.reseale signingConfig signingConfigs.reseale
......
consumer/build.gradle
View file @ 87cb65f6
...@@ -34,8 +34,8 @@ android { ...@@ -34,8 +34,8 @@ android {
applicationId "com.xx.hbhconsumer" applicationId "com.xx.hbhconsumer"
minSdk 23 minSdk 23
targetSdk 31 targetSdk 31
versionCode 1 versionCode 2
versionName "1.0.0" versionName "1.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
......
hbhbcompany/build.gradle
View file @ 87cb65f6
...@@ -37,8 +37,8 @@ android { ...@@ -37,8 +37,8 @@ android {
applicationId "com.xx.hbhbcompany" applicationId "com.xx.hbhbcompany"
minSdk 24 minSdk 24
targetSdk 31 targetSdk 31
versionCode 1 versionCode 2
versionName "1.0.1" versionName "1.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
View file @ 87cb65f6
...@@ -208,45 +208,87 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie ...@@ -208,45 +208,87 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE)) if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{ {
ToastUtils.showLong(o.get("pMsg").toString());
showCommTextDialog(new RefuseDialogBean(o.get("pMsg").toString() + ",是否同意", "同意", "拒绝"), new CommTextDialog.onAcceptCallBack() {
@Override
public void acceptBack() {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Boolean aBoolean) {
if (aBoolean)
{
boolean hasCamera = (boolean) o.get("hasCamera");
int maxCount = (int) o.get("maxCount");
if (o.get("maxCount") == null) {
maxCount = 1;
}
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, maxCount, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
@Override
public void onError(@NonNull Throwable e) {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
@Override
public void onComplete() {
}
});
}
} @Override
public void refuseBack() {
}
});
}else {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() { }
@Override
public void onSubscribe(@NonNull Disposable d) {
} @Override
public void onNext(@NonNull Boolean aBoolean) {
@Override if (aBoolean)
public void onNext(@NonNull Boolean aBoolean) { {
boolean hasCamera = (boolean) o.get("hasCamera");
int maxCount = (int) o.get("maxCount");
if (o.get("maxCount") == null) {
maxCount = 1;
}
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, maxCount, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
if (aBoolean) @Override
{ public void onError(@NonNull Throwable e) {
boolean hasCamera = (boolean) o.get("hasCamera");
int maxCount = (int) o.get("maxCount");
if (o.get("maxCount") == null) {
maxCount = 1;
}
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, maxCount, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
@Override }
public void onError(@NonNull Throwable e) {
} @Override
public void onComplete() {
}
});
}
@Override
public void onComplete() {
}
});
} }
}); });
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
View file @ 87cb65f6
...@@ -204,42 +204,87 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -204,42 +204,87 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE)) if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{ {
ToastUtils.showShort(o.get("pMsg").toString());
showCommTextDialog(new RefuseDialogBean(o.get("pMsg").toString() + ",是否同意", "同意", "拒绝"), new CommTextDialog.onAcceptCallBack() {
@Override
public void acceptBack() {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Boolean aBoolean) {
if (aBoolean)
{
boolean hasCamera = (boolean) o.get("hasCamera");
int maxCount = (int) o.get("maxCount");
if (o.get("maxCount") == null) {
maxCount = 1;
}
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
@Override
public void onError(@NonNull Throwable e) {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
@Override
public void onComplete() {
}
});
}
} @Override
public void refuseBack() {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() { }
@Override });
public void onSubscribe(@NonNull Disposable d) { }else {
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull Boolean aBoolean) { public void onNext(@NonNull Boolean aBoolean) {
if (aBoolean)
{
boolean hasCamera = (boolean) o.get("hasCamera");
int maxCount = (int) o.get("maxCount");
if (o.get("maxCount") == null) {
maxCount = 1;
}
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
if (aBoolean) @Override
{ public void onError(@NonNull Throwable e) {
boolean hasCamera = (boolean) o.get("hasCamera");
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
} }
}
@Override @Override
public void onError(@NonNull Throwable e) { public void onComplete() {
} }
});
}
@Override
public void onComplete() {
}
});
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment