Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!17

Android/.gradle/config.properties

@@ -1,2 +1,2 @@
-#Wed Jul 02 15:19:31 CST 2025
-java.home=D\:\\Android Studio\\jbr
+#Mon Jul 14 18:35:21 CST 2025
+java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

Android/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Jul 09 15:21:06 CST 2025
-sdk.dir=C\:\\Users\\ty\\AppData\\Local\\Android\\Sdk
+#Mon Jul 14 18:35:19 CST 2025
+sdk.dir=C\:\\Users\\1\\AppData\\Local\\Android\\Sdk

README.en.md

@@ -0,0 +1 @@
+npm i --registry=http://25.12.10.69:8081/repository/aliyun-npm/

src/common/permission.js

@@ -0,0 +1,272 @@
+/**
+ * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
+ */
+
+var isIos
+// #ifdef APP-PLUS
+isIos = (plus.os.name == "iOS")
+// #endif
+
+// 判断推送权限是否开启
+function judgeIosPermissionPush() {
+	var result = false;
+	var UIApplication = plus.ios.import("UIApplication");
+	var app = UIApplication.sharedApplication();
+	var enabledTypes = 0;
+	if (app.currentUserNotificationSettings) {
+		var settings = app.currentUserNotificationSettings();
+		enabledTypes = settings.plusGetAttribute("types");
+		console.log("enabledTypes1:" + enabledTypes);
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		plus.ios.deleteObject(settings);
+	} else {
+		enabledTypes = app.enabledRemoteNotificationTypes();
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启!");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		console.log("enabledTypes2:" + enabledTypes);
+	}
+	plus.ios.deleteObject(app);
+	plus.ios.deleteObject(UIApplication);
+	return result;
+}
+
+// 判断定位权限是否开启
+function judgeIosPermissionLocation() {
+	var result = false;
+	var cllocationManger = plus.ios.import("CLLocationManager");
+	var status = cllocationManger.authorizationStatus();
+	result = (status != 2)
+	console.log("定位权限开启：" + result);
+	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
+	/* var enable = cllocationManger.locationServicesEnabled();
+	var status = cllocationManger.authorizationStatus();
+	console.log("enable:" + enable);
+	console.log("status:" + status);
+	if (enable && status != 2) {
+		result = true;
+		console.log("手机定位服务已开启且已授予定位权限");
+	} else {
+		console.log("手机系统的定位没有打开或未给予定位权限");
+	} */
+	plus.ios.deleteObject(cllocationManger);
+	return result;
+}
+
+// 判断麦克风权限是否开启
+function judgeIosPermissionRecord() {
+	var result = false;
+	var avaudiosession = plus.ios.import("AVAudioSession");
+	var avaudio = avaudiosession.sharedInstance();
+	var permissionStatus = avaudio.recordPermission();
+	console.log("permissionStatus:" + permissionStatus);
+	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+		console.log("麦克风权限没有开启");
+	} else {
+		result = true;
+		console.log("麦克风权限已经开启");
+	}
+	plus.ios.deleteObject(avaudiosession);
+	return result;
+}
+
+// 判断相机权限是否开启
+function judgeIosPermissionCamera() {
+	var result = false;
+	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相机权限已经开启");
+	} else {
+		console.log("相机权限没有开启");
+	}
+	plus.ios.deleteObject(AVCaptureDevice);
+	return result;
+}
+
+// 判断相册权限是否开启
+function judgeIosPermissionPhotoLibrary() {
+	var result = false;
+	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+	var authStatus = PHPhotoLibrary.authorizationStatus();
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相册权限已经开启");
+	} else {
+		console.log("相册权限没有开启");
+	}
+	plus.ios.deleteObject(PHPhotoLibrary);
+	return result;
+}
+
+// 判断通讯录权限是否开启
+function judgeIosPermissionContact() {
+	var result = false;
+	var CNContactStore = plus.ios.import("CNContactStore");
+	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+	if (cnAuthStatus == 3) {
+		result = true;
+		console.log("通讯录权限已经开启");
+	} else {
+		console.log("通讯录权限没有开启");
+	}
+	plus.ios.deleteObject(CNContactStore);
+	return result;
+}
+
+// 判断日历权限是否开启
+function judgeIosPermissionCalendar() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("日历权限已经开启");
+	} else {
+		console.log("日历权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// 判断备忘录权限是否开启
+function judgeIosPermissionMemo() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("备忘录权限已经开启");
+	} else {
+		console.log("备忘录权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// Android权限查询
+function requestAndroidPermission(permissionID) {
+	return new Promise((resolve, reject) => {
+		plus.android.requestPermissions(
+			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			function(resultObj) {
+				var result = 0;
+				for (var i = 0; i < resultObj.granted.length; i++) {
+					var grantedPermission = resultObj.granted[i];
+					console.log('已获取的权限：' + grantedPermission);
+					result = 1
+				}
+				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+					var deniedPresentPermission = resultObj.deniedPresent[i];
+					console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+					result = 0
+				}
+				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+					var deniedAlwaysPermission = resultObj.deniedAlways[i];
+					console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+					result = -1
+				}
+				resolve(result);
+				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
+				// if (result != 1) {
+				// gotoAppPermissionSetting()
+				// }
+			},
+			function(error) {
+				console.log('申请权限错误：' + error.code + " = " + error.message);
+				resolve({
+					code: error.code,
+					message: error.message
+				});
+			}
+		);
+	});
+}
+
+// 使用一个方法，根据参数判断权限
+function judgeIosPermission(permissionID) {
+	if (permissionID == "location") {
+		return judgeIosPermissionLocation()
+	} else if (permissionID == "camera") {
+		return judgeIosPermissionCamera()
+	} else if (permissionID == "photoLibrary") {
+		return judgeIosPermissionPhotoLibrary()
+	} else if (permissionID == "record") {
+		return judgeIosPermissionRecord()
+	} else if (permissionID == "push") {
+		return judgeIosPermissionPush()
+	} else if (permissionID == "contact") {
+		return judgeIosPermissionContact()
+	} else if (permissionID == "calendar") {
+		return judgeIosPermissionCalendar()
+	} else if (permissionID == "memo") {
+		return judgeIosPermissionMemo()
+	}
+	return false;
+}
+
+// 跳转到**应用**的权限页面
+function gotoAppPermissionSetting() {
+	if (isIos) {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		// console.log(plus.device.vendor);
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
+}
+
+// 检查系统的设备服务是否开启
+// var checkSystemEnableLocation = async function () {
+function checkSystemEnableLocation() {
+	if (isIos) {
+		var result = false;
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var result = cllocationManger.locationServicesEnabled();
+		console.log("系统定位开启:" + result);
+		plus.ios.deleteObject(cllocationManger);
+		return result;
+	} else {
+		var context = plus.android.importClass("android.content.Context");
+		var locationManager = plus.android.importClass("android.location.LocationManager");
+		var main = plus.android.runtimeMainActivity();
+		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+		console.log("系统定位开启:" + result);
+		return result
+	}
+}
+
+export  default ({
+	judgeIosPermission: judgeIosPermission,
+	requestAndroidPermission: requestAndroidPermission,
+	checkSystemEnableLocation: checkSystemEnableLocation,
+	gotoAppPermissionSetting: gotoAppPermissionSetting
+})

src/pages.json

@@ -198,5 +198,15 @@
             "bounce": "none"
         }
     },
-    "uniIdRouter": {}
+    "uniIdRouter": {},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
+	}
 }

src/pages/course/components/touchBtn.vue

@@ -40,6 +40,7 @@
 <script setup>
 import { toRefs, ref, computed, unref, onMounted, onUnmounted, nextTick } from 'vue';
 import common from '../../../common/common';
+import permission from '@/common/permission.js'
 const emit = defineEmits(['uploadVoice', 'submitAnswer','startRecord'])
 const props = defineProps({
 	isDisabled:{
@@ -62,20 +63,40 @@ const initRecord = () => {
 	unref(recordObjCom)?.onStop((res, duration)=>{
 		audioPath.value = res.tempFilePath
 	})
+	unref(recordObjCom).start({format:'mp3'})
+	stopRecord()
 }
 const startRecord = () => {
 	unref(recordObjCom).start({format:'mp3'})
 }
 const stopRecord = () => {
-	unref(recordObjCom)?.stop?.()
+	if(unref(recordObjCom).stop){
+		unref(recordObjCom)?.stop?.()
+	}
 }
 // #endif
 //#ifndef APP-PLUS
 const recordObjCom = {}
 const initRecord = () => {}
 // #endif
-onMounted(()=>{
+onMounted(async ()=>{
 	initRecord?.()
+	// //#ifdef APP-PLUS
+	// //#ifdef __IOS__
+	// 	// ios端
+	// 	let _recordPerm = permission.judgeIosPermission('record')
+	// 	if(!_recordPerm){
+	// 		permission.gotoAppPermissionSetting()
+	// 	}
+	// // #endif
+	// // #endif
+	// //#ifdef APP-PLUS
+	// 	// 安卓端
+	// 	let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO')
+	// 	if(_recordPerm !== 1){
+	// 		permission.gotoAppPermissionSetting()
+	// 	}
+	// // #endif
 })
 // const playRecord = () => {
 // 	audioObj.src = audioPath.value
@@ -97,30 +118,20 @@ const isOut = computed(() => {
 const recNum = ref(1)
 const activeNum = ref(1)
 
-const getRecordPermission = (obj) => {
-//#ifdef APP-PLUS
-	uni.getSetting({
-		success: (res) => {
-			if(!res.authSetting['scope.record']){
-				// 没有授权，请求授权
-				uni.authorize({
-					scope: 'scope.record',
-					success:() => {
-						showOverlayTalking(obj)
-					},
-					fail: () => {
-						common.msg('请设置开启录音权限！')
-					}
-				})
-			}else{
-				showOverlayTalking(obj)
-			}
-		}
-	})
-// #endif
-//#ifndef APP-PLUS
-	showOverlayTalking(obj)
-// #endif
+const getRecordPermission = async (obj) => {
+	//#ifdef APP-PLUS
+		// 安卓端
+		// let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO')
+		// if(_recordPerm !== 1){
+		// 	permission.gotoAppPermissionSetting()
+		// 	return
+		// }
+		showOverlayTalking(obj)
+	// #endif
+	//#ifndef APP-PLUS
+		// pc端
+		showOverlayTalking(obj)
+	// #endif
 }
 const showOverlayTalking = (obj) => {
 	recNum.value += 1

src/pages/courseDetail/components/knowledge.vue

@@ -15,7 +15,7 @@
 
 		</view>
 		<view class="bottom">
-			<view class="fz-30 font_pf text">{{  item.pgrphContent }}</view>
+			<view class="fz-30 font_pf text ellipsis-text">{{  item.pgrphContent }}</view>
 		</view>
 	</view>
 </template>

src/pages/index/index.vue

@@ -372,7 +372,7 @@
 
 
 <style scoped lang="scss">
-	$bg-margin-left: 50rpx;
+	$bg-margin-left: 30rpx;
 
 	// :deep(.uni-scroll-view-content) {
 	// 	display: flex;
@@ -763,7 +763,7 @@
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 25rpx;
-					color: #323E57;
+					// color: #323E57;
 					line-height: 35rpx;
 					text-align: left;
 					font-style: normal;