refactor: 适配3.0.2的电源接口

barry-ran · Dec 7, 2024 · 8e8df04 · 8e8df04
1 parent 723b4ef
commit 8e8df04
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
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
+5 −2		include/QtScrcpyCore.h
+3 −3		src/device/controller/controller.cpp
+1 −1		src/device/controller/controller.h
+4 −4		src/device/controller/inputconvert/controlmsg.cpp
+4 −11		src/device/controller/inputconvert/controlmsg.h
+4 −10		src/device/device.cpp
+1 −1		src/device/device.h