diff --git a/app/build.gradle b/app/build.gradle
index df3cd9b6..88c6b843 100644
--- a/app/build.gradle
+++ b/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
diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp
index afa8ef08..70354512 100644
--- a/app/src/main/cpp/camera2/ndkcamera.cpp
+++ b/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;
}
diff --git a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
index 9fb165ca..812a12e8 100644
--- a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
+++ b/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);
+
}
});
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index 45f4db33..449745a6 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/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" />
diff --git a/app/src/main/res/values/protocols.xml b/app/src/main/res/values/protocols.xml
index 4f0bd5e1..a3a76cd8 100644
--- a/app/src/main/res/values/protocols.xml
+++ b/app/src/main/res/values/protocols.xml
@@ -8,6 +8,6 @@
- 65284-浙江
- 65285-河南
- 65286-郑州
- - 65288-宁夏
+ - 65298-宁夏
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c636520..1fe8f48b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
左下 OSD
Camera Id
保存
+ 保存并关闭
确定
取消
通道1
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
index f0008774..2d71c275 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
@@ -249,8 +249,8 @@ public class AppMaster {
}
try {
- String battary = getBatteryVoltage() + "V/" + getChargingBatteryVoltage() + "V";
- postParams.add(new Pair("battary", battary));
+ String battery = getBatteryVoltage() + "V/" + getChargingBatteryVoltage() + "V";
+ postParams.add(new Pair("battery", battery));
} catch (Exception ex) {
ex.printStackTrace();
}