1、修复三相进单相出相信息读取错误bug

pro/src/app.c

@@ -2123,7 +2123,7 @@ int app_init(void)
             }
             memset(_globalTACManager->global_over_manager, 0, sizeof(GlobalOverManager));
             ret = dev_get_t_ac_power_manage_info(_globalDeviceManager->db,
-                                                 _globalDeviceManager->_globalDevInfo.product.id, 0,TreeACindex + 1,
+                                                 _globalDeviceManager->_globalDevInfo.product.id, 0,0,
                                                  TreeACindex, // 1*8+j
                                                  _globalTACManager);
             _globalTACManager->product_ch_addr = TreeACindex + 1;

pro/src/common.c

@@ -367,8 +367,10 @@ int set_time(struct tm *t, int zone)
 
 
 int set_utctime(time_t t)
-{
-    return stime(&t);
+{    
+    stime(&t);
+    set_rtc(t);
+    return 0;
 }
 
 

pro/src/sqlite_handle.c

@@ -1552,7 +1552,7 @@ int dev_get_t_ac_power_manage_info(sqlite3 *db,int product_id,int product_addr,i
     char** pResult = NULL;  //用来指向sql执行结果的指针
     char* err_msg=NULL;
     char select_sql[1024] = {0};
-    sprintf(select_sql,"SELECT* FROM Table_PhasePowerManage WHERE product_ch_addr_id=%d and product_ph_order=%d;",product_addr,product_ph_type);
+    sprintf(select_sql,"SELECT* FROM Table_PhasePowerManage WHERE product_ch_id_belong=%d and product_ph_order=%d;",product_ch_id,product_ph_type);
     res = sqlite3_get_table(db, select_sql, &pResult, &nrow, &ncolumn, &err_msg);
     if(res != SQLITE_OK) {
         log_e("sqlite handle error: %s\n%s\n", err_msg,select_sql); sqlite3_free(err_msg);

pro/src/switch_ctrl.c

@@ -2642,7 +2642,7 @@ int ResetChmData(int nCtrlType)
                             }
                             ret = dev_get_t_ac_power_manage_info(_globalDeviceManager->db,
                                                                  _globalDeviceManager->_globalDevInfo.product.id, i,
-                                                                 j + 1, // 1*8+j
+                                                                  _globalPowerMangerTemp->product_ch_id, 
                                                                  indexT,
                                                                  _globalTACManager);
                             _globalTACManager->product_ch_addr = j + 1;
@@ -2945,7 +2945,7 @@ int ResetChmData(int nCtrlType)
                             }
                             ret = dev_get_t_ac_power_manage_info(_globalDeviceManager->db,
                                                                  _globalDeviceManager->_globalDevInfo.product.id, i,
-                                                                 j + 1, // 1*8+j
+                                                                _globalPowerMangerTemp->product_ch_id, 
                                                                  indexT,
                                                                  _globalTACManager);
                             _globalTACManager->product_ch_addr = j + 1;
@@ -3080,7 +3080,7 @@ int ResetChmData(int nCtrlType)
                         }
                         ret = dev_get_t_ac_power_manage_info(_globalDeviceManager->db,
                                                              _globalDeviceManager->_globalDevInfo.product.id, i,
-                                                             j + 1, // 1*8+j
+                                                              _globalPowerMangerTemp->product_ch_id, // 1*8+j
                                                              (j + 3) % 3,
                                                              _globalTACManager);
                         _globalTACManager->product_ch_addr = j + 1;