From c2c3648ab5d7a9f757cc98f285ef60d26b30d769 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 14 May 2024 15:59:26 +0800 Subject: [PATCH 1/6] Update version to 1.0.140 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2cd16f63d3c4fa5572821f2f3afffd907a9cbd83 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 14 May 2024 16:05:24 +0800 Subject: [PATCH 2/6] Fix typo --- mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); } From 98368d0438f82b8bdeffcc348ea38e4304fc24e5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 14 May 2024 22:22:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/camera2/ndkcamera.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index afa8ef08..c5270a17 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -765,7 +765,10 @@ void NdkCamera::onImageAvailable(AImageReader* reader) if (mstatus != AMEDIA_OK) { // error - XYLOG(XYLOG_SEVERITY_ERROR, "AImageReader_acquireLatestImage error: %d", mstatus); + if (mstatus != AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE) + { + XYLOG(XYLOG_SEVERITY_ERROR, "AImageReader_acquireLatestImage error: %d", mstatus); + } return; } From 33a5cf28b463947ba26c71bad8a1b6d472d542da Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 14 May 2024 22:26:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/camera2/ndkcamera.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index c5270a17..70354512 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -765,6 +765,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader) if (mstatus != AMEDIA_OK) { // error + // https://stackoverflow.com/questions/67063562 if (mstatus != AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE) { XYLOG(XYLOG_SEVERITY_ERROR, "AImageReader_acquireLatestImage error: %d", mstatus); From ebc74442f20d94c5389dd0739c855b18c1c5ca31 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 15 May 2024 10:40:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=8D=8F=E8=AE=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/protocols.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d23051a10b0af06dcff4550b6345b5e512b86ffb Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 15 May 2024 19:04:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=9A=E9=81=93=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E6=94=B9=E6=88=90=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=B9=B6=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/ChannelActivity.java | 9 +++++++++ app/src/main/res/layout/activity_channel.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) 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/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