优化代码

app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
@@ -71,7 +72,6 @@
     <uses-permission android:name="android.hardware.usb.accessory" />
 
     <application
-        android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"

app/src/main/cpp/CMakeLists.txt

@@ -29,6 +29,9 @@ add_definitions(-DUSING_XY_EXTENSION)
 # add_definitions(-DUSING_BREAK_PAD)
 add_definitions(-DSQLITE_THREADSAFE=1)
 add_definitions(-DHAVE_STRING_H) # for memcpy in md5.c
+# add_definitions(-DUSING_NRSEC)
+
+add_definitions(-DUSING_DOWSE)
 
 # set(OpenCV_DIR D:/Workspace/deps/OpenCV-android-sdk/sdk/native/jni/)
 set(OPENCV_EXTRA_MODULES_PATH D:/Workspace/Github/opencv_contrib/modules)
@@ -316,6 +319,7 @@ add_library( # Sets the name of the library.
         ${TERM_CORE_ROOT}/SpecData_XY.cpp
         ${TERM_CORE_ROOT}/SpecData_ZJ.cpp
         ${TERM_CORE_ROOT}/SpecData_NW.cpp
+        ${TERM_CORE_ROOT}/SpecData_Nrsec.cpp
         ${TERM_CORE_ROOT}/Timer.cpp
         ${TERM_CORE_ROOT}/TimerThread.cpp
         ${TERM_CORE_ROOT}/Template.cpp

app/src/main/cpp/SerialPort.h

@@ -15,6 +15,7 @@ public:
     void  Close();
 
 private:
+
     int fd;
 };
 

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -229,7 +229,7 @@ public class MicroPhotoService extends Service {
 
         // registerHeartbeatTimer(getHeartbeatDuration());
 
-        SysApi.enableGps(this.getApplicationContext(), true);
+        enableGps(true);
         requestPosition();
     }
     @Override
@@ -860,7 +860,7 @@ public class MicroPhotoService extends Service {
                 // Set Listener
             }
             try {
-                mLocationManager.requestLocationUpdates(mLocateType, 100, 0, mLocationListener);
+                mLocationManager.requestLocationUpdates(mLocateType, 100, 1, mLocationListener);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }

app/src/main/res/layout-land/activity_main.xml

@@ -340,6 +340,17 @@
         app:layout_constraintStart_toEndOf="@+id/btnReboot"
         app:layout_constraintTop_toTopOf="@+id/btnSendHb" />
 
+    <Button
+        android:id="@+id/btnDowseCamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/btn_dowse_ch2_on"
+        android:visibility="gone"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:minWidth="@dimen/activity_btn_min_width"
+        android:minHeight="@dimen/activity_btn_min_height"
+        app:layout_constraintStart_toStartOf="@+id/btnCameraInfo"
+        app:layout_constraintTop_toTopOf="@+id/btnCameraInfo" />
 
     <Button
         android:id="@+id/simchange"

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

@@ -331,6 +331,18 @@
         app:layout_constraintStart_toEndOf="@+id/btnReboot"
         app:layout_constraintTop_toTopOf="@+id/btnSendHb" />
 
+    <Button
+        android:id="@+id/btnDowseCamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/btn_dowse_ch2_on"
+        android:visibility="gone"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:minWidth="@dimen/activity_btn_min_width"
+        android:minHeight="@dimen/activity_btn_min_height"
+        app:layout_constraintStart_toStartOf="@+id/btnCameraInfo"
+        app:layout_constraintTop_toTopOf="@+id/btnCameraInfo" />
+
     <Button
         android:id="@+id/gps"
         android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -31,6 +31,9 @@
     <string name="btn_tv_ch2">视频2</string>
     <string name="btn_tv_ch3">视频3</string>
     <string name="btn_tv_ch4">视频4</string>
+
+    <string name="btn_dowse_ch2_on">CH2 On</string>
+    <string name="btn_dowse_ch2_off">CH2 Off</string>
     <string name="channel_cfg_auto_exposure">自动曝光</string>
     <string name="channel_cfg_auto_focus">自动对焦</string>
     <string name="channel_cfg_width">照片宽</string>