Skip to content

Commit f5a3123

Browse files
sicp618sicp618
committed
权限验证改为 RxPermission
1 parent d6e5337 commit f5a3123

27 files changed

Lines changed: 324 additions & 305 deletions

File tree

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ dependencies {
185185

186186
// 比 ultimaterecyclerview 轻量，用起来比较舒服，实现代码也好些
187187
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.34'
188-
implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar'
189188
implementation 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r'
190189
implementation 'com.orhanobut:logger:1.15'
191190
implementation 'com.github.bmelnychuk:atv:1.2.9'

‎app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,13 @@ void actionSendMessage() {
199199
}
200200

201201
void action2fa() {
202-
if (!PermissionUtil.checkCamera(getActivity())) {
203-
return;
204-
}
205-
206-
GlobalCommon.start2FAActivity(getActivity());
202+
new RxPermissions(getActivity())
203+
.request(PermissionUtil.CAMERA_STORAGE)
204+
.subscribe(granted -> {
205+
if (granted) {
206+
GlobalCommon.start2FAActivity(getActivity());
207+
}
208+
});
207209
}
208210

209211
private void onRefresh() {

‎app/src/main/java/net/coding/program/MainActivity.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.view.ViewGroup;
2121

2222
import com.roughike.bottombar.BottomBar;
23-
import com.tbruyelle.rxpermissions.RxPermissions;
23+
import com.tbruyelle.rxpermissions2.RxPermissions;
2424

2525
import net.coding.program.common.Global;
2626
import net.coding.program.common.GlobalCommon;
@@ -190,6 +190,7 @@ public void onPause() {
190190
}
191191
}
192192

193+
@SuppressLint("CheckResult")
193194
private void requestPermissionReal() {
194195
RxPermissions permissions = new RxPermissions(this);
195196
permissions.requestEach(Manifest.permission.READ_PHONE_STATE,
@@ -198,22 +199,8 @@ private void requestPermissionReal() {
198199
.subscribe(permission -> {
199200
if (permission.granted) {
200201
startPushService();
201-
} else if (permission.shouldShowRequestPermissionRationale) {
202-
showDialog("", "开启 \"电话\" 权限后才能收到推送\n开启\"存储空间\"权限是为了能下载文件到外部存储",
203-
(dialog, which) -> requestPermissionReal(), null);
204-
} else {
205202
}
206203
});
207-
// .subscribe(granted -> {
208-
// if (granted) {
209-
// startPushService();
210-
// LoginBackground loginBackground = new LoginBackground(this);
211-
// loginBackground.update();
212-
// } else {
213-
// showDialog("", "开启 \"电话\" 权限后才能收到推送\n开启\"存储空间\"权限是为了能下载文件到外部存储",
214-
// (dialog, which) -> requestPermissionReal(), null);
215-
// }
216-
// });
217204
}
218205

219206
protected void startExtraService() {

‎app/src/main/java/net/coding/program/UserDetailEditActivity.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.coding.program;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Activity;
45
import android.content.DialogInterface;
56
import android.content.Intent;
@@ -22,6 +23,7 @@
2223
import android.widget.TextView;
2324

2425
import com.loopj.android.http.RequestParams;
26+
import com.tbruyelle.rxpermissions2.RxPermissions;
2527

2628
import net.coding.program.common.CameraPhotoUtil;
2729
import net.coding.program.common.DatePickerFragment;
@@ -275,25 +277,24 @@ public void onDateSet(String provinceStr) {
275277
}
276278
};
277279

280+
@SuppressLint("CheckResult")
278281
void setIcon() {
279282
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle);
280283
builder.setTitle("更换头像")
281-
.setItems(R.array.camera_gallery, new DialogInterface.OnClickListener() {
282-
@Override
283-
public void onClick(DialogInterface dialog, int which) {
284-
if (which == 0) {
285-
if (!PermissionUtil.checkCameraAndExtralStorage(UserDetailEditActivity.this)) {
286-
return;
287-
}
288-
289-
camera();
290-
} else {
291-
photo();
292-
}
284+
.setItems(R.array.camera_gallery, (dialog, which) -> {
285+
if (which == 0) {
286+
new RxPermissions(UserDetailEditActivity.this)
287+
.request(PermissionUtil.CAMERA_STORAGE)
288+
.subscribe(granted -> {
289+
if (granted) {
290+
camera();
291+
}
292+
});
293+
} else {
294+
photo();
293295
}
294296
});
295-
AlertDialog dialog = builder.create();
296-
dialog.show();
297+
builder.show();
297298
}
298299

299300
// private void camera() {
@@ -494,7 +495,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
494495
}
495496

496497
fileCropUri = CameraPhotoUtil.getOutputMediaFileUri();
497-
Global.startPhotoZoom(this, fileUri, fileCropUri, RESULT_REQUEST_PHOTO_CROP);
498+
Global.startPhotoZoom(this, fileUri, fileCropUri, 512, 512, RESULT_REQUEST_PHOTO_CROP);
498499
}
499500

500501
} else if (requestCode == RESULT_REQUEST_PHOTO_CROP) {

‎app/src/main/java/net/coding/program/common/base/MDEditFragment.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.coding.program.common.base;
22

33

4+
import android.annotation.SuppressLint;
45
import android.app.Activity;
56
import android.content.Intent;
67
import android.net.Uri;
@@ -12,6 +13,7 @@
1213
import android.widget.EditText;
1314

1415
import com.loopj.android.http.RequestParams;
16+
import com.tbruyelle.rxpermissions2.RxPermissions;
1517

1618
import net.coding.program.R;
1719
import net.coding.program.common.CameraPhotoUtil;
@@ -132,16 +134,19 @@ public void mdPhoto(View v) {
132134
popPickDialog();
133135
}
134136

137+
@SuppressLint("CheckResult")
135138
private void popPickDialog() {
136139
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.MyAlertDialogStyle);
137140
builder.setTitle("上传图片")
138141
.setItems(R.array.camera_gallery, (dialog, which) -> {
139142
if (which == 0) {
140-
if (!PermissionUtil.checkCameraAndExtralStorage(getActivity())) {
141-
return;
142-
}
143-
144-
camera();
143+
new RxPermissions(getActivity())
144+
.request(PermissionUtil.CAMERA_STORAGE)
145+
.subscribe(granted -> {
146+
if (granted) {
147+
camera();
148+
}
149+
});
145150
} else {
146151
photo();
147152
}

‎app/src/main/java/net/coding/program/common/enter/ImageCommentLayout.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package net.coding.program.common.enter;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Activity;
45
import android.content.Intent;
6+
import android.support.v4.app.FragmentActivity;
57
import android.view.LayoutInflater;
68
import android.view.View;
79
import android.view.ViewGroup;
810
import android.widget.ImageView;
911

12+
import com.tbruyelle.rxpermissions2.RxPermissions;
13+
1014
import net.coding.program.R;
1115
import net.coding.program.common.Global;
1216
import net.coding.program.common.ImageInfo;
@@ -63,15 +67,18 @@ protected boolean sendButtonEnable() {
6367
View v = activity.findViewById(R.id.commonEnterRoot);
6468
mRootLayout = v;
6569
v.findViewById(R.id.commentImageButton).setOnClickListener(new View.OnClickListener() {
70+
@SuppressLint("CheckResult")
6671
@Override
6772
public void onClick(View v) {
68-
if (!PermissionUtil.writeExtralStorage(activity)) {
69-
return;
70-
}
71-
72-
Intent intent = new Intent(mActivity, PhotoPickActivity.class);
73-
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_PICKED(), mArrayImages);
74-
mActivity.startActivityForResult(intent, RESULT_REQUEST_COMMENT_IMAGE);
73+
new RxPermissions((FragmentActivity) activity)
74+
.request(PermissionUtil.STORAGE)
75+
.subscribe(granted -> {
76+
if (granted) {
77+
Intent intent = new Intent(mActivity, PhotoPickActivity.class);
78+
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_PICKED(), mArrayImages);
79+
mActivity.startActivityForResult(intent, RESULT_REQUEST_COMMENT_IMAGE);
80+
}
81+
});
7582
}
7683
});
7784

‎app/src/main/java/net/coding/program/common/widget/input/VoiceView.java‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.coding.program.common.widget.input;
22

3+
import android.annotation.SuppressLint;
34
import android.content.Context;
45
import android.graphics.Color;
56
import android.graphics.drawable.AnimationDrawable;
@@ -9,6 +10,7 @@
910
import android.os.Environment;
1011
import android.os.Handler;
1112
import android.os.Message;
13+
import android.support.v4.app.FragmentActivity;
1214
import android.support.v7.app.AppCompatActivity;
1315
import android.util.AttributeSet;
1416
import android.util.Log;
@@ -21,6 +23,8 @@
2123
import android.widget.TextView;
2224
import android.widget.Toast;
2325

26+
import com.tbruyelle.rxpermissions2.RxPermissions;
27+
2428
import net.coding.program.R;
2529
import net.coding.program.common.Global;
2630
import net.coding.program.common.GlobalCommon;
@@ -180,19 +184,23 @@ private void reset() {
180184
}
181185
}
182186

187+
@SuppressLint("CheckResult")
183188
@LongClick
184189
boolean voiceRecordButton() {
185-
if (!PermissionUtil.checkMicrophone(Global.getActivityFromView(this))) {
186-
return true;
187-
}
188-
189-
if (activity instanceof VoicePlayCallBack) {
190-
VoicePlayCallBack voicePlayCallBack = (VoicePlayCallBack) activity;
191-
voicePlayCallBack.onStopPlay();
192-
}
190+
new RxPermissions((FragmentActivity) Global.getActivityFromView(this))
191+
.request(PermissionUtil.AUDIO)
192+
.subscribe(granted -> {
193+
if (granted) {
194+
if (activity instanceof VoicePlayCallBack) {
195+
VoicePlayCallBack voicePlayCallBack = (VoicePlayCallBack) activity;
196+
voicePlayCallBack.onStopPlay();
197+
}
198+
199+
//开始录音...
200+
startRecord();
201+
}
202+
});
193203

194-
//开始录音...
195-
startRecord();
196204
return true;
197205
}
198206

‎app/src/main/java/net/coding/program/login/auth/AuthListActivity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.coding.program.login.auth;
22

3+
import android.Manifest;
34
import android.content.DialogInterface;
45
import android.content.Intent;
56
import android.os.Bundle;
@@ -13,6 +14,8 @@
1314
import android.widget.TextView;
1415
import android.widget.Toast;
1516

17+
import com.tbruyelle.rxpermissions2.RxPermissions;
18+
1619
import net.coding.program.R;
1720
import net.coding.program.common.CodingColor;
1821
import net.coding.program.common.Global;

‎app/src/main/java/net/coding/program/maopao/MaopaoAddActivity.java‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.coding.program.maopao;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Activity;
45
import android.content.Intent;
56
import android.graphics.Bitmap;
@@ -25,6 +26,7 @@
2526
import com.nostra13.universalimageloader.core.ImageLoader;
2627
import com.nostra13.universalimageloader.core.assist.ImageSize;
2728
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
29+
import com.tbruyelle.rxpermissions2.RxPermissions;
2830

2931
import net.coding.program.R;
3032
import net.coding.program.common.Global;
@@ -276,26 +278,28 @@ private void setPopTopicIconShow() {
276278
((ImageView) findViewById(R.id.popTopic)).setImageResource(icon);
277279
}
278280

281+
@SuppressLint("CheckResult")
279282
private void startPhotoPickActivity() {
280-
if (!PermissionUtil.writeExtralStorage(this)) {
281-
return;
282-
}
283-
284-
int count = Global.PHOTO_MAX_COUNT - mData.size();
285-
if (count <= 0) {
286-
showButtomToast(String.format("最多能添加%s张图片", Global.PHOTO_MAX_COUNT));
287-
return;
288-
}
289-
290-
Intent intent = new Intent(MaopaoAddActivity.this, PhotoPickActivity.class);
291-
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_MAX(), Global.PHOTO_MAX_COUNT);
292-
293-
ArrayList<ImageInfo> pickImages = new ArrayList<>();
294-
for (PhotoData item : mData) {
295-
pickImages.add(item.mImageinfo);
296-
}
297-
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_PICKED(), pickImages);
298-
startActivityForResult(intent, RESULT_REQUEST_PICK_PHOTO);
283+
new RxPermissions(this)
284+
.request(PermissionUtil.STORAGE)
285+
.subscribe(granted -> {
286+
if (granted) {
287+
int count = Global.PHOTO_MAX_COUNT - mData.size();
288+
if (count <= 0) {
289+
showButtomToast(String.format("最多能添加%s张图片", Global.PHOTO_MAX_COUNT));
290+
} else {
291+
Intent intent = new Intent(MaopaoAddActivity.this, PhotoPickActivity.class);
292+
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_MAX(), Global.PHOTO_MAX_COUNT);
293+
294+
ArrayList<ImageInfo> pickImages = new ArrayList<>();
295+
for (PhotoData item : mData) {
296+
pickImages.add(item.mImageinfo);
297+
}
298+
intent.putExtra(PhotoPickActivity.Companion.getEXTRA_PICKED(), pickImages);
299+
startActivityForResult(intent, RESULT_REQUEST_PICK_PHOTO);
300+
}
301+
}
302+
});
299303
}
300304

301305
private void updateAddButton() {
@@ -653,18 +657,22 @@ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
653657
}
654658
}
655659

660+
@SuppressLint("CheckResult")
656661
@Click(R.id.locationText)
657662
void chooseLocation() {
658663
if (PhoneType.isX86or64()) {
659664
showMiddleToast("定位功能不支持x86手机");
660665
return;
661666
}
662667

663-
if (!PermissionUtil.checkLocation(this)) {
664-
return;
665-
}
668+
new RxPermissions(this)
669+
.request(PermissionUtil.LOCATION)
670+
.subscribe(granted -> {
671+
if (granted) {
672+
LocationSearchActivity_.intent(this).selectedLocation(currentLocation).startForResult(RESULT_REQUEST_LOCATION);
673+
}
674+
});
666675

667-
LocationSearchActivity_.intent(this).selectedLocation(currentLocation).startForResult(RESULT_REQUEST_LOCATION);
668676
}
669677

670678
@OnActivityResult(RESULT_REQUEST_LOCATION)

0 commit comments

Comments
 (0)