Merge branch 'fix/DEFECT-1440' into 'main_dev'

fix: 修改小程序选择TCP/UDP设备命令下发只支持json格式,不能直接下发命令请求(需加上字符串类型)

See merge request yunteng/thingskit-app!113

@@ -126,8 +126,8 @@
 				</view>
 				</view>
 				<view style="margin-top: 28rpx;width: 100%;">
 				<view style="margin-top: 28rpx;width: 100%;">
 					<div class="u-flex u-row-between">
 					<div class="u-flex u-row-between">
-						<u--textarea placeholder="请输入下发内容(json格式)" v-model="inputCommandVal" />
-						<u-icon @click="handleCopy(copyTextValue)" name="question-circle" color="#2979ff" size="28"
+						<u--textarea :placeholder="`请输入下发内容${isShowTCP?'(字符串格式)':'(json格式)'}`" v-model="inputCommandVal" />
+						<u-icon v-if="!isShowTCP" @click="handleCopy(copyTextValue)" name="question-circle" color="#2979ff" size="28"
 							class="ml-10">
 							class="ml-10">
 						</u-icon>
 						</u-icon>
 					</div>
 					</div>
@@ -187,7 +187,8 @@
 				showModel: false,
 				showModel: false,
 				commandType: 'OneWay',
 				commandType: 'OneWay',
 				commandValue: {},
 				commandValue: {},
-				inputCommandVal: ''
+				inputCommandVal: '',
+				isShowTCP:false,//用于下发命令时判断是否是TCP/UDP
 			};
 			};
 		},
 		},
 		computed: {
 		computed: {
@@ -257,11 +258,15 @@
 			},
 			},
 			showModal(e) {
 			showModal(e) {
 				this.modalName = e.currentTarget.dataset.target
 				this.modalName = e.currentTarget.dataset.target
+				const {transportType} = this.deviceDetail.deviceProfile
+				this.isShowTCP = transportType=='TCP'?true:false
 				this.showNodal = true
 				this.showNodal = true
 			},
 			},
 			showModalBtn() {
 			showModalBtn() {
 				this.showModel = true;
 				this.showModel = true;
 				this.inputCommandVal = '';
 				this.inputCommandVal = '';
+				const {transportType} = this.deviceDetail.deviceProfile
+				this.isShowTCP = transportType=='TCP'?true:false
 			},
 			},
 			disabledScroll() {
 			disabledScroll() {
 				return;
 				return;
@@ -276,13 +281,22 @@
 			},
 			},
 			async confirmCommand() {
 			async confirmCommand() {
 				try {
 				try {
-					const commandJsonValue = JSON.parse(this.inputCommandVal);
+					this.commandValue.method = 'methodThingskit';
 					this.commandValue.persistent = true;
 					this.commandValue.persistent = true;
 					this.commandValue.additionalInfo = {
 					this.commandValue.additionalInfo = {
 						cmdType: 'API'
 						cmdType: 'API'
 					};
 					};
-					this.commandValue.method = 'methodThingskit';
-					this.commandValue.params = commandJsonValue
+					if(this.isShowTCP){//TCP的格式只能是字符串
+						const zg = /^[0-9a-zA-Z]*$/
+						if(!zg.test(this.inputCommandVal)) {
+							uni.$u.toast('输入的内容只能是字母和数字的组合')
+							return 
+						}
+						this.commandValue.params = this.inputCommandVal
+					}else{
+						const commandJsonValue = JSON.parse(this.inputCommandVal);
+						this.commandValue.params = commandJsonValue
+					}
 					await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, this.commandValue);
 					await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, this.commandValue);
 					this.hiddenModal();
 					this.hiddenModal();
 					uni.$u.toast('下发成功~');
 					uni.$u.toast('下发成功~');
@@ -395,4 +409,4 @@
 			width: 300rpx;
 			width: 300rpx;
 		}
 		}
 	}
 	}
-</style>
+</style>