Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

.env.development

@@ -5,8 +5,10 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
+
 VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
+
 # DEV
 #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 

Android/simpleDemo/build.gradle

@@ -6,10 +6,10 @@ android {
     namespace 'cn.com.jlbank.ai'
     defaultConfig {
         applicationId "cn.com.jlbank.ai"
-        minSdkVersion 33
+        minSdkVersion 29
         targetSdkVersion 33
-        versionName System.getenv("versionName") ?: "1.0.0"
-        versionCode System.getenv("versionCode")?.toInteger() ?: 281
+        versionName System.getenv("versionName") ?: "1.0.3"
+        versionCode System.getenv("versionCode")?.toInteger() ?: 285
         multiDexEnabled true
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8

Android/ty-camera/build.gradle

@@ -8,7 +8,7 @@ android {
     compileSdk 35
 
     defaultConfig {
-        minSdk 33
+        minSdk 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

Android/ty-recording/build.gradle

@@ -8,7 +8,7 @@ android {
     compileSdk 35
 
     defaultConfig {
-        minSdk 33
+        minSdk 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj

@@ -1240,7 +1240,7 @@
 				CODE_SIGN_ENTITLEMENTS = HBuilder/HBuilder.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 279;
+				CURRENT_PROJECT_VERSION = 285;
 				DEVELOPMENT_TEAM = 2EP6SRRN43;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -1273,7 +1273,7 @@
 					"$(SRCROOT)/../SDK/libs/**",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.5;
 				OTHER_CFLAGS = (
 					"-mllvm",
 					"-ipo",
@@ -1322,7 +1322,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 279;
+				CURRENT_PROJECT_VERSION = 285;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2EP6SRRN43;
 				ENABLE_BITCODE = NO;
@@ -1355,7 +1355,7 @@
 					"$(SRCROOT)/../SDK/libs/**",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.5;
 				OTHER_CFLAGS = (
 					"-mllvm",
 					"-ipo",

Ios/HBuilder-Hello/HBuilder-Hello/HBuilder-Hello-Info_20260319.plist

@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>zh_CN</string>
+	<key>CFBundleDisplayName</key>
+	<string>HelloH5</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>tencentopenapi</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tencent1101318457</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.tencent</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wb801494298</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>alixpay</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>alixpayhbilderhello</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>weixin</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wxbe7f03382358338d</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.weibo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wb3721101999</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>tencentweiboSdkv2</string>
+		<string>weibosdk2.5</string>
+		<string>sinaweibo</string>
+		<string>sinaweibohd</string>
+		<string>alipay</string>
+		<string>safepay</string>
+		<string>cydia</string>
+		<string>weixin</string>
+		<string>weixinULAPI</string>
+		<string>weibosdk</string>
+		<string>mqq</string>
+		<string>mqqapi</string>
+		<string>mqzone</string>
+		<string>wtloginmqq2</string>
+		<string>mqqopensdkapiV3</string>
+		<string>mqqwpa</string>
+		<string>mqqopensdkapiV2</string>
+		<string>mqqOpensdkSSoLogin</string>
+		<string>hbuilder</string>
+		<string>streamapp</string>
+		<string>iosamap</string>
+		<string>baidumap</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MiSDKAppID</key>
+	<string>去官方网站申请对应的值</string>
+	<key>MiSDKRun</key>
+	<string>debug</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>为了发表评论、上传头像、AI 陪练实时对话功能，需要访问您的摄像头。</string>
+	<key>NSContactsUsageDescription</key>
+	<string>通讯录</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>始终允许获取你的位置信息</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>总是获取</string>
+	<key>NSLocationWhenInUseDescription</key>
+	<string></string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
+	<key>NSLocationWhenInUseUsageDescription - 2</key>
+	<string>用户使用时期定位</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>为了使用语音问答、AI陪练功能，需要访问您的麦克风获取语音输入。</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string></string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>从相册选择错题截图提交学习反馈、上传照片更换个人资料头像</string>
+	<key>NSUserTrackingUsageDescription</key>
+	<string>请放心，开启权限不会获取您在其他站点的隐私信息，该权限仅用于标识设备并保障服务安全与提示浏览体验</string>
+	<key>StatusBarBackground</key>
+	<string>#FFFFFF</string>
+	<key>UIApplicationShortcutItems</key>
+	<array>
+		<dict>
+			<key>UIApplicationShortcutItemIconType</key>
+			<string>UIApplicationShortcutIconTypeShare</string>
+			<key>UIApplicationShortcutItemSubtitle</key>
+			<string>分享到微信、微博、QQ</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>分 享</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>share</string>
+		</dict>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>Pandora/apps/HelloH5/www/sa.png</string>
+			<key>UIApplicationShortcutItemSubtitle</key>
+			<string>www.test.com</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>关 于</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>about</string>
+			<key>UIApplicationShortcutItemUserInfo</key>
+			<dict>
+				<key>key3</key>
+				<string>value3</string>
+			</dict>
+		</dict>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array/>
+	<key>UILaunchImages</key>
+	<array>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>12.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-896h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 896}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>12.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-896h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 896}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>12.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-896h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 896}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>12.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-896h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 896}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-736h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 736}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-736h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{414, 736}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>11.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-812h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{375, 812}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>11.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-812h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{375, 812}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-667h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{375, 667}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-667h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 667}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 480}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-568h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 568}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-568h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{320, 568}</string>
+		</dict>
+	</array>
+	<key>UILaunchImages~ipad</key>
+	<array>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape7</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{768, 1024}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>7.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Portrait7</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{768, 1024}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>10.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Portrait7-1366h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{1024, 1366}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>10.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-1366h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{1024, 1366}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>10.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Portrait7-1194h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{834, 1194}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>10.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-1194h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{834, 1194}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Portrait7-1112h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Portrait</string>
+			<key>UILaunchImageSize</key>
+			<string>{834, 1112}</string>
+		</dict>
+		<dict>
+			<key>UILaunchImageMinimumOSVersion</key>
+			<string>8.0</string>
+			<key>UILaunchImageName</key>
+			<string>Default-Landscape-1112h</string>
+			<key>UILaunchImageOrientation</key>
+			<string>Landscape</string>
+			<key>UILaunchImageSize</key>
+			<string>{834, 1112}</string>
+		</dict>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen.storyboard</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDefault</string>
+	<key>UIStatusBarTintParameters</key>
+	<dict>
+		<key>UINavigationBar</key>
+		<dict>
+			<key>Style</key>
+			<string>UIBarStyleDefault</string>
+			<key>Translucent</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UniversalLinks</key>
+	<string>填写自己的值</string>
+	<key>amap</key>
+	<dict>
+		<key>appkey</key>
+		<string>去官方网站申请对应的值</string>
+	</dict>
+	<key>baidu</key>
+	<dict>
+		<key>appkey</key>
+		<string>去官方网站申请对应的值</string>
+	</dict>
+	<key>baiduspeech</key>
+	<dict>
+		<key>API_KEY</key>
+		<string>去官方网站申请对应的值</string>
+		<key>APP_ID</key>
+		<string>去官方网站申请对应的值</string>
+		<key>SECRET_KEY</key>
+		<string>去官方网站申请对应的值</string>
+	</dict>
+	<key>dcloud_appkey</key>
+	<string>caf112ffeb8174f764076b6b109aa329</string>
+	<key>dcloud_uninview_background</key>
+	<true/>
+	<key>dcloud_uniplugins</key>
+	<array>
+		<dict>
+			<key>hooksClass</key>
+			<string>DCRichAlertProxy</string>
+			<key>plugins</key>
+			<array>
+				<dict>
+					<key>class</key>
+					<string>DCRichAlertModule</string>
+					<key>name</key>
+					<string>DCloud-RichAlert</string>
+					<key>type</key>
+					<string>module</string>
+				</dict>
+			</array>
+		</dict>
+	</array>
+	<key>getui</key>
+	<dict>
+		<key>appid</key>
+		<string>去官方网站申请对应的appid</string>
+		<key>appkey</key>
+		<string>去官方网站申请对应的key</string>
+		<key>appsecret</key>
+		<string>去官方网站申请对应的值</string>
+	</dict>
+	<key>marketChannel</key>
+	<string>按照文档格式配置对应的值</string>
+	<key>sinaweibo</key>
+	<dict>
+		<key>appSecret</key>
+		<string>去官方网站申请对应的值</string>
+		<key>appkey</key>
+		<string>去官方网站申请对应的值</string>
+		<key>redirectURI</key>
+		<string>填写自己的</string>
+	</dict>
+	<key>umeng</key>
+	<dict>
+		<key>appkey</key>
+		<string>去官方网站申请对应的值</string>
+	</dict>
+	<key>weixin</key>
+	<dict>
+		<key>appSecret</key>
+		<string>去官方网站申请对应的值</string>
+		<key>appid</key>
+		<string>去官方网站申请对应的appid</string>
+	</dict>
+	<key>xiaomioauth</key>
+	<dict>
+		<key>appid</key>
+		<string>去官方网站申请对应的appid</string>
+		<key>appsecret</key>
+		<string>去官方网站申请对应的值</string>
+		<key>redirectURI</key>
+		<string>填写自己的</string>
+	</dict>
+</dict>
+</plist>

Ios/HBuilder-Hello/HBuilder-Hello/Pandora/apps/__UNI__EDE0E52/www/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__EDE0E52",
   "name": "吉AI学",
   "version": {
-    "name": "0.2.1",
-    "code": 277
+    "name": "1.0.0",
+    "code": 281
   },
   "description": "",
   "developer": {

src/pages/pointsMall/pointsMall.vue

@@ -5,7 +5,7 @@
 		@query="queryList"
 		class="scroll_div"
 		:auto="true"
-		empty-view-text="暂无学习任务"
+		empty-view-text="暂无兑换活动"
 	>
 		<template #top>
 			<nav-bar :is_seat="false"></nav-bar>