6666666665544444

manifest.json

@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.6.3",
-    "versionCode" : 163,
+    "versionName" : "1.6.4",
+    "versionCode" : 164,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/NursingNew/component/nurse/index.vue

@@ -196,6 +196,9 @@
 															<view v-if="item1.startTime" class="title-time-font-rel">
 																{{splitString(item1.directiveName)[0]}}
 															</view>
+															<view v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule && !item1.startTime" class="pulic-time">
+																{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
+															</view>
 														</view>
 													</view>
 												</view>
@@ -2178,4 +2181,14 @@
 		border-right: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	}
+	.pulic-time{
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #99C9FD;
+		font-size: 35rpx;
+		font-weight: 600;
+	}
 </style>

pages/camera.nvue

@@ -1,7 +1,7 @@
 <template>
 	<div class="center-column" :style="{ height: isshow ? '510px' : '0px' }">
 		<!-- 视频播放组件 -->
-		<MonitorView ref="monitor" :init="initnumber" style="width: 650px;height: 510px;" @onTel="handleTelEvent"
+		<MonitorView ref="monitor" init="5" style="width: 650px;height: 510px;" @onTel="handleTelEvent"
 			@onSnapShot="handleSnapShotEvent" @onRecord="handleRecordEvent" @onTalkStatus="handleTalkEvent" />
 	</div>
 </template>
@@ -59,37 +59,15 @@
 			uni.setStorageSync('saveinit', 5);
 			// this.doStopRecord()
 			uni.$on('monitor:changeinit', (number) => {
-					this.initnumber = number;
+					// this.initnumber = number;
+					// this.$refs.monitor.killView
+					this.$refs.monitor.initAutoPlay(number)
 					uni.setStorageSync('saveinit', number);
-					if (globalEvent && globalEvent.addEventListener) {
-						globalEvent.addEventListener("myEvent", (e) => {
-							console.log(e)
-					
-							if (e.recordUrl) {
-								uni.showToast({
-									title: '录屏成功',
-									icon: 'success', // 'success' | 'loading' | 'none'
-									duration: 1500
-								})
-							}
-							if (e.snapShotUrl) {
-								uni.showToast({
-									title: '截屏成功',
-									icon: 'success', // 'success' | 'loading' | 'none'
-									duration: 1500
-								})
-							}
-							if (this.suo && e.onVolumeChange) {
-								if (e.onVolumeChange) {
-									this.toggleVolume();
-								}
-								this.suo = false;
-							}
-						});
-					}
+					console.log("?????",number)
 				}
 			);
 			uni.$on('monitor:isshow', (bool) => this.isshow = bool);
+			uni.$on('monitor:killView', this.killView);
 			// 在页面生命周期注册 uni.$on 事件，暴露给其他页面调用
 			uni.$on('monitor:doSnapshot', this.doSnapshot);
 			uni.$on('monitor:startRecord', this.doStartRecord);
@@ -108,6 +86,7 @@
 		},
 		onUnload() {
 			// 页面卸载时一定要解绑
+			uni.$off('monitor:killView', (bool) => this.killView);
 			uni.$off('monitor:changeinit', (number) => this.initnumber = number);
 			uni.$off('monitor:isshow', (bool) => this.isshow = bool);
 			uni.$off('monitor:doSnapshot', this.doSnapshot);
@@ -131,7 +110,10 @@
 				console.log("Tel event detail:", event.detail);
 				// 如果需要解析电话事件，在这里处理
 			},
-
+			killView() {
+			
+				this.$refs.monitor.killView && this.$refs.monitor.killView();
+			},
 			switchDisplay(mode) {
 				console.log("zzzzz", mode)
 				this.$refs.monitor && this.$refs.monitor.switchDisplayModeFragment(mode);

pages/watch/api/lunpan.js

@@ -5,7 +5,7 @@ import request from '@/request/guanli.js'
 
 // 用你给的四个固定值
 export const movedirection = (direction,startOrNot) => {
-  const url = `/iot/tplink/cameraInfo/motionCtrl?deviceIndex=${uni.getStorageSync('saveinit') || 5}&direction=${direction}&startOrNot=${startOrNot}&speed=1`;
+  const url = `/iot/tplink/cameraInfo/motionCtrl?deviceIndex=${uni.getStorageSync('saveinit') ? uni.getStorageSync('saveinit'): 5}&direction=${direction}&startOrNot=${startOrNot}&speed=1`;
   return request({ url, method: 'get' });
 }
 

pages/watch/index.vue

@@ -209,7 +209,7 @@
 						<view
 							style="display: flex;justify-content: space-around;height: 100rpx;width: 100%;align-items: center;">
 							<view class="">
-								清晰度
+								翻转
 							</view>
 							<image style="width: 40rpx;height: 40rpx" src="/static/index/camera/back.png"
 								@click="jumpopen=false" />
@@ -314,6 +314,13 @@
 		"展开",
 	]
 	const downtarget = ref(0)
+	
+	const cleanAll = () => {
+		wheretarget.value = 3;
+		cameratarget.value = [];
+		downtarget.value = 0;
+		cameraArray.value = cameraSmall
+	}
 
 	const jumpToCeshi = () => {
 		uni.navigateTo({
@@ -388,17 +395,17 @@
 			//给屏幕右侧数据用的
 			const nearest = findClosestItem(item.elderServerEntityList, time.value)
 			// console.log("zzzzaaa", item)
-			if(!nearest){
+			if (!nearest) {
 				serveritem.value = {
 					startTime: "",
 					endTime: "",
 					typeName: "",
 					immediateFile: ""
 				}
-			}else{
+			} else {
 				serveritem.value = nearest
 			}
-			
+
 		} else {
 			serveritem.value = {
 				startTime: "",
@@ -407,10 +414,16 @@
 				immediateFile: ""
 			}
 		}
-		// console.log("<<<<", filteredMenu[menuIndex.value])
+		cleanAll()
+		uni.$emit('monitor:killView');
 		if (item.cameraInfo !== null && item.cameraInfo[0].deviceName) {
 			uni.$emit('monitor:isshow', true);
-			uni.$emit('monitor:changeinit', item.cameraInfo[0].deviceIndex);
+			
+			// 加点延迟吧
+			setTimeout(() => {
+				uni.$emit('monitor:changeinit', item.cameraInfo[0].deviceIndex);
+			}, 100)
+
 		} else {
 			uni.$emit('monitor:isshow', false)
 		}
@@ -418,6 +431,7 @@
 	const clickTopMenu = (index : number) => {
 		cleanandopen();
 		topTargetIndex.value = index;
+		changeLeftMenu(filteredMenu.value[0], 0)
 	}
 	// const change
 	const opendrawer = () => {
@@ -705,8 +719,8 @@
 					savetypeNow.value = leftTargetIndex.value
 					uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId);
 					uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
-					uni.setStorageSync('customerId',filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
-					
+					uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
+
 					if (!typeNow.value) {
 						uni.navigateTo({
 							url: '/pages/NursingNew/index'

unpackage/cache/wgt/__UNI__FB2D473/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.5.6","code":156},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNIFB2D473","aliasname":"__uni__fb2d473","password":"Z4Urhm9jqwqMGoeQNpGzJA==","storepwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keypwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"share":{"weixin":{"UniversalLinks":"","appid":"wxda748470da82886e"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"nativePlugins":{"MonitorModule":{}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"adid":"122926210510"},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.6.3","code":163},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"],"packagename":"uni.UNIFB2D473","aliasname":"__uni__fb2d473","password":"Z4Urhm9jqwqMGoeQNpGzJA==","storepwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keypwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"share":{"weixin":{"UniversalLinks":"","appid":"wxda748470da82886e"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"nativePlugins":{"MonitorModule":{}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"adid":"122926210510"},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

unpackage/cache/wgt/__UNI__FB2D473/pages/watch/settings/saoma.css

@@ -1 +1 @@
-.index-content-other[data-v-33cdb877]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-33cdb877]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-33cdb877]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-33cdb877]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-33cdb877]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-33cdb877]{color:#415273;font-size:1.09375rem}.saomiao[data-v-33cdb877]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.blue-button[data-v-33cdb877]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-33cdb877]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-33cdb877]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-33cdb877]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-33cdb877]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:56.25rem;height:28.125rem}.big-img[data-v-33cdb877]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:10.9375rem;height:10.9375rem}.big-img[data-v-33cdb877]:before{content:"";position:absolute;top:0;left:0;width:100%;animation:scanMove-33cdb877 1.3s ease-in-out infinite;z-index:1001;height:2.5rem;background:linear-gradient(to bottom,rgba(5,170,254,.6),rgba(5,170,254,.1),transparent);will-change:transform}.big-QR[data-v-33cdb877]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:9.375rem;height:9.375rem}.big-font[data-v-33cdb877]{position:absolute;color:#888a8b;left:0;bottom:-2.5rem;font-size:1rem;width:100%;display:flex;justify-content:center}@keyframes scanMove-33cdb877{0%{top:5%}to{top:95%}}
+.index-content-other[data-v-b2122159]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-b2122159]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-b2122159]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-b2122159]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-b2122159]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-b2122159]{color:#415273;font-size:1.09375rem}.saomiao[data-v-b2122159]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.blue-button[data-v-b2122159]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-b2122159]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-b2122159]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-b2122159]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-b2122159]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:56.25rem;height:28.125rem}.big-img[data-v-b2122159]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:10.9375rem;height:10.9375rem}.big-img[data-v-b2122159]:before{content:"";position:absolute;top:0;left:0;width:100%;animation:scanMove-b2122159 1.3s ease-in-out infinite;z-index:1001;height:2.5rem;background:linear-gradient(to bottom,rgba(5,170,254,.6),rgba(5,170,254,.1),transparent);will-change:transform}.big-QR[data-v-b2122159]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:9.375rem;height:9.375rem}.big-font[data-v-b2122159]{position:absolute;color:#888a8b;left:0;bottom:-2.5rem;font-size:1rem;width:100%;display:flex;justify-content:center}@keyframes scanMove-b2122159{0%{top:5%}to{top:95%}}