Browse Source

get uri test finish

liukai 2 years ago
parent
commit
b48ad3d5cf

+ 9 - 20
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/HelpCenterProfileH5Activity.java

@@ -20,14 +20,15 @@ import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
-
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import com.guadou.cs_cptservices.YYConstants;
 import com.guadou.cs_cptservices.widget.PickPhotoDialog;
 import com.guadou.lib_baselib.base.activity.BaseVMActivity;
 import com.guadou.lib_baselib.base.vm.BaseViewModel;
-import com.guadou.lib_baselib.engine.PermissionExtKt;
 import com.guadou.lib_baselib.engine.image_select.ImageSelectExtKt;
-import com.guadou.lib_baselib.provider.PermissionFileProvider;
+import com.guadou.lib_baselib.engine.permission.PermissionExtKt;
+import com.guadou.lib_baselib.engine.permission.UriExtKt;
 import com.guadou.lib_baselib.utils.CheckUtil;
 import com.guadou.lib_baselib.utils.CommUtils;
 import com.guadou.lib_baselib.utils.SPUtils;
@@ -44,8 +45,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 
@@ -337,17 +336,7 @@ public class HelpCenterProfileH5Activity extends BaseVMActivity<BaseViewModel> {
             }
         }, false, true, 1, 1);
 
-//        ImageSelectEngine.get().openCamera(mActivity, null, false, true, 1, 1, new OnResultCallbackListener<LocalMedia>() {
-//            @Override
-//            public void onResult(List<LocalMedia> result) {
-//                handlePath(result);
-//            }
-//
-//            @Override
-//            public void onCancel() {
-//                cancelFilePick();
-//            }
-//        });
+
     }
 
     /**
@@ -360,9 +349,10 @@ public class HelpCenterProfileH5Activity extends BaseVMActivity<BaseViewModel> {
 
             String path = result.get(0).getCompressPath();
 
-//            Uri fileUri = PermissionFileProvider.getUriForFile(mActivity,"",new File(path));
-            Uri fileUri = Uri.fromFile(new File(path));
+//            Uri fileUri = Uri.fromFile(new File(path));
+            Uri fileUri = UriExtKt.getFileUri(this, new File(path));
 //            Uri fileUri = AndPermission.getFileUri(mActivity, new File(path));
+            YYLogUtils.w("fileUri:"+fileUri +" path:"+path);
 
             if (filePathCallback1 != null) {
                 filePathCallback1.onReceiveValue(new Uri[]{fileUri});
@@ -389,7 +379,6 @@ public class HelpCenterProfileH5Activity extends BaseVMActivity<BaseViewModel> {
 
         @JavascriptInterface
         public void callPhone(String phoneNum) {
-//            YYCallPhoneManager.getInstance().callPhone(mActivity, phoneNum);
 
             PermissionExtKt.extRequestPermission(mActivity, new String[]{Manifest.permission.CALL_PHONE}, new Function0<Unit>() {
                 @Override
@@ -403,7 +392,7 @@ public class HelpCenterProfileH5Activity extends BaseVMActivity<BaseViewModel> {
 
         }
 
-        private void call(){
+        private void call() {
 
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_CALL);