Merge branch 'develop' into test

src/pages/Shower/Shower.tsx

@@ -224,7 +224,7 @@ class Shower extends Component {
   }
 
   closeDeviceSocket() {
-    const { task } = this.state;
+    const { task, timer } = this.state;
     console.log('in close', task);
     if (task) {
       task.close({
@@ -236,6 +236,9 @@ class Shower extends Component {
         },
       });
     }
+    if (timer) {
+      clearTimeout(timer);
+    }
   }
 
   checkUsingDevice() {