Merge branch 'feature-1007494' into 'release'

最后一步改为强制写入gb2818101 See merge request !78

Merge branch 'feature-1007494' into 'release'
最后一步改为强制写入gb2818101 See merge request !78
da58530e · 郭峰 · 4a2ce07c · 6d88acaf · da58530e
Commit da58530e authored Oct 18, 2024 by 郭峰
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 3 deletions

CameraHandle.cpp
+1 -3

No files found.
--- a/CameraHandle.cpp
+++ b/CameraHandle.cpp
@@ -1109,9 +1109,7 @@ int CameraHandle::resetGb28181(){
            }
        }
    }
-    forceWriteGb28181();
-    //this->updateSdkDevStatus(true);
-    return 1;
+    return forceWriteGb28181();
 }
 void CameraHandle::initWorkSpVMn(vides_data::responseGb28181 *gb28181, QString &workSpWMn){
    // 构建 toJsonObject