提交 70966273 编写于 作者: L Liangliang He

Merge branch 'android_demo' into 'master'

fix android demo file permission

See merge request !618
...@@ -145,12 +145,17 @@ public class CameraActivity extends Activity implements View.OnClickListener { ...@@ -145,12 +145,17 @@ public class CameraActivity extends Activity implements View.OnClickListener {
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == Constant.CAMERA_PERMISSION_REQ) { if (requestCode == Constant.CAMERA_PERMISSION_REQ) {
boolean allGrant = true;
for (int result : grantResults) { for (int result : grantResults) {
if (result != PackageManager.PERMISSION_GRANTED) { if (result != PackageManager.PERMISSION_GRANTED) {
mCameraEngage.onResume(); mCameraEngage.onResume();
allGrant = false;
break; break;
} }
} }
if (allGrant) {
initData = new InitData();
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册