From 6a8bee3ca19736aac44125aeb63413929c6833f7 Mon Sep 17 00:00:00 2001
From: xyj <10908227994@qq.com>
Date: Sat, 9 Dec 2023 18:41:35 +0800
Subject: [PATCH] update

---
 MQTT.py        | 30 ++++++++--------
 data_upload.py | 14 ++++----
 test.py        | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 22 deletions(-)
 create mode 100644 test.py

diff --git a/MQTT.py b/MQTT.py
index 831abe8..f992039 100755
--- a/MQTT.py
+++ b/MQTT.py
@@ -66,18 +66,18 @@ def on_message(client, userdata, msg):
 
 
 times = 120
-
-client = mqtt.Client(client_id=device_name)
-client.username_pw_set("demo", "123456")
-# Specify callback function
-client.on_connect = on_connect
-# 尝试连接 MQTT 服务器
-while True:
-    try:
-        # ceshi-mqtt.lihaink.cn
-        client.connect('192.168.1.27', 1883)
-        client.loop_start()
-    except Exception as e:
-        print("Connection failed:", e)
-    time.sleep(10)
-    print("正在尝试重连")
+if __name__ == '__main__':
+    client = mqtt.Client(client_id=device_name)
+    client.username_pw_set("demo", "123456")
+    # Specify callback function
+    client.on_connect = on_connect
+    # 尝试连接 MQTT 服务器
+    while True:
+        try:
+            # ceshi-mqtt.lihaink.cn
+            client.connect('192.168.1.27', 1883)
+            client.loop_forever()
+        except Exception as e:
+            print("Connection failed:", e)
+            time.sleep(10)
+            print("正在尝试重连")
diff --git a/data_upload.py b/data_upload.py
index eecbd23..ea89a47 100755
--- a/data_upload.py
+++ b/data_upload.py
@@ -32,12 +32,12 @@ while True:
     try:
         # ceshi-mqtt.lihaink.cn
         client.connect('192.168.1.27', 1883)
-        client.loop_start()
+        client.loop_forever()
     except Exception as e:
         print("Connection failed:", e)
-    if times == 0:
-        # 执行本地存储
-        on_disconnect(None, None, None)
-    print("正在尝试重连")
-    time.sleep(5)
-    times -= 1
+        if times == 0:
+            # 执行本地存储
+            on_disconnect(None, None, None)
+        print("正在尝试重连")
+        time.sleep(3)
+        times -= 1
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..a9e1e62
--- /dev/null
+++ b/test.py
@@ -0,0 +1,94 @@
+import json
+import time
+
+import paho.mqtt.client as mqtt
+
+from device import device_name
+from tool import *
+
+
+def valid(msg, client):
+    origin_data = json.loads(msg.payload.decode('utf-8'))
+    if 'msg' not in origin_data:
+        client.publish('error', payload='msg must be supplied', qos=0)
+        return False
+    if 'device_name' not in origin_data:
+        client.publish('error', payload='device_name must be supplied', qos=0)
+        return False
+    client.publish('error', payload=device_name, qos=0)
+    if device_name != origin_data['device_name']:
+        return False
+    return True
+
+
+class MQTTClient:
+    def __init__(self, broker, port, topic):
+        self.broker = broker
+        self.port = port
+        self.topic = topic
+        self.client = mqtt.Client()
+        self.client.on_connect = self.on_connect
+        self.client.on_disconnect = self.on_disconnect
+        self.client.on_message = self.on_message
+
+    def on_connect(self, client, userdata, flags, rc):
+        print("Connected with result code " + str(rc))
+        self.client.subscribe(self.topic)
+        client.subscribe('lot_mqtt')
+        client.publish('success', payload='成功订阅lot_mqtt' + str(time.time()), qos=0)
+
+    def on_disconnect(self, client, userdata, rc):
+        print("Disconnected with code " + str(rc))
+
+    def on_message(self, client, userdata, msg):
+        if not valid(msg, client):
+            client.publish('error', payload='验证失败', qos=0)
+            return
+        client.publish('success', payload='验证通过', qos=0)
+        try:
+            origin_data = json.loads(msg.payload.decode('utf-8'))
+            data = origin_data["msg"]
+            if data == "push_stream":
+                # 启动推流视频
+                push_stream(client)
+            elif data == "close_stream":
+                # 关闭推流视频
+                close_stream(client)
+            elif data == "exec":
+                #  执行命令
+                exec_sh(msg, client)
+            elif data == "update":
+                #  git更新项目和配置文件
+                update(client)
+            elif data == "record_list":
+                # 查看录像列表
+                get_list_record()
+            elif data == "record":
+                # 获取录像
+                get_record(msg, client)
+            elif data == "status":
+                # 查看运行状态
+                get_status(client)
+            else:
+                # 错误类型
+                client.publish('error', payload='No Such Type', qos=0)
+        except Exception as e:
+            pass
+
+    def start(self):
+        self.client.connect(self.broker, self.port)
+        # self.client.loop_start()
+
+
+if __name__ == '__main__':
+    MQTT = MQTTClient('192.168.1.27', 1883, 'lot_mqtt')
+    while True:
+        try:
+            MQTT.start()
+            if MQTT.client.is_connected():
+                print("连接成功")
+            MQTT.client.loop_forever()
+        except:
+            print("重新连接")
+            time.sleep(1)
+