~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -27,11 +27,14 @@
			import android.widget.RelativeLayout;
			import android.widget.TextView;

			import androidx.core.content.FileProvider;

			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.other.HdlDialogLogic;
			import com.hdl.photovoltaic.other.HdlThreadLogic;
			import com.hdl.photovoltaic.utils.PermissionUtils;
			import com.hdl.photovoltaic.utils.SharedPreUtils;
			import com.hdl.photovoltaic.widget.PermissionExplanationDialog;
			import com.hjq.permissions.OnPermissionCallback;
			import com.hjq.permissions.XXPermissions;

			@@ -100,10 +103,12 @@
			*/
			private void checkPermission_After(final Activity context, final int tag) {
			String permission = Manifest.permission.CAMERA;
			// 未授权如果应用程序没有所需的权限，则显示解释说明
			PermissionExplanationDialog.getInstance().showPortConflictPdDialog(context, context.getString(R.string.camera_storage_instructions), context.getString(R.string.camera_storage_purpose));
			int status = PermissionUtils.getPermissionState(context, permission);

			switch (status) {
			case PermissionUtils.STATUS_SUCCESS:
			PermissionExplanationDialog.getInstance().dismiss();
			dismiss();
			if (0 == tag) {
			take_photo();
			@@ -118,6 +123,7 @@
			.request(new OnPermissionCallback() {
			@Override
			public void onGranted(List<String> permissions, boolean all) {
			PermissionExplanationDialog.getInstance().dismiss();
			dismiss();
			SharedPreUtils.putBoolean(permission, true);
			if (0 == tag) {
			@@ -129,12 +135,14 @@

			@Override
			public void onDenied(List<String> permissions, boolean never) {
			PermissionExplanationDialog.getInstance().dismiss();
			dismiss();
			SharedPreUtils.putBoolean(permission, true);
			}
			});
			break;
			case PermissionUtils.STATUS_REFUSE_PERMANENT:
			PermissionExplanationDialog.getInstance().dismiss();
			// HdlThreadLogic.toast(mContext, R.string.permission_open);
			HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
			break;
			@@ -203,32 +211,46 @@
			* 拍照获取图片
			**/
			private void take_photo() {
			//获取系統版本
			int currentapiVersion = Build.VERSION.SDK_INT;
			// 激活相机
			Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
			// 判断存储卡是否可以用，可用进行存储
			SimpleDateFormat timeStampFormat = new SimpleDateFormat(
			"yyyy_MM_dd_HH_mm_ss", Locale.ENGLISH);
			String filename = timeStampFormat.format(new Date());
			outputImagepath = new File(hdl_Dir,
			filename + ".jpg");
			if (currentapiVersion < 24) {
			// 从文件中创建uri
			Uri uri = Uri.fromFile(outputImagepath);
			intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
			} else {
			//兼容android7.0 使用共享文件的形式
			ContentValues contentValues = new ContentValues(1);
			contentValues.put(MediaStore.Images.Media.DATA, outputImagepath.getAbsolutePath());
			Uri uri = mContext.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues);
			intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
			// Uri photoURI= FileProvider.getUriForFile(mContext,"com.hdl.debugtreasure.dc.fileprovider",outputImagepath);
			try {
			//获取系統版本
			int currentapiVersion = Build.VERSION.SDK_INT;
			// 激活相机
			Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
			// 判断存储卡是否可以用，可用进行存储
			SimpleDateFormat timeStampFormat = new SimpleDateFormat(
			"yyyy_MM_dd_HH_mm_ss", Locale.ENGLISH);
			String filename = timeStampFormat.format(new Date());
			outputImagepath = new File(hdl_Dir,
			filename + ".jpg");
			if (currentapiVersion < 24) {
			// 从文件中创建uri
			Uri uri = Uri.fromFile(outputImagepath);
			intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
			} else {
			// //兼容android7.0 使用共享文件的形式
			// ContentValues contentValues = new ContentValues(1);
			// contentValues.put(MediaStore.Images.Media.DATA, outputImagepath.getAbsolutePath());
			// Uri uri = mContext.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues);
			// intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
			// Uri photoURI = FileProvider.getUriForFile(mContext, "com.hdl.photovoltaic.dc.fileprovider", outputImagepath);
			// intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
			// intent.putExtra(MediaStore.EXTRA_OUTPUT,photoURI);
			// intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);

			//兼容android7.0 使用共享文件的形式
			ContentValues contentValues = new ContentValues(1);
			contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, outputImagepath.getName());
			contentValues.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
			Uri uri = mContext.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues);
			intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
			Uri photoURI = FileProvider.getUriForFile(mContext, "com.hdl.photovoltaic.fileProvider", outputImagepath);
			intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
			intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
			}
			// 开启一个带有返回值的Activity，请求码为PHOTO_REQUEST_CAREMA
			((Activity) mContext).startActivityForResult(intent, TAKE_PHOTO);
			} catch (Exception e) {
			HdlThreadLogic.toast(mContext, R.string.loading_not_supported);
			}
			// 开启一个带有返回值的Activity，请求码为PHOTO_REQUEST_CAREMA
			((Activity) mContext).startActivityForResult(intent, TAKE_PHOTO);

			}

			@@ -240,7 +262,7 @@
			HdlThreadLogic.toast(mContext, R.string.camera_album_file_save_fial);
			} else {
			if (!TextUtils.isEmpty(outputImagepath.getAbsolutePath())) {
			//(android13,14需要再设置-隐私-)特殊权限设置
			//注意：(android13,14需要再设置-隐私-)特殊权限设置
			orc_bitmap = BitmapFactory.decodeFile(outputImagepath.getAbsolutePath());//获取图片
			saveBitmap(comp(ImgUpdateDirection(outputImagepath.getAbsolutePath()))); //压缩图片
			} else {