Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev

entry/src/main/ets/pages/UserInfo.ets

@@ -641,8 +641,7 @@ struct UserInfo {
     this.startExam = false
     // await upDateTableByArray('USER', [])
     // await upDateTableByArray('USERLIST', [])
-    await DB.clearTable('USER')
-    await DB.clearTable('USERLIST')
+
     this.type = '2'
     this.errorDialog.open()
     this.updateTimeLimit = true
@@ -650,6 +649,8 @@ struct UserInfo {
     try {
       getExaminationStudentInfo(param).then(async (res) => {
         console.log("temp log ", JSON.stringify(res))
+        await DB.clearTable('USER')
+        await DB.clearTable('USERLIST')
         this.errorDialog.close()
         setTimeout(() => {
           this.updateTimeLimit = false

entry/src/main/ets/pages/VideoConfig.ets

@@ -117,7 +117,7 @@ struct Index {
               for (let i = 1; i <= 4; i++) {
                 console.log('rocord_handle', i, JSON.stringify(this.rocordHandleObj))
                 if (this.rocordHandleObj['rocord_handle'+i]) {
-                  endRecordVideo(this.rocordHandleObj['rocord_handle'+i])
+                  endRecordVideo(this.rocordHandleObj)
                   this.rocordHandleObj['rocord_handle'+i] = 0
                 }
               }