sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_sky' into 'canary_release_sky'

Browse Source 
Develop sky

See merge request StarlockTeam/app-starlock!117
This commit is contained in:
李仪 2025-05-30 07:08:57 +00:00
commit 311fddf1ed
13 changed files with 320 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -20,7 +20,7 @@ variables:
- if: $CI_COMMIT_BRANCH == "release_sky"
- if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
- if: $CI_COMMIT_BRANCH == "canary_release_sky"
- if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/
- if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?(_sky)?$/
.notify_rule:
tags:

2
android/app/src/main/AndroidManifest.xml
View File

@ -29,6 +29,8 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<!--允许读设备日志，用于问题排查-->
<uses-permission android:name="android.permission.READ_LOGS" />
<!--联系人-->
<uses-permission android:name="android.permission.READ_CONTACTS" />
<!--相机-->
<uses-permission android:name="android.permission.CAMERA" />

6
lib/blue/blue_manage.dart
View File

@ -124,14 +124,18 @@ class BlueManage {
.eventBus!
.on<EventSendModel>()
.listen((EventSendModel model) {
AppLog.log('eventBus接收发送数据:${model}');
if (model.sendChannel == DataChannel.ble) {
FlutterBluePlus.isSupported.then((bool isAvailable) async {
if (isAvailable) {
if (_adapterState == BluetoothAdapterState.on) {
// 蓝牙已开启，可以进行蓝牙操作
AppLog.log('蓝牙已开启，开始收发送数据:${model.data}');
writeCharacteristicWithResponse(model.data);
} else {
try {} catch (e) {
try {
AppLog.log('蓝牙已关闭，停止发送数据:${model.data}');
} catch (e) {
AppLog.log('蓝牙打开失败');
}
}

92
lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
View File

@ -257,15 +257,42 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
logic.state.contact = currentContact!;
if (currentContact.phoneNumbers!.isNotEmpty) {
logic.state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
if (currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.emailOrPhoneController.text = phoneNumber;
} else {
logic.state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
} else {
logic.state.keyNameController.text = '';
}
});
}
},
),
@ -602,17 +629,42 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
onTap: () async {
final Contact? currentContact =
await state.contactPicker.selectContact();
setState(() {
state.contact = currentContact!;
if (currentContact.phoneNumbers!.isNotEmpty) {
state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
if (currentContact.fullName!.isNotEmpty) {
state.keyNameController.text = currentContact.fullName!;
}
});
if (currentContact != null) {
setState(() {
state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
state.emailOrPhoneController.text = phoneNumber;
} else {
state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
state.keyNameController.text = currentContact.fullName!;
} else {
state.keyNameController.text = '';
}
});
}
},
),
)

55
lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
View File

@ -286,20 +286,47 @@ class _VolumeAuthorizationLockPageState
),
alignment: Alignment.center,
child: InkWell(
onTap: () async {
final Contact? currentContact =
await state.contactPicker.selectContact();
// setState(() {
if (currentContact!.phoneNumbers!.isNotEmpty) {
state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
if (currentContact.fullName!.isNotEmpty) {
state.keyNameController.text = currentContact.fullName!;
}
// });
},
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.emailOrPhoneController.text = phoneNumber;
} else {
logic.state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
} else {
logic.state.keyNameController.text = '';
}
});
}
},
),
)
else

120
lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
View File

@ -20,6 +20,7 @@ import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
import 'package:star_lock/tools/regularExpression.dart';
import 'package:star_lock/tools/showTipView.dart';
import 'package:star_lock/tools/submitBtn.dart';
import 'package:permission_handler/permission_handler.dart';
class SendElectronicKeyView extends StatefulWidget {
SendElectronicKeyView({required this.type, Key? key}) : super(key: key);
@ -31,6 +32,8 @@ class SendElectronicKeyView extends StatefulWidget {
class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
with AutomaticKeepAliveClientMixin {
@override
Widget build(BuildContext context) {
super.build(context);
@ -163,8 +166,8 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
color: Colors.white,
border: Border(
bottom: BorderSide(
color: AppColors.greyLineColor, // 设置边框颜色
width: 2.0.h, // 设置边框宽度
color: AppColors.greyLineColor,
width: 2.0.h,
),
)),
child: Row(
@ -174,17 +177,14 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
Expanded(
child: TextField(
controller: logic.getCurrentController(1),
//输入框一行
maxLines: 1,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30),
],
// controller: _controller,
autofocus: false,
textAlign: TextAlign.end,
decoration: InputDecoration(
//输入里面输入文字内边距设置
hintText: rightTitle,
hintStyle: TextStyle(fontSize: 22.sp),
focusedBorder: const OutlineInputBorder(
@ -205,9 +205,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
fontSize: 22.sp, textBaseline: TextBaseline.alphabetic),
),
),
SizedBox(
width: 10.w,
),
SizedBox(width: 10.w),
Container(
width: 32.w,
height: 32.w,
@ -222,22 +220,49 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
logic.state.contact = currentContact!;
if (currentContact.phoneNumbers!.isNotEmpty) {
logic.state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
if (currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.emailOrPhoneController.text = phoneNumber;
} else {
logic.state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
} else {
logic.state.keyNameController.text = '';
}
});
}
},
),
),
Container(
color: AppColors.greyLineColor, // 设置边框颜色
height: 2.0.h, //
color: AppColors.greyLineColor,
height: 2.0.h,
)
],
),
@ -616,19 +641,46 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
alignment: Alignment.center,
child: InkWell(
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
logic.state.contact = currentContact!;
if (currentContact.phoneNumbers!.isNotEmpty) {
logic.state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
if (currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
}
},
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.emailOrPhoneController.text = phoneNumber;
} else {
logic.state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
} else {
logic.state.keyNameController.text = '';
}
});
}
},
),
)
else
@ -736,7 +788,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
child: Text(
'取消'.tr,
style: TextStyle(
color: Colors.black, fontSize: ScreenUtil().setSp(24)),
color: Colors.black, fontSize: 24.sp),
),
onPressed: () {
Navigator.pop(context);
@ -779,7 +831,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
Text(
titleStr,
style: TextStyle(
fontSize: ScreenUtil().setSp(20), color: Colors.black),
fontSize: 20.sp, color: Colors.black),
),
],
),

15
lib/main/lockDetail/lockDetail/lockDetail_logic.dart
View File

@ -61,7 +61,7 @@ class LockDetailLogic extends BaseGetXController {
// 开完锁之后上传记录
if (reply is SenderReferEventRecordTimeReply &&
state.ifCurrentScreen.value == true) {
_replyReferEventRecordTime(reply);
await _replyReferEventRecordTime(reply);
}
});
}
@ -118,7 +118,9 @@ class LockDetailLogic extends BaseGetXController {
state.animationController!.stop();
//锁数据更新
AppLog.log('开锁成功，开始同步所记录:getLockRecordLastUploadDataTime');
getLockRecordLastUploadDataTime();
AppLog.log('开锁成功，结束同步所记录:getLockRecordLastUploadDataTime');
// 只有接听状态时才可以重发开门指令
if (StartChartManage().talkStatus.status ==
TalkStatus.answeredSuccessfully) {
@ -340,6 +342,7 @@ class LockDetailLogic extends BaseGetXController {
reply.data.removeRange(0, 7);
// 把得到的数据按17个字节分割成数组 然后塞进一个新的数组里面
if (reply.data.length < 17) {
AppLog.log('数据长度不够17:${reply.data}');
return;
}
final List<List<int>> getList = splitList(reply.data, 17);
@ -380,12 +383,13 @@ class LockDetailLogic extends BaseGetXController {
if (i == getList.length - 1) {
//设置最后的时间戳
state.operateDate = operateDate;
state.operateDate = time;
}
} catch (e) {
AppLog.log('操作记录:$indexList,解析失败，跳过该跳记录，进行下一条记录解析。');
}
}
AppLog.log('上传数据长度:${uploadList.length}');
lockRecordUploadData(uploadList);
if (dataLength == state.logCountPage) {
@ -512,6 +516,8 @@ class LockDetailLogic extends BaseGetXController {
});
BlueManage().blueSendData(BlueManage().connectDeviceName,
(BluetoothConnectionState connectionState) async {
AppLog.log(
'开始发送同步锁记录命令，蓝牙状态是否链接:${connectionState == BluetoothConnectionState.connected}');
if (connectionState == BluetoothConnectionState.connected) {
final List<String>? privateKey =
await Storage.getStringList(saveBluePrivateKey);
@ -526,6 +532,8 @@ class LockDetailLogic extends BaseGetXController {
final List<int> getPublicKeyList =
changeStringListToIntList(publicKey!);
AppLog.log(
'发送同步锁记录命令:${BlueManage().connectDeviceName}');
IoSenderManage.senderReferEventRecordTimeCommand(
keyID: BlueManage().connectDeviceName,
userID: await Storage.getUid(),
@ -604,11 +612,14 @@ class LockDetailLogic extends BaseGetXController {
final LockOperatingRecordGetLastRecordTimeEntity entity =
await ApiRepository.to.getLockRecordLastUploadDataTime(
lockId: state.keyInfos.value.lockId.toString());
AppLog.log('开始获取服务端所记录更新时间:${entity}');
if (entity.errorCode!.codeIsSuccessful) {
state.operateDate = entity.data!.operateDate! ~/ 1000;
state.currentDate = entity.data!.currentDate! ~/ 1000;
AppLog.log('发送同步所记录命令:---');
senderReferEventRecordTime();
}
AppLog.log('结束获取服务端所记录更新时间:${entity}');
}
// 操作记录上传

2
lib/main_local.dart
View File

@ -4,7 +4,7 @@ import 'flavors.dart';
import 'main.dart' as runner;
Future<void> main() async {
F.appFlavor = Flavor.xhj;
F.appFlavor = Flavor.xhj_pre;
// AppLog.log('local调用了main函数');
await runner.main();
}

48
lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
View File

@ -270,16 +270,46 @@ class _AddAuthorizedAdministratorPageState
alignment: Alignment.center,
child: InkWell(
onTap: () async {
final Contact? currentContact =
await state.contactPicker.selectContact();
setState(() {
if (currentContact!.phoneNumbers!.isNotEmpty) {
state.emailOrPhoneController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.emailOrPhoneController.text = phoneNumber;
} else {
logic.state.emailOrPhoneController.text = '';
}
// 处理姓名
if (currentContact.fullName != null &&
currentContact.fullName!.isNotEmpty) {
logic.state.keyNameController.text =
currentContact.fullName!;
} else {
logic.state.keyNameController.text = '';
}
});
}
});
},
},
),
)
else

39
lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
View File

@ -146,14 +146,37 @@ class _RecipientInformationPageState extends State<RecipientInformationPage> {
),
GestureDetector(
onTap: () async {
Contact? currentContact = await state.contactPicker.selectContact();
state.contact = currentContact!;
if (currentContact.phoneNumbers!.isNotEmpty) {
state.numberController.text = currentContact
.phoneNumbers![0]
.replaceAll(RegExp(r'\s+\b|\b\s'), '');
}
},
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
if (currentContact != null) {
setState(() {
logic.state.contact = currentContact;
// 处理手机号
if (currentContact.phoneNumbers != null &&
currentContact.phoneNumbers!.isNotEmpty) {
// 获取第一个手机号并清理格式
String phoneNumber = currentContact.phoneNumbers![0];
// 移除所有空格、括号、连字符等特殊字符
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
// 如果号码以+开头，保留+号
if (phoneNumber.startsWith('+')) {
phoneNumber = '+' +
phoneNumber
.substring(1)
.replaceAll(RegExp(r'[^\d]'), '');
} else {
phoneNumber =
phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
}
logic.state.numberController.text = phoneNumber;
} else {
logic.state.numberController.text = '';
}
});
}
},
child: Image.asset(
'images/icon_addressBook.png',
width: 28.w,

2
lib/talk/starChart/status/star_chart_talk_status.dart
View File

@ -4,7 +4,7 @@ import 'package:star_lock/talk/starChart/constant/talk_status.dart';
class StartChartTalkStatus {
// 私有字段，用于存储当前状态
TalkStatus _status = TalkStatus.uninitialized;
TalkStatus _status = TalkStatus.none;
// 私有化默认构造函数，防止外部创建实例
StartChartTalkStatus._();

2
pubspec.yaml
View File

@ -158,7 +158,7 @@ dependencies:
# 选择日期时间
flutter_cupertino_datetime_picker: ^3.0.0
# 选择原生通讯录
flutter_native_contact_picker: ^0.0.4
flutter_native_contact_picker: 0.0.7
#底部弹出选择器
flutter_picker: ^2.1.0
#生成二维码

50
tag_generator.sh
View File

@ -28,56 +28,60 @@ newest_sky_tag=$(echo "$sky_tags" | head -n 1)
# 如果没有 _sky 结尾的 tag，则从最新的 tag 提取版本号，生成 vX.Y.Z_sky
if [ -z "$newest_sky_tag" ]; then
# 取最新的 tag（不管是否带_sky）
latest_tag=$(echo "$tags" | head -n 1)
echo "DEBUG: tags=[$tags]"
echo "DEBUG: latest_tag=[$latest_tag]"
if [ -n "$latest_tag" ]; then
# 提取版本号部分（去掉前缀v和后缀_sky等）
version_part=${latest_tag#v} # 去掉v
version_part=${version_part%_sky} # 去掉_sky（如果有）
IFS='.' read -r major minor patch <<< "$version_part"
next_tag="v$major.$minor.$patch_sky"
version_part=${latest_tag#v}
version_part=${version_part%_sky}
version_part=$(echo "$version_part" | tr -d ' \n\r')
echo "DEBUG: version_part=[$version_part]"
major=$(echo "$version_part" | awk -F. '{print $1}')
minor=$(echo "$version_part" | awk -F. '{print $2}')
patch=$(echo "$version_part" | awk -F. '{print $3}')
[ -z "$major" ] && major=1
[ -z "$minor" ] && minor=0
[ -z "$patch" ] && patch=0
next_tag="v${major}.${minor}.${patch}_sky"
else
next_tag="v1.0.0_sky"
fi
else
# 解析版本号部分（去掉 _sky 后缀和 v 前缀）
# 例如 v1.5.556_sky -> 1.5.556
version_part=${newest_sky_tag%_sky} # 去掉 _sky 后缀
version_part=${version_part#v} # 去掉 v 前缀
IFS='.' read -r major minor patch <<< "$version_part" # 拆分出主、次、修订号
compare_json="" # 用于存储 commit 对比结果
# 判断命令参数，决定对比范围
version_part=${newest_sky_tag%_sky}
version_part=${version_part#v}
version_part=$(echo "$version_part" | tr -d ' \n\r')
echo "DEBUG: version_part=[$version_part]"
major=$(echo "$version_part" | awk -F. '{print $1}')
minor=$(echo "$version_part" | awk -F. '{print $2}')
patch=$(echo "$version_part" | awk -F. '{print $3}')
[ -z "$major" ] && major=1
[ -z "$minor" ] && minor=0
[ -z "$patch" ] && patch=0
compare_json=""
if [[ "$1" == "generate_tag" ]];then
# 生成 tag 时，对比最新 _sky tag 和 master 之间的提交
echo "generate_tag:$newest_sky_tag-to-master\n"
compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=$newest_sky_tag&to=master")
elif [[ "$1" == "generate_version" ]]; then
# 生成版本号时，对比 master 和当前分支之间的提交
echo "generate_version:master-to-$CI_COMMIT_BRANCH\n"
compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=master&to=$CI_COMMIT_BRANCH")
fi
echo "compare_json:$compare_json\n"
new_patch=$patch # 新的 patch 号
new_minor=$minor # 新的 minor 号
# 遍历所有 commit，根据提交信息递增版本号
new_patch=$patch
new_minor=$minor
while IFS= read -r commit_json; do
# 解析每个 commit 的 id 和 message
commit_id=$(echo "$commit_json" | jq -r '.id')
commit_message=$(echo "$commit_json" | jq -r '.message')
echo "----$commit_message"
# 如果有 feat: 类型提交，minor 递增（只递增一次）
if [[ "$commit_message" =~ ("feat:"*) ]] && [[ $new_minor == $minor ]]; then
((new_minor++))
# 如果有 fix: 类型提交，patch 递增
elif [[ "$commit_message" =~ ("fix:"*) ]]; then
((new_patch++))
# 其他类型提交（非 Merge/Revert），patch 递增
elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]]; then
((new_patch++))
fi
done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
# 组装新的 tag，格式为 v<major>.<minor>.<patch>_sky
next_tag="v$major.$new_minor.$new_patch_sky"
next_tag="v${major}.${new_minor}.${new_patch}_sky"
fi
echo "New Tag:$newest_sky_tag;New version: $next_tag;command: $1"