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 = 3
-def AppBuildNumber = 101
+def AppBuildNumber = 102
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/PhoneDevice.cpp

@@ -2273,7 +2273,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(10));
+                std::this_thread::sleep_for(std::chrono::seconds(15));
             }
 
             pThis->TakePhotoWithNetCamera(localPhotoInfo, path, osds, powerCtrlPtr);

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

@@ -514,9 +514,16 @@ public class MicroPhotoService extends Service {
                         }
                     }
                 } catch (Exception ex) {
-
+                    ex.printStackTrace();
                 }
 
+                try {
+                    Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPMASTER);
+                    // launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    context.startActivity(launchIntent);
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
             } else if (TextUtils.equals(ACTION_TAKE_PHOTO, action)) {
                 long ts = intent.getLongExtra(EXTRA_PARAM_TIME, 0);
                 int cnt = intent.getIntExtra(EXTRA_PARAM_SCHEDULES, 0);