fix: 增加辅助审查打分功能

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.navinfo.outdoor"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 54
+        versionCode 55
-        versionName "8.230517-正式版"
+        versionName "8.230518-正式版-OCR"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {

app/src/main/AndroidManifest.xml

@@ -150,6 +150,9 @@
             android:name=".activity.AutoTakePictureActivity"
             android:screenOrientation="landscape" />
         <!-- 自动捕捉POI录像任务 -->
+        <activity
+            android:name=".activity.AutoTakePicture4PoiActivity"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".activity.AutoTakePicture4PoiVideoActivity"
             android:screenOrientation="landscape" />

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

@@ -1804,8 +1804,8 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
                         .doOnComplete(new Action() {
                             @Override
                             public void run() throws Exception {
-                                // 删除缓存目录
+                                // 删除缓存目录-增加了删除缓存的功能，无需删除tmp照片
-                                FileUtils.deleteFile(tmpPicFoldPath);
+//                                FileUtils.deleteFile(tmpPicFoldPath);
                             }
                         })
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/navinfo/outdoor/activity/RXPicturesActivity.kt

@@ -1,42 +0,0 @@
-package com.navinfo.outdoor.activity
-
-import android.os.Bundle
-import android.view.View
-import android.view.View.OnClickListener
-import androidx.lifecycle.ViewModelProvider
-import com.navinfo.outdoor.base.BaseViewBindingActivity
-import com.navinfo.outdoor.databinding.ActivityPicturesBinding
-import com.navinfo.outdoor.util.LocationLifeCycle
-import com.navinfo.outdoor.util.SensorOritationLifecycle
-import com.navinfo.outdoor.util.SensorOritationLifecycle.DegreesChangeListener
-import com.navinfo.outdoor.viewmodel.RxPicturesViewModel
-
-class RXPicturesActivity: BaseViewBindingActivity(), OnClickListener {
-    private lateinit var binding: ActivityPicturesBinding
-    private lateinit var viewModel: RxPicturesViewModel
-
-    private val sensorOritationLifecycle: SensorOritationLifecycle by lazy { SensorOritationLifecycle(this) }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityPicturesBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        binding.camera.snapshotMaxWidth = 1920
-        binding.camera.snapshotMaxHeight = 1440
-        binding.camera.setOnClickListener(this)
-        viewModel = ViewModelProvider(this).get(RxPicturesViewModel::class.java)
-
-        LocationLifeCycle.getInstance().startGPSLocation()
-        lifecycle.addObserver(sensorOritationLifecycle)
-        sensorOritationLifecycle.degreesChangeListener = object : DegreesChangeListener {
-            override fun onDegreesChangeListener(xDegree: Float, yDegree: Float, zDegree: Float) {
-                binding.tvDegrees.text = "x:$xDegree\ny:$yDegree\nz:$zDegree"
-            }
-        }
-    }
-
-
-    override fun onClick(p0: View?) {
-
-    }
-}

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

@@ -14,11 +14,8 @@ import com.github.lazylibrary.util.PreferencesUtils;
 import com.kongzue.dialogx.dialogs.CustomDialog;
 import com.kongzue.dialogx.interfaces.OnBindView;
 import com.navinfo.outdoor.R;
-import com.navinfo.outdoor.activity.AutoTakePicture4PoiVideoActivity;
 import com.navinfo.outdoor.activity.RegardMapActivity;
-import com.navinfo.outdoor.activity.WebActivity;
 import com.navinfo.outdoor.base.BaseFragment;
-import com.navinfo.outdoor.http.HttpInterface;
 
 import java.util.Objects;
 

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

@@ -59,6 +59,7 @@ import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
 import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Progress;
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.AutoTakePicture4PoiActivity;
 import com.navinfo.outdoor.activity.AutoTakePicture4PoiVideoActivity;
 import com.navinfo.outdoor.activity.AutoTakePictureActivity;
 import com.navinfo.outdoor.activity.FragmentManagement;
@@ -348,7 +349,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
                                     Intent autoMatchIntent = new Intent(getContext(), AutoTakePictureActivity.class);
                                     startActivity(autoMatchIntent);
                                 } else if (index == 1) {
-                                    Intent autoMatchIntent = new Intent(getContext(), AutoTakePicture4PoiVideoActivity.class);
+                                    Intent autoMatchIntent = new Intent(getContext(), AutoTakePicture4PoiActivity.class);
                                     startActivity(autoMatchIntent);
                                 }
                                 return false;

app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java

@@ -2,8 +2,8 @@ package com.navinfo.outdoor.http;
 
 public class HttpInterface {
 //    public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP
-    public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
+    public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
-    public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
+    public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
     public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
     public static final String USER_PATH = "/user/";//我的
     public static final String MSG_LIST_PATH = "/msgList/";//发现