From 09fc6706aa38286949cea50d223e46d48f57eaec Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 11 Nov 2021 10:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A3=E8=8A=B1=E4=BF=AE=E6=94=B9=E5=9B=A0?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/dev/editApp/editApp.html    | 94 ++++++++++---------
 public/components/dev/editApp/editApp.js      |  2 +-
 .../cameraControlVideo/cameraControlVideo.js  |  2 +-
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/public/components/dev/editApp/editApp.html b/public/components/dev/editApp/editApp.html
index d9c696692..7736e9fc3 100755
--- a/public/components/dev/editApp/editApp.html
+++ b/public/components/dev/editApp/editApp.html
@@ -1,49 +1,53 @@
-<div id = "editAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <h3 class="m-t-none m-b ">修改应用</h3>
-                <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-         <label class="col-sm-2 col-form-label">应用名称</label>
-         <div class="col-sm-10">
-           <input v-model="editAppInfo.name"                   type="text" placeholder="必填，请填写应用名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">秘钥</label>
-         <div class="col-sm-10">
-           <input v-model="editAppInfo.securityCode"                   type="text" placeholder="选填，请填写秘钥" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">白名单</label>
-         <div class="col-sm-10">
-           <input v-model="editAppInfo.whileListIp"                   type="text" placeholder="选填，请填写白名单" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">黑名单</label>
-         <div class="col-sm-10">
-           <input v-model="editAppInfo.blackListIp"                   type="text" placeholder="选填，请填写黑名单" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写备注" class="form-control" v-model="editAppInfo.remark"></textarea>         </div>
-</div>
-
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editApp()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
-                            </div>
-                        </div>
-                    </div>
+<div id="editAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+  aria-hidden="true">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-body">
+        <h3 class="m-t-none m-b ">修改应用</h3>
+        <div class="ibox-content">
+          <div>
+            <div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">应用名称</label>
+                <div class="col-sm-10">
+                  <input v-model="editAppInfo.name" type="text" placeholder="必填，请填写应用名称" class="form-control">
                 </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">秘钥</label>
+                <div class="col-sm-10">
+                  <input v-model="editAppInfo.securityCode" type="text" placeholder="选填，请填写秘钥" class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">白名单</label>
+                <div class="col-sm-10">
+                  <input v-model="editAppInfo.whileListIp" type="text" placeholder="选填，请填写白名单" class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">黑名单</label>
+                <div class="col-sm-10">
+                  <input v-model="editAppInfo.blackListIp" type="text" placeholder="选填，请填写黑名单" class="form-control">
+                </div>
+              </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">备注</label>
+                <div class="col-sm-10">
+                  <textarea placeholder="选填，请填写备注" class="form-control" v-model="editAppInfo.remark"></textarea>
+                </div>
+              </div>
+
+              <div class="ibox-content">
+                <button class="btn btn-primary float-right" type="button" v-on:click="editApp()"><i
+                    class="fa fa-check"></i>&nbsp;保存</button>
+                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                  data-dismiss="modal">取消</button>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/public/components/dev/editApp/editApp.js b/public/components/dev/editApp/editApp.js
index 64830ecb0..67d9c747d 100755
--- a/public/components/dev/editApp/editApp.js
+++ b/public/components/dev/editApp/editApp.js
@@ -19,7 +19,7 @@
             vc.on('editApp', 'openEditAppModal', function (_params) {
                 vc.component.refreshEditAppInfo();
                 $('#editAppModel').modal('show');
-                vc.component.editAppInfo = _params;
+                vc.copyObject(_params,vc.component.editAppInfo);
                 //vc.component.editAppInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
diff --git a/public/components/property/cameraControlVideo/cameraControlVideo.js b/public/components/property/cameraControlVideo/cameraControlVideo.js
index a7eb6819d..3d4a40b06 100644
--- a/public/components/property/cameraControlVideo/cameraControlVideo.js
+++ b/public/components/property/cameraControlVideo/cameraControlVideo.js
@@ -60,7 +60,7 @@
                 );
             },
             _initMachineVideo:function(_machines){
-                $that._playVideo('rtc_media_player1','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010');
+                $that._playVideo('rtc_media_player1','webrtc://112.124.21.207/live/34020000002000000010@34020000001320000010');
                 $that._playVideo('rtc_media_player2','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');
                 $that._playVideo('rtc_media_player3','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010');
                 $that._playVideo('rtc_media_player4','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');