Merge branch 'master' of code.gitlink.org.cn:mahaotian/jyokdhisbgxxy

Author: qy-liuhuo

.gitignore

@@ -7,4 +7,5 @@
 **/*.key
 **/*.pyc
 **/*.db
-.DS_Store
+.DS_Store
+/temp/

cliptest.py

@@ -1,10 +1,8 @@
 import sys
-
-
-from PyQt5.QtWidgets import QApplication, QDialog, QVBoxLayout, QPushButton, QLabel
+from PyQt5.QtWidgets import QApplication, QDialog, QVBoxLayout, QPushButton
 import qt_material
-from src.sharer.client import Client
-from src.sharer.server import Server
+from src.client import Client
+from src.server import Server
 
 
 class RoleSelectionDialog(QDialog):
@@ -15,7 +13,10 @@ def __init__(self):
 
         self.setWindowTitle("身份选择")
         self.layout = QVBoxLayout()
-
+        qr = self.frameGeometry()  # 获取对话框的几何框架
+        cp = QApplication.primaryScreen().availableGeometry().center()  # 获取屏幕中心点
+        qr.moveCenter(cp)  # 将对话框几何框架的中心移动到屏幕中心
+        self.move(qr.topLeft())  # 将对话框的左上角移动到新的位置
         self.server_button = QPushButton("主控机")
         self.client_button = QPushButton("被控机")
 
@@ -40,17 +41,20 @@ def select_client(self):
 
 def main():
     app = QApplication(sys.argv)
-    qt_material.apply_stylesheet(app, theme='dark_blue.xml')
+    qt_material.apply_stylesheet(app, theme='light_blue.xml')
     selected_role = 'client'
     # 显示身份选择弹窗
     role_dialog = RoleSelectionDialog()
     if role_dialog.exec_() == QDialog.Accepted:
         selected_role = role_dialog.selected_role
-    if selected_role == 'server':
-        Server(app)
-    elif selected_role == 'client':
-        Client(app)
-    app.exec_()
-
+    try:
+        if selected_role == 'server':
+            Server(app).run()
+        elif selected_role == 'client':
+            Client(app).run()
+    except Exception as e:
+        print(e)
+    finally:
+        app.quit()
 if __name__ == "__main__":
     main()