修改

whyclxw

2021-09-03 3146b4ffd1a56bd1c8d831c9140d83c22e0d0bbf

修改

 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java

@@ -390,8 +390,8 @@
    public static void updateFgcd_Filedownload_TableCmdByDevId(MysqlConnPool pool,FGCD_TestFBOFile file,int file_downloadNum) {

        String sql_str = " UPDATE " + Sql_Mysql.Tb_Fgcd_Filedownload_Table +

                         " SET stop_reason =  " + file.getStop_reason() +

                         " ,download_flag"+(file_downloadNum+1)+" =  " + file.files[file_downloadNum].download_flag +

                         " ,download_state"+(file_downloadNum+1)+" =  " + file.files[file_downloadNum].download_state +

                         " ,download_flag"+(file_downloadNum+1)+" =  " + FGCD_TestDataDownLoad.DownloadFlag_Fail+

                         " ,download_state"+(file_downloadNum+1)+" =  " + FGCD_TestDataDownLoad.DownLoadState_DownLoadCancel +

                         " WHERE dev_id =  " + file.dev_id;

        Sql_Mysql sql = new Sql_Mysql(pool);

        try {


 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_TestDataDownLoad.java

@@ -88,7 +88,6 @@
            if(now_download_state == DownLoadState_DownLoadCancel) {

                fbofile.files[i].setDownload_state(DownLoadState_DownLoadCancel);

                fbofile.files[i].setDownload_flag(DownloadFlag_Fail);

				
                FGCD_Task_Thread_SQL.updateFgcd_Filedownload_TableCmdByDevId(pool,fbofile,file_downloadNum);

                continue;

            }

@@ -103,10 +102,10 @@
                    if(fbofile.op_cmd == FGCD_ComBase.CMD_DownLoadFBDFile_Over) {

                        now_download_state = FGCD_ComBase.CMD_DownLoadFBDFile_Over;

                        fbofile.setStop_reason(FialReason_UserCancel);

                        //手动终止下载命令

                        /*//手动终止下载命令

                        fbofile.files[file_downloadNum].setDownload_flag(DownloadFlag_Fail);

                        fbofile.files[file_downloadNum].setDownload_state(DownLoadState_DownLoadCancel);

                        fbofile.op_cmd = FGCD_ComBase.CMD_DownLoadFBDFile_Over_ACK;

                        fbofile.files[file_downloadNum].setDownload_state(DownLoadState_DownLoadCancel);*/

                        //fbofile.op_cmd = FGCD_ComBase.CMD_DownLoadFBDFile_Over_ACK;

                        FGCD_Task_Thread_SQL.updateFgcd_Filedownload_TableCmdByDevId(pool, fbofile,file_downloadNum);

                        continue;

                    }                    

@@ -118,7 +117,6 @@
                            nowFbo.setNow_data_block(0);

                            nowFbo.setTotal_data_block(0);

                        }

						
                        updateDownLoadProgressByOne(pool,fbofile,file_downloadNum);        //更新当前下载进度

                        

                    }