Merge branch 'master' of https://gowone.dy.takin.cc/liyuezong/SmartPDCode

pro/src/app.c

@@ -2530,7 +2530,7 @@ static void* sensor_thread(void* arg)
         _globalDeviceManager->g_modebus_read.humidity = Max_humi;
         _globalDeviceManager->g_modebus_read.fCO2 = Max_CO2;
 
-        sleep(1);
+        usleep(100000);
     }
 #endif
     pthread_exit(NULL);

pro/src/appweb_handle.c

@@ -2743,7 +2743,7 @@ static void sensorStatusMonitoring(void* conn)
             return ;   
         }
         
-        _globalSensorMangerTemp->sensor_status = 0;
+        _globalSensorMangerTemp->sensor_status = 1;
         switch( _globalSensorMangerTemp->sensor_type)
         {
             case SENSOR_TYPE_TEMP_HUMI:     _globalSensorMangerTemp->sensor_val_count = 2 ;break; //温湿度传感器 2个值

pro/src/sys.c

@@ -106,7 +106,11 @@ int sys_set_factory(void)
     snprintf(src, sizeof(src), "%s/%s", dir, DATABASE_BAK_NAME);
     snprintf(dst, sizeof(dst), "%s/%s", dir, DATABASE_NAME);
     LOGD("__1__ file_copy from %s to %s\n", src, dst);
-    r = file_copy(dst, src);
+    char sysorder[100];
+    snprintf(sysorder, sizeof(sysorder), "cp -f %s %s", src, dst);
+    // r = file_copy(dst, src);
+    r = system(sysorder);
+    LOGD("__1__ file_copy r=%d!\n", r);
 
     if(0) {
         r = paras_reset();
@@ -116,7 +120,11 @@ int sys_set_factory(void)
         snprintf(dst, sizeof(dst), "%s/%s", dir, INI_FILE_NAME);
 
         LOGD("__2__ file_copy from %s to %s\n", src, dst);
-        r = file_copy(dst, src);
+        char sysorder1[100];
+        snprintf(sysorder1, sizeof(sysorder1), "cp -f %s %s", src, dst);
+        // r = file_copy(dst, src);
+        r = system(sysorder1);
+        LOGD("__2__ file_copy r=%d!\n", r);
     }
 
 #if 0