fix: 合并代码

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

@@ -109,6 +109,7 @@ public class    PhotographActivity extends BaseActivity implements View.OnClickL
         if (getIntent() != null) {
             photo_path = getIntent().getStringExtra(Constant.INTENT_PHOTO_PATH);
         }
+//        this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE);
         cameraView = findViewById(R.id.camera);
         cameraView.setOnClickListener(this);

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

@@ -344,6 +344,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         initShowPoi();
         //拍照长按删除
         onLongDel();
+
     }
 
     //拍照长按删除