From 63264f8e1c55113adb52e45592e944fb7e61cdb0 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 18 Feb 2025 11:24:49 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=BB=B6=E9=95=BF=E4=BA=91=E5=8F=B0?= =?UTF-8?q?=E9=A2=84=E7=BD=AE=E4=BD=8D=E8=B0=83=E7=94=A8=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 76cf8a5c..b1dfd284 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1923,7 +1923,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< { XYLOG(XYLOG_SEVERITY_INFO,"Recv CameraCtrl Command, action= MOVE_PRESETNO, preset = %u", localPhotoInfo.preset); CameraPhotoCmd(time(NULL), localPhotoInfo.channel, MOVE_PRESETNO, 0, localPhotoInfo.preset, param.serfile, param.baud, param.addr); - std::this_thread::sleep_for(std::chrono::seconds(5)); + std::this_thread::sleep_for(std::chrono::seconds(10)); } pThis->TakePhotoWithNetCamera(localPhotoInfo, path, osds, powerCtrlPtr); From b9ba8135cd2a239d3e461ecdcbd29f5d5477a2fc Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 18 Feb 2025 17:07:04 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/camera2/ndkcamera.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index c7ac545e..9d33c632 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -1880,9 +1880,11 @@ void NdkCamera::CopyPreviewRequest(ACaptureRequest* request, const ACameraMetada void NdkCamera::onCaptureFailed(ACameraCaptureSession* session, ACaptureRequest* request, ACameraCaptureFailure* failure) { - XYLOG(XYLOG_SEVERITY_WARNING, "onCaptureFailed session=%p request=%p reason=%d PhotoTaken=%d", session, request, failure->reason, m_photoTaken ? 1 : 0); + bool isPreview = (request == mCaptureRequests[PREVIEW_REQUEST_IDX]->request); - if (failure->sequenceId == mCaptureRequests[PREVIEW_REQUEST_IDX]->sessionSequenceId) + XYLOG(XYLOG_SEVERITY_WARNING, "onCaptureFailed session=%p request=%p reason=%d PhotoTaken=%d Preview=%d", session, request, failure->reason, m_photoTaken ? 1 : 0, isPreview ? 1 : 0); + + if (isPreview) { return; } From b597e1f4eb16681afb16908e81fe85e6b1e7b5df Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 18 Feb 2025 17:10:12 +0800 Subject: [PATCH 03/17] Update version to 1.3.11 Based Core Version to 1.4.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7c8b3064..d70a0d3d 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 = 3 -def AppBuildNumber = 9 +def AppBuildNumber = 11 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From fc3f5fafa10be56e828888d9783b9c6823635fd3 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 17:14:56 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=A7=BB=E9=99=A4USB=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/MainActivity.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java index 99ea14fc..66ccc386 100644 --- a/app/src/main/java/com/xypower/mpapp/MainActivity.java +++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java @@ -403,8 +403,6 @@ public class MainActivity extends AppCompatActivity { binding.btnCameraInfo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - MicroPhotoService.setOtgState(true); - MicroPhotoService.setCam3V3Enable(true); Runnable runnable = new Runnable() { @@ -415,8 +413,7 @@ public class MainActivity extends AppCompatActivity { Log.d(TAG, cameraInfo); MicroPhotoService.setCam3V3Enable(false); - MicroPhotoService.setOtgState(false); - + MicroPhotoService.infoLog(cameraInfo); Toast.makeText(view.getContext(), cameraInfo, Toast.LENGTH_LONG).show(); } From 87e88537371953e3888b2a3c4e80f7d1f7e5b2bb Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 18 Feb 2025 17:16:55 +0800 Subject: [PATCH 05/17] Update version to 1.3.12 Based Core Version to 1.4.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d70a0d3d..a02c2eb9 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 = 3 -def AppBuildNumber = 11 +def AppBuildNumber = 12 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From af9ace51839e435e09f3a317d5ca7b24322d0302 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 18:19:30 +0800 Subject: [PATCH 06/17] Update version to 1.3.13 Based Core Version to 1.4.8 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a02c2eb9..b93298d2 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 = 3 -def AppBuildNumber = 12 +def AppBuildNumber = 13 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From b7bfefe3e6ac37a57f8f200136870bac65b0310a Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 18:19:38 +0800 Subject: [PATCH 07/17] Refactor --- app/src/main/java/com/xypower/mpapp/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java index 66ccc386..153548ab 100644 --- a/app/src/main/java/com/xypower/mpapp/MainActivity.java +++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java @@ -413,7 +413,7 @@ public class MainActivity extends AppCompatActivity { Log.d(TAG, cameraInfo); MicroPhotoService.setCam3V3Enable(false); - + MicroPhotoService.infoLog(cameraInfo); Toast.makeText(view.getContext(), cameraInfo, Toast.LENGTH_LONG).show(); } From 7adebb30198196ab6bb0470a03e397faad8edf3c Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 20:11:18 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=BB=B6=E6=97=B6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 2 +- app/src/main/cpp/PhoneDevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index b1dfd284..4a442e6e 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1125,7 +1125,7 @@ bool CPhoneDevice::InstallAPP(const std::string& path, unsigned int delayedTime) return true; } -bool CPhoneDevice::Reboot(int resetType, bool manually, const std::string& reason) +bool CPhoneDevice::Reboot(int resetType, bool manually, const std::string& reason, uint32_t timeout/* = 1000*/) { if (resetType == REBOOT_TYPE_DEVICE) { diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index 077cda68..be6f3961 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -219,7 +219,7 @@ public: virtual bool UpdateSchedules(); virtual bool QuerySystemProperties(map& properties); virtual bool InstallAPP(const std::string& path, unsigned int delayedTime); - virtual bool Reboot(int resetType, bool manually, const std::string& reason); + virtual bool Reboot(int resetType, bool manually, const std::string& reason, uint32_t timeout = 1000); virtual bool EnableGPS(bool enabled); virtual float QueryBattaryVoltage(int timesForAvg, bool* isCharging); virtual bool RequestPosition(); From db208237d66e9e3eac9bf007b7c311263941372d Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 20:11:53 +0800 Subject: [PATCH 09/17] Update version to 1.3.14 Based Core Version to 1.4.9 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b93298d2..5619e7a8 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 = 3 -def AppBuildNumber = 13 +def AppBuildNumber = 14 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 4f1b8c3b496ecaf8409e73400a46ec306fb973e4 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 21:10:27 +0800 Subject: [PATCH 10/17] Update version to 1.3.15 Based Core Version to 1.4.10 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5619e7a8..b240214a 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 = 3 -def AppBuildNumber = 14 +def AppBuildNumber = 15 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 018ccea1f8ac28a20630b545eac938d99a45d6c0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 22:26:38 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 9586f8c8..354ca912 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -1239,7 +1239,7 @@ public class MpMasterService extends Service { if (destPathFile.exists()) { File dataPath = new File(destPathFile, "data"); if (dataPath.exists()) { - File file = new File(destPathFile, "App.json"); + File file = new File(dataPath, "App.json"); if (file.exists()) { return false; } else { @@ -1247,6 +1247,7 @@ public class MpMasterService extends Service { } } else { existed = false; + try { dataPath.mkdirs(); } catch (Exception ex) { From 85a3d99f2199272b1c4b37b9f05ea147659c0c7e Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 18 Feb 2025 22:37:20 +0800 Subject: [PATCH 12/17] Update MpMaster version to 1.0.95 --- mpmaster/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpmaster/build.gradle b/mpmaster/build.gradle index 2819700b..8883e0b8 100644 --- a/mpmaster/build.gradle +++ b/mpmaster/build.gradle @@ -4,7 +4,7 @@ plugins { def AppMajorVersion = 1 def AppMinorVersion = 0 -def AppBuildNumber = 94 +def AppBuildNumber = 95 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From e0ed5615c3dd282d4f6f9d14ad68e14bc6d972d2 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 19 Feb 2025 10:31:54 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 6 +++--- app/src/main/cpp/PhoneDevice.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 4a442e6e..f3d9328e 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -479,7 +479,7 @@ int32_t CPhoneDevice::CJpegCamera::getOutputFormat() const } CPhoneDevice::CPhoneDevice(JavaVM* vm, jobject service, const std::string& appPath, unsigned int netId, unsigned int versionCode, const std::string& nativeLibDir) - : mVersionCode(versionCode), m_nativeLibraryDir(nativeLibDir), m_network(NULL), m_netHandle(NETWORK_UNSPECIFIED) + : mVersionCode(versionCode), m_nativeLibraryDir(nativeLibDir), m_network(NULL), m_ethnetHandle(NETWORK_UNSPECIFIED) { mCamera = NULL; m_listener = NULL; @@ -3748,7 +3748,7 @@ void CPhoneDevice::UpdateSimcard(const std::string& simcard) void CPhoneDevice::UpdateEthernet(net_handle_t nethandle, bool available) { m_devLocker.lock(); - m_netHandle = available ? nethandle : NETWORK_UNSPECIFIED; + m_ethnetHandle = available ? nethandle : NETWORK_UNSPECIFIED; m_devLocker.unlock(); XYLOG(XYLOG_SEVERITY_WARNING, "NET Handle: %lld", available ? (uint64_t)nethandle : 0); @@ -3758,7 +3758,7 @@ net_handle_t CPhoneDevice::GetNetHandle() const { net_handle_t nethandle = NETWORK_UNSPECIFIED; m_devLocker.lock(); - nethandle = m_netHandle; + nethandle = m_ethnetHandle; m_devLocker.unlock(); return nethandle; diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index be6f3961..ec07c831 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -354,7 +354,7 @@ protected: std::string m_nativeLibraryDir; NETWORK* m_network; - net_handle_t m_netHandle; + net_handle_t m_ethnetHandle; jmethodID mRegisterHeartbeatMid; jmethodID mUpdateCaptureScheduleMid; From 3d3a02158ed320747ac9a7b5702d5faa7a79db8b Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 19 Feb 2025 10:34:52 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 8 ++++---- app/src/main/cpp/PhoneDevice.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index f3d9328e..bfa69e76 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1500,7 +1500,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c SetStaticIp(); std::this_thread::sleep_for(std::chrono::milliseconds(256)); - net_handle_t netHandle = GetNetHandle(); + net_handle_t netHandle = GetEthnetHandle(); if (netHandle == 0) { @@ -1508,7 +1508,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c for (int idx = 0; idx < 84; idx++) { std::this_thread::sleep_for(std::chrono::milliseconds(128)); - netHandle = GetNetHandle(); + netHandle = GetEthnetHandle(); if (netHandle != 0) { @@ -1584,7 +1584,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c bool netCaptureResult = false; for (int idx = 0; idx < 3; idx++) { - netHandle = GetNetHandle(); + netHandle = GetEthnetHandle(); netPhotoInfo.netHandle = netHandle; XYLOG(XYLOG_SEVERITY_INFO, "NetCapture %d NetHandle=%lld PHOTOID=%u", idx, netHandle, localPhotoInfo.photoId); @@ -3754,7 +3754,7 @@ void CPhoneDevice::UpdateEthernet(net_handle_t nethandle, bool available) XYLOG(XYLOG_SEVERITY_WARNING, "NET Handle: %lld", available ? (uint64_t)nethandle : 0); } -net_handle_t CPhoneDevice::GetNetHandle() const +net_handle_t CPhoneDevice::GetEthnetHandle() const { net_handle_t nethandle = NETWORK_UNSPECIFIED; m_devLocker.lock(); diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index ec07c831..fa9e9fed 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -262,7 +262,7 @@ public: void UpdateSimcard(const std::string& simcard); void UpdateEthernet(net_handle_t nethandle, bool available); - net_handle_t GetNetHandle() const; + net_handle_t GetEthnetHandle() const; protected: From 53df77733d27f2a567b92b9fd1e4b974470f461d Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 19 Feb 2025 11:41:12 +0800 Subject: [PATCH 15/17] =?UTF-8?q?DNS=20=E8=AE=BE=E7=BD=AE=E4=B8=BA=200.0.0?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/MicroPhotoService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index 188f85ec..a6f8664f 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1567,8 +1567,8 @@ public class MicroPhotoService extends Service { if (!TextUtils.isEmpty(gateway)) { intent.putExtra("gateway", gateway); } - // intent.putExtra("dns1", "8.8.8.8"); - // intent.putExtra("dns2", "192.168.19.1"); + intent.putExtra("dns1", "0.0.0.0"); + intent.putExtra("dns2", "0.0.0.0"); sendBroadcast(getApplicationContext(), intent); } } From 49cdb9d3ab469d4b592ca45854b274a3479ea10c Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 27 Jan 2025 21:54:06 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 2 +- mpmaster/src/main/res/drawable/ic_notification_mst.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 mpmaster/src/main/res/drawable/ic_notification_mst.xml diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 354ca912..0cd0e49b 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -945,7 +945,7 @@ public class MpMasterService extends Service { } notificationBuilder .setContent(remoteViews) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.ic_notification_mst) .setCategory(NotificationCompat.CATEGORY_SERVICE) .setOnlyAlertOnce(true) .setOngoing(true) diff --git a/mpmaster/src/main/res/drawable/ic_notification_mst.xml b/mpmaster/src/main/res/drawable/ic_notification_mst.xml new file mode 100644 index 00000000..52f9ab1a --- /dev/null +++ b/mpmaster/src/main/res/drawable/ic_notification_mst.xml @@ -0,0 +1,5 @@ + + + From 101c8f41a4d88d51239a66eafd8f199308353d18 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 27 Jan 2025 21:54:29 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/MicroPhotoService.java | 2 +- app/src/main/res/drawable/ic_notification_mp.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_notification_mp.xml diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index a6f8664f..8c1801eb 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1181,7 +1181,7 @@ public class MicroPhotoService extends Service { } notificationBuilder .setContent(remoteViews) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.ic_notification_mp) .setCategory(NotificationCompat.CATEGORY_SERVICE) .setOnlyAlertOnce(true) .setOngoing(true) diff --git a/app/src/main/res/drawable/ic_notification_mp.xml b/app/src/main/res/drawable/ic_notification_mp.xml new file mode 100644 index 00000000..0fd18e06 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification_mp.xml @@ -0,0 +1,5 @@ + + +