Merge branch 'feature-tianyong' into online

src/helpers/communication.ts

@@ -302,3 +302,12 @@ export const api_openAdjustRecording = (content: any) => {
 		content,
 	});
 };
+
+/** 监听评测弹窗是否隐藏保存演奏按钮 */
+export const hideComplexButton = (callback: CallBack, listen?: boolean) => {
+	if (listen) {
+		listenerMessage("hideComplexButton", callback);
+	} else {
+		removeListenerMessage("hideComplexButton", callback);
+	}
+};

src/page-instrument/evaluat-model/evaluat-result/index.tsx

@@ -71,11 +71,14 @@ export default defineComponent({
 					<img src={icons["arrow-left-background"]} />
 				</div>
 
+				{
+				!state.isHideEvaluatReportSaveBtn &&
 				<div class={styles.headerButton}>
 					<div class={[styles.headBtn, evaluatingData.resultData.recordId ? '' : styles.disabled]} onClick={() => emit("close", "update")}>
 						保存演奏
 					</div>
 				</div>
+				}
 
 				<div class={styles.fraction}>
 					<img class={styles.bg} src={imgs.bg} />

src/page-instrument/view-detail/index.module.less

@@ -43,6 +43,7 @@
 
 :global {
     #cursorImg-0 {
+        width: 2PX !important;
         min-height: 58PX;
         content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
         margin-top: -14PX;

src/state.ts

@@ -176,6 +176,8 @@ const state = reactive({
 	isSelectMeasureMode: false,
 	/** 是否是评分显示 */
 	isReport: false,
+  /** 是否隐藏评测报告弹窗，保存演奏按钮，默认不隐藏 */
+  isHideEvaluatReportSaveBtn: false,
 });
 const browserInfo = browser();
 let offset_duration = 0;

src/view/evaluating/index.tsx

@@ -21,6 +21,7 @@ import {
 	api_startCapture,
 	api_endCapture,
 	api_getDeviceDelay,
+	hideComplexButton,
 } from "/src/helpers/communication";
 import state, {
 	IPlayState,
@@ -217,6 +218,7 @@ const handleScoreResult = (res?: IPostMessage) => {
 		if (header?.commond === "overall") {
 			console.log("🚀 ~ 评测返回:", res);
 			// console.log("评测结束", body);
+			state.isHideEvaluatReportSaveBtn = false;
 			evaluatingData.resulstMode = true;
 			evaluatingData.resultData = {
 				...body,
@@ -409,6 +411,15 @@ export const handleViewReport = (
 	});
 };
 
+// 隐藏存演奏按钮
+const handleComplexButton = (res?: IPostMessage) => {
+	console.log('监听是否隐藏保存按钮', res)
+	if (res?.content) {
+		const { header, body } = res.content;
+		state.isHideEvaluatReportSaveBtn = true
+	}
+};
+
 export default defineComponent({
 	name: "evaluating",
 	setup() {
@@ -468,6 +479,7 @@ export default defineComponent({
 			evaluatingData.checkStep = 0;
 			evaluatingData.rendered = true;
 			sendResult(handleScoreResult);
+			hideComplexButton(handleComplexButton, true);
 			api_recordStartTime(recordStartTimePoint);
 			// 不是选段模式评测, 就清空已选段
 			if (!state.isSelectMeasureMode) {
@@ -480,6 +492,7 @@ export default defineComponent({
 			evaluatingData.rendered = false;
 			resetPlaybackToStart();
 			removeResult(handleScoreResult);
+			hideComplexButton(() => {}, false);
 			api_remove_recordStartTime(recordStartTimePoint);
 			handle_reduction();
 			console.log("卸载评测模块成功");

src/view/selection/index.module.less

@@ -94,6 +94,7 @@
     background-color: rgba(25, 140, 254, 0.7);
     min-height: 58PX;
     // width: 14PX;
+    width: 2PX !important;
     margin-top: -14PX;
     border-radius: 4Px;
     opacity: var(--corsor-opacity);