'解决冲突'

app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"

app/src/main/AndroidManifest.xml

@@ -26,8 +26,12 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <!-- 用于 log 日志 -->
 
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
+
     <application
-        android:name="com.navinfo.outdoor.api.UserApplication"
+        android:name=".api.UserApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java

@@ -78,10 +78,12 @@ public class FragmentManagement extends BaseActivity {
     private WithdrawalRecordFragment withdrawalRecordFragment;//我的-提现-提现记录的fragment  -26
     private PoiFragment poiFragment;//寻宝-上传-POI的fragment -27
     private RoadFragment roadFragment;//寻宝-上传-道路的fragment -28
+
     private StaySubmitFragment staySubmitFragment;//记录-待提交的fragment -29
     private HasSubmitFragment hasSubmitFragment;//记录-已提交的fragment -30
     //private PoiTaskFragment poiTaskFragment;//记录-已提交-POI任务列表的fragment -31
 
+
     @Override
     protected int getLayout() {
         return R.layout.management_fragment;

app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java

@@ -1,6 +1,7 @@
 package com.navinfo.outdoor.activity;
 
 
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 
 import android.Manifest;
@@ -8,6 +9,7 @@ import android.content.Intent;
 import android.os.CountDownTimer;
 
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseActivity;
 import com.kongzue.dialog.util.DialogSettings;
 import com.navinfo.outdoor.util.BackHandlerHelper;
@@ -54,12 +56,20 @@ public class MainActivity extends BaseActivity {
                 Manifest.permission.READ_PHONE_STATE,
                 Manifest.permission.ACCESS_COARSE_LOCATION
         };
+
         PermissionUtil.getInstance().checkPermission(this, pers, new Runnable() {
             @Override
             public void run() {
             }
         });
+
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     @Override
     protected void initView() {
         super.initView();

app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java

@@ -6,12 +6,16 @@ import androidx.annotation.Nullable;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+
 import android.content.res.Resources;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.location.Location;
+
 import android.media.Image;
+
 import android.os.Looper;
 import android.os.Message;
 import android.util.DisplayMetrics;
@@ -23,7 +27,6 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Toast;
-
 import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseActivity;
@@ -40,7 +43,6 @@ import com.otaliastudios.cameraview.PictureResult;
 import com.otaliastudios.cameraview.VideoResult;
 import com.otaliastudios.cameraview.controls.Engine;
 import com.otaliastudios.cameraview.controls.Mode;
-
 import com.otaliastudios.cameraview.size.AspectRatio;
 import com.otaliastudios.cameraview.size.SizeSelectors;
 import com.tencent.map.geolocation.TencentLocation;
@@ -75,6 +77,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
     private ImageButton capturePicture;
     private long captureTime = 0;
     private android.widget.Button btnSwitch;
+
     private TencentMap tencentMap;
     private TencentLocationManager locationManager;
     private TencentLocationRequest locationRequest;

app/src/main/java/com/navinfo/outdoor/api/Constant.java

@@ -24,7 +24,9 @@ public class Constant {
     public static final String BASE_FOLDER = SdkFolderCreate.getSDPath()+"/navinfoOutDoor";
     // 保存图片的目录
     public static final String PICTURE_FOLDER = BASE_FOLDER+"/picture";
+
     public static final String PoiDao = BASE_FOLDER+"/poi";
+
     // 申请权限的RequestCode
     public static final int PERMISSION_REQUEST_CODE = 0x100;
 
@@ -39,6 +41,7 @@ public class Constant {
     public static final int POI_WORD_2 = 2;
     public static final int POI_WORD_3 = 3;
 
+
     /**
      * 用户当前位置
      */

app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java

@@ -17,6 +17,12 @@ import com.navinfo.outdoor.R;
 import com.navinfo.outdoor.activity.PictureActivity;
 import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseFragment;
+import com.otaliastudios.cameraview.size.AspectRatio;
+import com.otaliastudios.cameraview.size.SizeSelectors;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -25,10 +31,12 @@ import org.greenrobot.eventbus.ThreadMode;
 /**
  * 寻宝-点击上传弹窗-道路
  */
+
 public class RoadFragment extends BaseFragment {
     private TextView tvPictures;
     private EditText etHeight;
 
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_road;
@@ -49,7 +57,6 @@ public class RoadFragment extends BaseFragment {
             }
             startActivity(intent);
         });
-
     }
 
     @Override

app/src/main/res/layout/activity_camera.xml

@@ -68,8 +68,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
-
 <!--    <LinearLayout-->
 <!--        android:id="@+id/ll_iv"-->
 <!--        android:layout_width="match_parent"-->
@@ -189,7 +187,9 @@
         <!--                android:textSize="10sp"-->
         <!--                android:text="SNAP"/>-->
         <!--        </LinearLayout>-->
+
 <!--    </LinearLayout>-->
 
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_picture.xml

@@ -171,4 +171,5 @@
     <!--    </LinearLayout>-->
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+

app/src/main/res/layout/fragment_road.xml

@@ -155,7 +155,6 @@
         <!--        android:text="02.拍照方式"-->
         <!--        -->
         <!--</LinearLayout>-->
-
         <LinearLayout
             android:id="@+id/ll_pictures"
             android:layout_width="wrap_content"

build.gradle

@@ -16,6 +16,7 @@ buildscript {
         maven { url "https://jitpack.io" }
 
 
+
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.0"