取消topic列表订阅方式

donghu-jiang · donghu-jiang · commit f485b49ec743 · 2021-08-11T11:37:29.000+08:00
Change-Id: Ib2ddf3172d33c6b10c7402a6114f0f4400482f4a
diff --git a/explorer/services/template/template.py b/explorer/services/template/template.py
@@ -188,12 +188,17 @@ def template_reset(self):
         self.__replyAck = -1
 
     def template_deinit(self):
-        topic_list = []
-        topic_list.append(self.__topic.template_property_topic_sub)
-        topic_list.append(self.__topic.template_event_topic_sub)
-        topic_list.append(self.__topic.template_action_topic_sub)
-        topic_list.append(self.__topic.template_service_topic_sub)
-        return self.__hub.unsubscribe(topic_list)
+        # topic_list = []
+        # topic_list.append(self.__topic.template_property_topic_sub)
+        # topic_list.append(self.__topic.template_event_topic_sub)
+        # topic_list.append(self.__topic.template_action_topic_sub)
+        # topic_list.append(self.__topic.template_service_topic_sub)
+        # return self.__hub.unsubscribe(topic_list)
+
+        self.__hub.unsubscribe(self.__topic.template_property_topic_sub)
+        self.__hub.unsubscribe(self.__topic.template_event_topic_sub)
+        self.__hub.unsubscribe(self.__topic.template_action_topic_sub)
+        return self.__hub.unsubscribe(self.__topic.template_service_topic_sub)
 
     def template_init(self, callback, peopery_cb, action_cb, event_cb, service_cb):
         property_topic = self.__topic.template_property_topic_sub
@@ -213,13 +218,6 @@ def template_init(self, callback, peopery_cb, action_cb, event_cb, service_cb):
 
         self.__hub.register_explorer_callback(topic_list, callback)
 
-        # topic_list.clear()
-        # topic_list.append((service_topic, 0))
-        # topic_list.append((property_topic, 0))
-        # topic_list.append((action_topic, 0))
-        # topic_list.append((event_topic, 0))
-        # return self.__hub.subscribe(topic_list, 0)
-
         self.__hub.subscribe(property_topic, 0)
         self.__hub.subscribe(action_topic, 0)
         self.__hub.subscribe(event_topic, 0)
diff --git a/hub/protocol/protocol.py b/hub/protocol/protocol.py
@@ -239,12 +239,12 @@ def subscribe(self, topic, qos=-1):
         # topic format [(topic1, qos),(topic2,qos)]
         if isinstance(topic, list):
             topic_list = []
-            for topic, qos in topic:
+            for t, qos in topic:
                 if qos < 0 or qos > 1:
                     raise ValueError('Invalid QoS level.')
-                if topic is None or len(topic) == 0 or not isinstance(topic, str):
+                if t is None or len(t) == 0 or not isinstance(t, str):
                     raise ValueError('Invalid topic.')
-                topic_list.append((topic, qos))
+                topic_list.append((t, qos))
 
             rc, mid = self.__mqtt_client.subscribe(topic_list)
             if rc == mqtt.MQTT_ERR_SUCCESS:
