feat: 代码提交

.hbuilderx/launch.json

@@ -20,7 +20,7 @@
         },
         {
             "customPlaygroundType" : "local",
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.15.2",
-    "versionCode" : 11502,
+    "versionName" : "1.15.6",
+    "versionCode" : 11506,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/webviewdgp.vue

@@ -19,6 +19,7 @@
 			this.accessToken = options.accessToken
 			// this.url = "http://8.136.98.49/#/recognition"
 			this.url = "/static/h52dgp.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken + "&videoType=dgp"
+			// this.url = "https://wx.hnyfwlw.com/wexin/h52.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken + "&videoType=dgp"
 			// uni.setStorage({
 			// 	key: 'obj',
 			// 	data: JSON.stringify({

static/h52dgp.html

@@ -202,7 +202,7 @@
 	<script src="https://unpkg.com/video.js@7.10.2/dist/video.min.js"></script>
 	<script type="module">
 		import Player from './videoPlayer/videoPlay-js.js'
-		const host = "http://218.28.198.186:10508"
+		const domin = 'https://wx.hnyfwlw.com'
 		// 检测HLS支持
 		function checkHLSSupport() {
 			const video = document.createElement('video');
@@ -380,7 +380,7 @@
 			
 			return $.ajax({
 				type: "POST",
-				url: `${host}/api/api_gateway?method=device.device_manage.get_device_info`,
+				url: `${domin}/api/api_gateway?method=device.device_manage.get_device_info`,
 				data: {
 					device_id: device_id,
 					token: token
@@ -436,9 +436,9 @@
 				} else {
 
 					$('#dialog').html('拍照指令正在下发，请等待...').stop().show(50)
-					let url =`${host}/api/api_gateway?method=camera.camera_manage.camera_takephoto`
+					let url =`${domin}/api/api_gateway?method=camera.camera_manage.camera_takephoto`
 					if (videoType == 'dgp') {
-						url = `${host}/api/api_gateway?method=camera.camera_manage.multi_camera_takephoto`
+						url = `${domin}/api/api_gateway?method=camera.camera_manage.multi_camera_takephoto`
 					}
 					$.ajax({
 						type: "POST",
@@ -458,13 +458,13 @@
 				}
 
 			} else {
-				let url = `${host}/api/api_gateway?method=camera.camera_manage.ctrl_camera`
+				let url = `${domin}/api/api_gateway?method=camera.camera_manage.ctrl_camera`
 				let postData = {
 					device_id: device_id,
 					token
 				}
 				if (videoType == 'dgp') {
-					url = `${host}/api/api_gateway?method=camera.camera_manage.multi_ctrl_camera`
+					url = `${domin}/api/api_gateway?method=camera.camera_manage.multi_ctrl_camera`
 					postData.ctrl = movenum
 				} else {
 					postData.ctrl = ctrl
@@ -488,7 +488,7 @@
 				stopTimer = setTimeout(()=>{
 					$.ajax({
 						type: "POST",
-						url: `${host}/api/api_gateway?method=camera.camera_manage.mulit_stop_move`,
+						url: `${domin}/api/api_gateway?method=camera.camera_manage.mulit_stop_move`,
 						data: {
 							device_id: device_id,
 							token
@@ -499,7 +499,7 @@
 			} else {
 				$.ajax({
 					type: "POST",
-					url: `${host}/api/api_gateway?method=camera.camera_manage.ctrl_camera`,
+					url: `${domin}/api/api_gateway?method=camera.camera_manage.ctrl_camera`,
 					data: {
 						device_id: device_id,
 						ctrl: "stop",
@@ -516,7 +516,7 @@
 			form.append('token', token)
 			$.ajax({
 				type: "POST",
-				url: `${host}/api/api_gateway?method=camera.camera_manage.save_camera_photo`,
+				url: `${domin}/api/api_gateway?method=camera.camera_manage.save_camera_photo`,
 				contentType: false,
 				processData: false,
 				data: form
@@ -582,7 +582,7 @@
 				if (videoType == 'dgp') {
 					$.ajax({
 						type: "POST",
-						url: `${host}/api/api_gateway?method=camera.camera_manage.multi_addr_camera`,
+						url: `${domin}/api/api_gateway?method=camera.camera_manage.multi_addr_camera`,
 						data: {
 							device_id: device_id,
 							token
@@ -762,7 +762,7 @@
 				$.ajax({
 					type: "POST",
 					// url: "http://47.110.79.22:9000/api/api_gateway?method=camera.camera_manage.multi_addr_camera",
-					url: `${host}/api/api_gateway?method=camera.camera_manage.multi_addr_camera`,
+					url: `${domin}/api/api_gateway?method=camera.camera_manage.multi_addr_camera`,
 					data: {
 						device_id: device_id,
 						token

util/api.js

@@ -10,6 +10,7 @@ export const myRequest = (options) => {
         : 'http://8.136.98.49:8002';
     // BASE_URL = 'http://192.168.1.107:8000'
     // BASE_URL = 'http://218.28.198.186:10508';
+    // BASE_URL = 'http://8.136.98.49:8002';
   }
   // BASE_URL = config.productAPI;
   // BASE_URL = config.developAPI;

util/neutral.js

@@ -1,6 +1,6 @@
 export default {
-  // isneutral:true,//云飞智控
-  isneutral: false, //智控
+  isneutral:true,//云飞智控
+  // isneutral: false, //智控
   developAPI:'http://218.28.198.186:10508',//测试环境访问地址
   // productAPI:'http://8.136.98.49:8002',//生产环境
   productAPI:'https://api.hnyfwlw.com',//生产环境