Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 0
-def AppBuildNumber = 139
+def AppBuildNumber = 140
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/camera2/ndkcamera.cpp

@@ -765,7 +765,11 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
     if (mstatus != AMEDIA_OK)
     {
         // error
-        XYLOG(XYLOG_SEVERITY_ERROR, "AImageReader_acquireLatestImage error: %d", mstatus);
+        // https://stackoverflow.com/questions/67063562
+        if (mstatus != AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE)
+        {
+            XYLOG(XYLOG_SEVERITY_ERROR, "AImageReader_acquireLatestImage error: %d", mstatus);
+        }
         return;
     }
 

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

@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -69,6 +70,14 @@ public class ChannelActivity extends AppCompatActivity {
                 int channel = binding.channels.getSelectedItemPosition() + 1;
                 saveChannelParams(channel);
                 MicroPhotoService.updateConfigs(ChannelActivity.this.getApplicationContext());
+                Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        ChannelActivity.this.finish();
+                    }
+                }, 200);
+
             }
         });
 

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

@@ -46,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:text="@string/btn_save"
+        android:text="@string/btn_save_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -8,6 +8,6 @@
         <item>65284-浙江</item>
         <item>65285-河南</item>
         <item>65286-郑州</item>
-        <item>65288-宁夏</item>
+        <item>65298-宁夏</item>
     </string-array>
 </resources>

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

@@ -24,6 +24,7 @@
     <string name="osd_left_bottom">左下 OSD</string>
     <string name="channel_cfg_camera_id">Camera Id</string>
     <string name="btn_save">保存</string>
+    <string name="btn_save_close">保存并关闭</string>
     <string name="btn_ok">确定</string>
     <string name="btn_cancel">取消</string>
     <string name="btn_tp_ch1">通道1</string>

mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java

@@ -249,8 +249,8 @@ public class AppMaster {
             }
 
             try {
-                String battary = getBatteryVoltage() + "V/" + getChargingBatteryVoltage() + "V";
+                String battery = getBatteryVoltage() + "V/" + getChargingBatteryVoltage() + "V";
-                postParams.add(new Pair<String, String>("battary", battary));
+                postParams.add(new Pair<String, String>("battery", battery));
             } catch (Exception ex) {
                 ex.printStackTrace();
             }