Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!40

certificate/ios/爱加密.txt

@@ -0,0 +1,30 @@
+sudo xattr -r -d com.apple.quarantine /Users/jlbank/Desktop/lx_uniapp/ijiami-clang-tools &&  chmod -R 777 /Users/jlbank/Desktop/lx_uniapp/ijiami-clang-tools
+
+
+
+硬件UDID：E3C9EBD6-514C-5D48-952D-850F37E06380
+Device: en0
+Ethernet Address: d0:11:e5:42:11:3d
+
+./setijmkey.sh "16968477f92c1590247396"
+
+jlbank@jlbank-aideiMac sh % ./ijiami-version.sh
+Execution time: 0 milliseconds
+Apple clang version 17.0.0 (clang-1700.0.13.5)
+Target: arm64-apple-darwin24.5.0
+Thread model: posix
+InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/ijiami.xctoolchain/usr/bin
+author_code: 0
+after_mainExecution time: 3 milliseconds
+Execution time: 0 milliseconds
+swift-driver version: 1.120.5 Execution time: 0 milliseconds
+Apple Swift version 6.1.2 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
+Target: arm64-apple-macosx15.0
+author_code: 0
+after_mainExecution time: 1 milliseconds
+爱加密工具链版本号:	ijiami Obfuscator v3.1.14
+
+-Xllvm -ipo -Xllvm -ipo-percent=80 -Xllvm -ipo-prob=50 -Xllvm -ipo-loop=1
+
+
+-Xllvm -ipo -Xllvm -ipo-percent=80 -Xllvm -ipo-prob=50 -Xllvm -ipo-loop=1

certificate/ios/苹果账号.txt

@@ -0,0 +1,36 @@
+包名:cn.com.jlbank.aits
+苹果账号
+xiangyuanhua@126.com
+Xiang@1987
+田岩UDID:
+00008101-001911401152001E
+官网地址：https://appstoreconnect.apple.com/
+https://developer.apple.com/account/resources
+1.生成证书
+证书文件:development.cer
+p12证书:证书.p12
+证书密码:Kup9dayLY#*
+2.生成标识符Identifiers
+App ID Prefix:2EP6SRRN43 (Team ID)
+Bundle ID:cn.com.jlbank.aits (explicit)
+3.生成描述文件
+测试描述文件:jiaixue.mobileprovision
+
+离线key:caf112ffeb8174f764076b6b109aa329
+appID:__UNI__EDE0E52
+
+dcloud_appkey
+
+
+
+Hb修改流程：
+1.修改infoPlist的app名称
+2.修改control.xml里面的appid
+3.在HBuilder-Hello-Info.plist添加dcloud_appkey项，值为caf112ffeb8174f764076b6b109aa329
+4.
+
+25.64.16.140
+255.255.255.0
+25.64.16.254
+
+http://25.13.9.101:9000/

src/pages/course/components/touchBtn.vue

@@ -120,18 +120,18 @@ onMounted(async ()=>{
 				})
 			}
 		}else{
-			let _recordPerm = permission.judgeIosPermission('record')
-			if(!_recordPerm){
-				common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？',true, '取消','确定').then((res) => {
-					if(res) {
-						// 去开启权限
-						permission.gotoAppPermissionSetting()
-					}else{
-						// 取消
-						common.navigateBack()
-					}
-				})
-			}
+			// let _recordPerm = permission.judgeIosPermission('record')
+			// if(!_recordPerm){
+			// 	common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？',true, '取消','确定').then((res) => {
+			// 		if(res) {
+			// 			// 去开启权限
+			// 			permission.gotoAppPermissionSetting()
+			// 		}else{
+			// 			// 取消
+			// 			common.navigateBack()
+			// 		}
+			// 	})
+			// }
 		}
 	// #endif
 })

src/pages/course/study.vue

@@ -177,7 +177,6 @@ const isUploadingVoice = ref(false)
 // 初始化数据
 const getData = async (flag) => {
 	try{
-		initsocketTask()
 		const { body } = await getCourseStudyInfoApi({crsId: crsId.value})
 		teacherList.value = body.teacheList.map(t=>({
 			...t,
@@ -581,18 +580,18 @@ const logId = ref('')
 // ws 初始化逻辑
 const initsocketTask = () => {
 	socketStore.creatSocket()
-	unref(SocketObj).on('open', (res)=>{
-		if(startPgrphId.value){
-			sendMessage({
-				"commond" : 'STDY',
-				"body" : {
-					crsId: crsId.value,
-					teacherNo: choiceTeacher.value
-				}
-			})
-			step.value = 2
-		}
- 	})
+	// unref(SocketObj).on('open', (res)=>{
+	// 	if(startPgrphId.value){
+	// 		sendMessage({
+	// 			"commond" : 'STDY',
+	// 			"body" : {
+	// 				crsId: crsId.value,
+	// 				teacherNo: choiceTeacher.value
+	// 			}
+	// 		})
+	// 		step.value = 2
+	// 	}
+ // 	})
 	unref(SocketObj).on('message', (res)=>{
 		const { rtnCode, body, commond } = JSON.parse(res.data) 
 		if(rtnCode === '0000'){
@@ -632,8 +631,8 @@ onLoad((params) => {
 const showTalkingModel = ref(false)
 // 录音
 onMounted(()=>{
+	initsocketTask()
 	getData('1');
-	console.log('onMounted')
 })
 onHide(()=>{
 	if(watchFlag.value === 1) return
@@ -644,9 +643,8 @@ onHide(()=>{
 	}).finally(() => {})	
 })
 onShow(()=>{
-	console.log('onShow')
 	if(watchFlag.value === 1) return
-	getData('1');
+	getData('2');
 })
 const watchFlag = ref(1)
 onUnload(()=>{