Merge pull request #1073 from barry-ran/dev

barry-ran · web-flow · commit ec5f413a3893 · 2024-12-07T17:26:04.000+08:00
sync dev
diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
@@ -1 +1 @@
-Subproject commit eb8b7837b18d4d2c13276d90884feb7f1c37d7ba
+Subproject commit 8e2cc1f3b17ad888b567ce05c5fe125bcaca0dd5
diff --git a/QtScrcpy/groupcontroller/groupcontroller.cpp b/QtScrcpy/groupcontroller/groupcontroller.cpp
@@ -262,7 +262,7 @@ void GroupController::postCut()
     }
 }
 
-void GroupController::setScreenPowerMode(bool open)
+void GroupController::setDisplayPower(bool on)
 {
     for (const auto& serial : m_devices) {
         if (true == isHost(serial)) {
@@ -273,7 +273,7 @@ void GroupController::setScreenPowerMode(bool open)
             continue;
         }
 
-        device->setScreenPowerMode(open);
+        device->setDisplayPower(on);
     }
 }
 
diff --git a/QtScrcpy/groupcontroller/groupcontroller.h b/QtScrcpy/groupcontroller/groupcontroller.h
@@ -31,7 +31,7 @@ class GroupController : public QObject, public qsc::DeviceObserver
     void postVolumeDown() override;
     void postCopy() override;
     void postCut() override;
-    void setScreenPowerMode(bool open) override;
+    void setDisplayPower(bool on) override;
     void expandNotificationPanel() override;
     void collapsePanel() override;
     void postBackOrScreenOn(bool down) override;
diff --git a/QtScrcpy/ui/toolform.cpp b/QtScrcpy/ui/toolform.cpp
@@ -186,7 +186,7 @@ void ToolForm::on_closeScreenBtn_clicked()
     if (!device) {
         return;
     }
-    device->setScreenPowerMode(false);
+    device->setDisplayPower(false);
 }
 
 void ToolForm::on_expandNotifyBtn_clicked()
@@ -221,5 +221,5 @@ void ToolForm::on_openScreenBtn_clicked()
     if (!device) {
         return;
     }
-    device->setScreenPowerMode(true);
+    device->setDisplayPower(true);
 }
diff --git a/QtScrcpy/ui/videoform.cpp b/QtScrcpy/ui/videoform.cpp
@@ -290,7 +290,7 @@ void VideoForm::installShortcut()
         if (!device) {
             return;
         }
-        emit device->setScreenPowerMode(false);
+        emit device->setDisplayPower(false);
     });
 
     // expandNotificationPanel
diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh
@@ -58,7 +58,7 @@ fi
 mkdir $build_path
 cd $build_path
 
-cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64"
+cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=10.10"
 cmake $cmake_params ../..
 if [ $? -ne 0 ] ;then
     echo "cmake failed"

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ void GroupController::postCut()`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`		`-void GroupController::setScreenPowerMode(bool open)`
	`265`	`+void GroupController::setDisplayPower(bool on)`
`266`	`266`	`{`
`267`	`267`	`for (const auto& serial : m_devices) {`
`268`	`268`	`if (true == isHost(serial)) {`
`@@ -273,7 +273,7 @@ void GroupController::setScreenPowerMode(bool open)`
`273`	`273`	`continue;`
`274`	`274`	`}`
`275`	`275`
`276`		`- device->setScreenPowerMode(open);`
	`276`	`+ device->setDisplayPower(on);`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ void ToolForm::on_closeScreenBtn_clicked()`
`186`	`186`	`if (!device) {`
`187`	`187`	`return;`
`188`	`188`	`}`
`189`		`- device->setScreenPowerMode(false);`
	`189`	`+ device->setDisplayPower(false);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`void ToolForm::on_expandNotifyBtn_clicked()`
`@@ -221,5 +221,5 @@ void ToolForm::on_openScreenBtn_clicked()`
`221`	`221`	`if (!device) {`
`222`	`222`	`return;`
`223`	`223`	`}`
`224`		`- device->setScreenPowerMode(true);`
	`224`	`+ device->setDisplayPower(true);`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void VideoForm::installShortcut()`
`290`	`290`	`if (!device) {`
`291`	`291`	`return;`
`292`	`292`	`}`
`293`		`- emit device->setScreenPowerMode(false);`
	`293`	`+ emit device->setDisplayPower(false);`
`294`	`294`	`});`
`295`	`295`
`296`	`296`	`// expandNotificationPanel`