Home Explore Help
Register Sign In
chenzhiguang
/
bigSceneEdit_java
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

# Conflicts:
#	edit.html
xzw 4 years ago
parent
2b4384919e 26ab39b82d
commit
15a5ed093a
2 changed files with 169 additions and 60 deletions
Unified View Show Diff Stats
  1. 156 34
      eforclient.html
  2. 13 26
      js/edit.js

+ 156 - 34
eforclient.html
View File 

@@ -36,8 +36,17 @@
 
     </script>
 
     </script>
 
 </head>
 
 </head>
 
 
 
-<body>
 
+<body> 
     <div class="wrapper">
 
     <div class="wrapper">
 
+        <div class="waiting"> 
+            <div class="overlay"></div>
 
+            <div class="spinner">
 
+                <div class="bounce1"></div>
 
+                <div class="bounce2"></div>
 
+                <div class="bounce3"></div>
 
+            </div>
 
+            <div class="text">请等待...</div>
 
+        </div> 
         <div class="toolTop hasPad unable">
 
         <div class="toolTop hasPad unable">
 
             <!-- 顶部header -->
 
             <!-- 顶部header -->
 
             <div class="btns"></div>
 
             <div class="btns"></div>
 
@@ -76,6 +85,14 @@
 
                         <span class="VREditIcon VR"></span>
 
                         <span class="VREditIcon VR"></span>
 
                         <label>VR</label>
 
                         <label>VR</label>
 
                     </li>
 
                     </li>
 
+                    <li data-name="overlay">
 
+                        <span class="overlay"></span>
 
+                        <label>视频</label>
 
+                    </li>
 
+                    <li data-name="panoVisible">
 
+                        <span class="panoVisible"></span>
 
+                        <label>漫游可行</label>
 
+                    </li>
 
                 </ul>
 
                 </ul>
 
             </div>
 
             </div>
 
             <div class="toolMid">
 
             <div class="toolMid">
 
@@ -869,10 +886,9 @@
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
                 <div class="midBottom hasPad">
 
                 <div class="midBottom hasPad">
 
-                    <!-- 中间下部 -->
 
-
 
+                    <!-- 中间下部 --> 
                     <div class="confirmSnap innerBtn hide" id="camera-start">点此设置为初始画面</div>
 
                     <div class="confirmSnap innerBtn hide" id="camera-start">点此设置为初始画面</div>
 
-
 
+                    <!--  <div class="innerBtn hide cancel" data-lang="">隐藏该点</div>  -->	
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
             <div class="toolRight">
 
             <div class="toolRight">
 
@@ -912,7 +928,7 @@
 
                             <ul></ul>
 
                             <ul></ul>
 
                         </li>
 
                         </li>
 
                     </ul>
 
                     </ul>
 
-                    <div id="hotpointDetail" class="editDetail  atRight">
 
+                    <div id="hotpointDetail" class="editDetail secondary atRight">
 
                         <div class="itemTitle head">
 
                         <div class="itemTitle head">
 
                             <span>热点添加</span>
 
                             <span>热点添加</span>
 
                             <a class="close"></a>
 
                             <a class="close"></a>
 
@@ -928,8 +944,38 @@
 
                                         <input spellcheck="false" placeholder="热点的标题" class="right" type="text"
 
                                         <input spellcheck="false" placeholder="热点的标题" class="right" type="text"
 
                                             minlength="1" maxlength="15" placeholder="">
 
                                             minlength="1" maxlength="15" placeholder="">
 
                                     </div><!-- 必填，限15字 ？？-->
 
                                     </div><!-- 必填，限15字 ？？-->
 
-                                    <textarea placeholder="热点的简介" class="editText"></textarea>
 
+                                    <div class="itemTitle" data-size="200">
 
+                                        <span>简介</span>
 
+                                    </div>
 
+                                    <textarea placeholder="热点的简介" class="editText" maxlength="200"></textarea>
 
+
 
 
 
+
 
+                                </li>
 
+                                <li class="setPos">
 
+                                    <div class="itemTitle">
 
+                                        <span>位置</span>
 
+                                    </div>
 
+                                    <ul class="MenuOptions innerBtn" name="transform">
 
+                                        <li class="halfCell chosen" index="translate" data-lang="">位移</li>
 
+                                        <!-- <li class="halfCell" index="scale" data-lang="">缩放</li> -->
 
+                                        <li class="halfCell" index="rotate" data-lang="">旋转</li>
 
+                                    </ul>
 
+                                </li>  
+                                <li class="style">
 
+                                    <div class="itemTitle">
 
+                                        <span>样式</span>
 
+                                    </div>
 
+                                    <ul class="MenuOptions innerBtn">
 
+                                        <li class="halfCell chosen" index="default">默认</li>
 
+                                        <li class="halfCell" index="user" >自定义</li> 
+                                    </ul>
 
+                                    <div id="userUploadStyle" class="hide">
 
+                                        <ul>
 
+                                            <li class="upload "><div> </div><a class="del"></a></li>
 
+                                            <li class="upload hide"><div> </div><a class="del"></a></li>
 
+                                        </ul>
 
+                                    </div>
 
                                 </li>
 
                                 </li>
 
                                 <li class="photo">
 
                                 <li class="photo">
 
                                     <div class="itemTitle" data-size="<2M">
 
                                     <div class="itemTitle" data-size="<2M">
 
@@ -1036,17 +1082,17 @@
 
                             <!-- <div class="unComplete">请填写项目名称</div> -->
 
                             <!-- <div class="unComplete">请填写项目名称</div> -->
 
                         </li>
 
                         </li>
 
                         <li data-name="description">
 
                         <li data-name="description">
 
-                            <div class="itemTitle" data-size="200" id="project-intro2">
 
+                            <div class="itemTitle" data-size="200" id="project-intro2" >
 
                                 <span>简介内容</span>
 
                                 <span>简介内容</span>
 
                             </div>
 
                             </div>
 
 
 
-                            <textarea placeholder="大场景的简介" id="info-summary" class="editText"></textarea>
 
+                            <textarea placeholder="大场景的简介" id="info-summary" class="editText" maxlength="200"></textarea>
 
 
 
                             <div class="itemTitle" data-size="200" id="project-intro2">
 
                             <div class="itemTitle" data-size="200" id="project-intro2">
 
                                 <span>分享文字</span>
 
                                 <span>分享文字</span>
 
                             </div>
 
                             </div>
 
 
 
-                            <textarea placeholder="微信分享的描述" id="weixin-summary" class="editText"></textarea>
 
+                            <textarea placeholder="微信分享的描述" id="weixin-summary" class="editText" maxlength="200"></textarea>
 
 
 
                         </li>
 
                         </li>
 
                         <li data-name="hotStyle">
 
                         <li data-name="hotStyle">
 
@@ -1071,7 +1117,7 @@
 
                         </li>
 
                         </li>
 
                         <li data-name="floorMarkerColor">
 
                         <li data-name="floorMarkerColor">
 
                             <div class="itemTitle">
 
                             <div class="itemTitle">
 
-                                <span>选择地面/导览标志颜色</span>
 
+                                <span>当前位置标记/导览标记颜色</span>
 
                             </div>
 
                             </div>
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                                 <input id="floorMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
                                 <input id="floorMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
@@ -1080,7 +1126,7 @@
 
                         </li>
 
                         </li>
 
                         <li data-name="MouseMarkerColor">
 
                         <li data-name="MouseMarkerColor">
 
                             <div class="itemTitle">
 
                             <div class="itemTitle">
 
-                                <span>选择鼠标标志颜色</span>
 
+                                <span>鼠标标记颜色</span>
 
                             </div>
 
                             </div>
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                                 <input id="mouseMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
                                 <input id="mouseMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
@@ -1108,20 +1154,14 @@
 
                                     <input name="hideFloorMarker" class="editCheckbox" type="checkbox"
 
                                     <input name="hideFloorMarker" class="editCheckbox" type="checkbox"
 
                                         value="hideFloorMarker" id="hideFloorMarker">
 
                                         value="hideFloorMarker" id="hideFloorMarker">
 
                                     <label for="hideFloorMarker"></label>
 
                                     <label for="hideFloorMarker"></label>
 
-                                    <label for="hideFloorMarker">隐藏地面标记 </label>
 
+                                    <label for="hideFloorMarker">隐藏地面marker标记 </label>
 
                                 </li>
 
                                 </li>
 
                                 <li>
 
                                 <li>
 
                                     <input name="hideMouseMarker" class="editCheckbox" type="checkbox"
 
                                     <input name="hideMouseMarker" class="editCheckbox" type="checkbox"
 
                                         value="hideMouseMarker" id="hideMouseMarker">
 
                                         value="hideMouseMarker" id="hideMouseMarker">
 
                                     <label for="hideMouseMarker"></label>
 
                                     <label for="hideMouseMarker"></label>
 
                                     <label for="hideMouseMarker">隐藏鼠标标记 </label>
 
                                     <label for="hideMouseMarker">隐藏鼠标标记 </label>
 
-                                </li>
 
-                                <li>
 
-                                    <input name="hideMouseMarker" class="editCheckbox" type="checkbox"
 
-                                        value="hideMouseMarker" id="hideMouseMarker">
 
-                                    <label for="hideMouseMarker"></label>
 
-                                    <label for="hideMouseMarker">显示场景热点列表 </label>
 
-                                </li>
 
+                                </li> 
                                 <li>
 
                                 <li>
 
                                     <input name="g_specialScene" class="editCheckbox" type="checkbox"
 
                                     <input name="g_specialScene" class="editCheckbox" type="checkbox"
 
                                         value="g_specialScene" id="g_specialScene">
 
                                         value="g_specialScene" id="g_specialScene">
 
@@ -1135,6 +1175,12 @@
 
                                     <label for="twoData">启动二代数据 <i class="colorRed">-请慎重选择</i> </label>
 
                                     <label for="twoData">启动二代数据 <i class="colorRed">-请慎重选择</i> </label>
 
                                 </li>
 
                                 </li>
 
                             </ul>
 
                             </ul>
 
+                            <ul>
 
+                                <li>
 
+                                    <label class="remark">注： <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。
 
+                                    <br><br>启动二代数据：和tile贴图有关。</label>
 
+                                </li>
 
+                            </ul>     
                         </li>
 
                         </li>
 
                     </ul>
 
                     </ul>
 
                 </div>
 
                 </div>
 
@@ -1162,10 +1208,10 @@
 
 
 
                 <div class="snapTour content hide">
 
                 <div class="snapTour content hide">
 
                     <ul>
 
                     <ul>
 
-                        <div id="tourEdit" class="editDetail  atRight">
 
+                        <div id="tourEdit" class="secondary  editDetail  atRight">
 
                             <div class="itemTitle head">
 
                             <div class="itemTitle head">
 
                                 <span>导览编辑</span>
 
                                 <span>导览编辑</span>
 
-                                <a class="close"></a>
 
+                                <!-- <a class="close"></a> -->
 
                             </div>
 
                             </div>
 
                             <div class="content">
 
                             <div class="content">
 
                                 <ul>
 
                                 <ul>
 
@@ -1213,7 +1259,7 @@
 
                             </div>
 
                             </div>
 
                             <div class="buttons tail">
 
                             <div class="buttons tail">
 
                                 <button id="tourSubmit" class="submit innerBtn">完成</button>
 
                                 <button id="tourSubmit" class="submit innerBtn">完成</button>
 
-                                <button class="cancel innerBtn">取消</button>
 
+                                <!-- <button class="cancel innerBtn">取消</button> -->
 
                             </div>
 
                             </div>
 
 
 
                         </div>
 
                         </div>
 
@@ -1255,6 +1301,77 @@
 
                     </ul>
 
                     </ul>
 
                 </div>
 
                 </div>
 
                 <div class="wallDesign content hide"></div>
 
                 <div class="wallDesign content hide"></div>
 
+                <div class="panoVisible content hide">
 
+                    <ul class="view-setting"><li ><div class="itemTitle"><span>漫游可行</span></div>
 
+                        <div  class="remark">通过设置漫游可行，进一步优化在漫游时出现的体验；例如，您在漫游时，出现穿透房间的情况。</div>  
+                        <div  class="remark">点击“保存当前设置”后展示页面立即生效。</div>
 
+                        </li>
 
+                    </ul>
 
+                </div>
 
+                <div class="overlay content hide">
 
+                    <ul>
 
+						<li class="addBtn"> 
+							<div class="buttons">
 
+								<button class="innerBtn" data-lang="">添加视频</button>
 
+							</div>
 
+						</li>
 
+						<li class="overlayList ">
 
+                            <div class="itemTitle">
 
+                                <span>已添加的视频</span>
 
+                            </div>
 
+                            <ul>
 
+                            
+                            </ul>
 
+                        </li> 
+					</ul>                
+                </div>
 
+                
+				<div id="overlayProp" class="secondary atRight ">
 
+					<div class="itemTitle head">
 
+						<span data-lang="">BOX视频属性</span>
 
+						<a class="close"></a>
 
+					</div> 
+					<div class="content"> 
+						<ul>   
+							<li id="overlayUpload"> 
+								<div class="itemTitle">
 
+									<span data-lang="">预览</span>  
+									<div class="buttons" name="upload">
 
+										<button class="innerBtn" data-lang="">上传视频</button>
 
+									</div>
 
+								</div> 
+								<div class="preview"><span class="text">支持MP4、MOV等，＜20M</span> <span attr-type="height"></span><span attr-type="width"></span></div>
 
+								<div class="buttons" name="useImgRatio">
 
+									<button class="innerBtn" data-lang="">恢复原始比例</button>
 
+								</div>
 
+								<ul class="MenuOptions innerBtn" name="transform">
 
+									<li class="halfCell chosen" index="translate" data-lang="">位移</li>
 
+									<li class="halfCell" index="scale" data-lang="">缩放</li>
 
+									<li class="halfCell" index="rotate" data-lang="">旋转</li>
 
+								</ul>							
+							</li>
 
+						 
+							
+							<li>
 
+								<!-- <div class="itemTitle" data-name="overlayAddBox">
 
+									<span data-lang="">厚度</span>
 
+									<div class="switch">
 
+										<div></div>
 
+									</div>									
+								</div> -->
 
+								<div class="itemTitle">
 
+									<span data-lang="">厚度</span>  
+								</div>
 
+								<div id="videoDepth"></div> 
+							</li>  
+						</ul> 	
+					</div>
 
+					<div class="buttons tail">
 
+						<button class="submit innerBtn" data-lang="">完成</button>
 
+						<button class="delete cancel innerBtn" data-lang="">删除</button>
 
+					</div>					
+				</div>
 
+                
             </div>
 
             </div>
 
             <div data-label="video">
 
             <div data-label="video">
 
                 <div class="fun-view-video">
 
                 <div class="fun-view-video">
 
@@ -1272,10 +1389,24 @@
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
 
 
+    
+
 
+    <script src="js/lib/jquery-2.1.1.min.js" class="build keep"></script>
 
+    <script src="js/lib/player-0.0.12.min.js" class="build keep"></script>
 
+    <script src="js/Tween.js"></script>
 
+    <script src="js/myShow-edit.js"></script>
 
+    <script src="js/SpecialScene.js"></script>
 
+    <script src="js/manage.js"></script>
 
+    <script src="js/edit.js"></script>
 
+    <script src="js/overlay.js"></script>
 
+    <script src="js/TransformControls.js"></script>
 
+    <script src="js/main_2020_edit.js"></script>
 
+
 
     <script>
 
     <script>
 
-        
-        if (number !== 'ZGYH') {
 
-            window.location.href = '/'
 
+        let clientCode = getQueryVariable('cmp')
 
+
 
+        if (clientCode) {
 
+            
         }
 
         }
 
 
 
         var log = window.location.href.substring(window.location.href.indexOf("?") + 1).indexOf('log') > -1;
 
         var log = window.location.href.substring(window.location.href.indexOf("?") + 1).indexOf('log') > -1;
 
@@ -1327,15 +1458,6 @@
 
             }
 
             }
 
         }
 
         }
 
     </script>
 
     </script>
 
-
 
-    <script src="js/lib/jquery-2.1.1.min.js" class="build keep"></script>
 
-    <script src="js/lib/player-0.0.12.min.js" class="build keep"></script>
 
-    <script src="js/Tween.js"></script>
 
-    <script src="js/myShow-edit.js"></script>
 
-    <script src="js/SpecialScene.js"></script>
 
-    <script src="js/manage.js"></script>
 
-    <script src="js/edit.js"></script>
 
-    <script src="js/ZGYH/main_2018.js"></script>
 
 </body>
 
 </body>
 
 
 
 </html>
 
 </html>

+ 13 - 26
js/edit.js
View File 

@@ -1,9 +1,11 @@
 
+var ceshi = '';
 
+// var ceshi = 'http://192.168.0.135:8105';
 
+//  var ceshi = 'http://47.107.252.54:8105';
 
 
 
-
 
-var _musicMaxWeight = 8//M
 
-
 
-
 
-
 
+// var token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk2NzAxNjAyLCJpYXQiOjE1OTY2MTUyMDIsImp0aSI6Ijk0YjA5YTg1LWViY2ItNDE1Yy04OGVmLWU0MDM1M2UzYmIxYyJ9.Uzi95n0kYXp7bdpY77MdLtTpPL_Fq-jn0tE7gjg6AzA"
 
+var token = window.localStorage.dcj_token
 
+ 
+var cmp = getQueryVariable('cmp') || ''
 
 
 
 function reData(data,type) {
 
 function reData(data,type) {
 
   return JSON.stringify(data) == type ? null : data
 
   return JSON.stringify(data) == type ? null : data
 
@@ -190,8 +192,7 @@ EditTools.prototype.saveAll = function () {
 
         if(info)overlayInfo.push(info); 
         if(info)overlayInfo.push(info); 
     })  
     })  
 
 
-
 
-
 
+    let url = cmp?('/api/scene/edit/'+cmp):'/manage/scene/edit'
 
     
     
     $.ajax({
 
     $.ajax({
 
       method: 'POST',
 
       method: 'POST',
 
@@ -201,7 +202,7 @@ EditTools.prototype.saveAll = function () {
 
       },
 
       },
 
       dataType:'json',
 
       dataType:'json',
 
       contentType:'application/json',
 
       contentType:'application/json',
 
-      url: ceshi + '/manage/scene/edit', 
+      url: ceshi + url, 
       data: JSON.stringify({
 
       data: JSON.stringify({
 
         sceneCode:number,
 
         sceneCode:number,
 
         hots: reData(hots,'{}') ,
 
         hots: reData(hots,'{}') ,
 
@@ -1502,25 +1503,10 @@ function uploadFile(file, type, callback) {
 
   formData.append('random', true)
 
   formData.append('random', true)
 
   formData.append('file', file)
 
   formData.append('file', file)
 
 
 
- 
-
 
-/* 
-var blob = dataURLtoBlob(fileObj.file);
 
-                form.append("file", blob, fileObj.name);
 
-            } else {
 
-                if (fileObj.isBlob) {
 
-                    console.log('上传的文件：' + fileObj.name)
 
-                    form.append("file", fileObj.file, fileObj.name);
 
-                } else {
 
-                    var file = fileObj.file;
 
-                    form.append("file", file, fileObj.name);
 
-                } */
 
-
 
-
 
-
 
+  let url = cmp? ('/api/scene/upload/'+number) : ('/manage/scene/upload/'+number)
 
 
 
   $.ajax({ 
   $.ajax({ 
-    url: ceshi + '/manage/scene/upload/'+number, 
+    url: ceshi + url, 
     data: formData,
 
     data: formData,
 
     headers:{
 
     headers:{
 
       token:token
 
       token:token
 
@@ -2866,10 +2852,11 @@ var VisiSet = {
 
         alert("保存成功")
 
         alert("保存成功")
 
         console.log(JSON.stringify(PanoData)) */
 
         console.log(JSON.stringify(PanoData)) */
 
         
         
+        let url = cmp? ('/api/scene/roamViable/'+cmp) : '/manage/scene/roamViable'
 
         
         
         $.ajax({
 
         $.ajax({
 
           method: 'POST', 
           method: 'POST', 
-          url: ceshi + '/manage/scene/roamViable',
 
+          url: ceshi + url,
 
           headers:{
 
           headers:{
 
             'Content-Type':'application/json',
 
             'Content-Type':'application/json',
 
             token:token 
             token:token