Skip to content

Commit

Permalink
Merge pull request #120 from Muska-Ami/dev
Browse files Browse the repository at this point in the history 
Update to v0.1.8+2
  • Loading branch information
@Muska-Ami
Muska-Ami committed Mar 27, 2024
2 parents d5729b1 + 203f856 commit 3aa6267
Show file tree
Hide file tree
Showing 29 changed files with 559 additions and 296 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/issues-label-autoremove.yml
View file

This file was deleted.

64 changes: 62 additions & 2 deletions lib/controllers/frpc_controller.dart
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:nyalcf/storages/configurations/frpc_configuration_storage.dart';
import 'package:nyalcf/storages/stories/frpc_story_storage.dart';
import 'package:nyalcf/storages/stores/frpc_storage.dart';

class FrpcController extends GetxController {
final fss = FrpcStoryStorage();
final fss = FrpcStorage();
final FrpcConfigurationStorage fcs = FrpcConfigurationStorage();

/// 是否存在的标志
Expand Down Expand Up @@ -102,4 +102,64 @@ class FrpcController extends GetxController {
/// 刷新输出文本
processOut.refresh();
}

void appendSystemInfoLog(String element) {
/// 如果输出文本长度超过500，则移除第一条文本
if (processOut.length >= 500) processOut.remove(processOut.first);

/// 添加警告日志文本
processOut.add(
SelectableText(
'[SYSTEM][INFO] $element',
style: const TextStyle(
color: Colors.teal,
fontWeight: FontWeight.w200,
fontFamily: 'Droid Sans Mono',
),
),
);

/// 刷新输出文本
processOut.refresh();
}

void appendSystemWarnLog(String element) {
/// 如果输出文本长度超过500，则移除第一条文本
if (processOut.length >= 500) processOut.remove(processOut.first);

/// 添加信息日志文本
processOut.add(
SelectableText(
'[SYSTEM][WARN] $element',
style: const TextStyle(
color: Colors.orange,
fontWeight: FontWeight.w200,
fontFamily: 'Droid Sans Mono',
),
),
);

/// 刷新输出文本
processOut.refresh();
}

void appendSystemErrorLog(String element) {
/// 如果输出文本长度超过500，则移除第一条文本
if (processOut.length >= 500) processOut.remove(processOut.first);

/// 添加错误日志文本
processOut.add(
SelectableText(
'[SYSTEM][ERROR] $element',
style: const TextStyle(
color: Colors.red,
fontWeight: FontWeight.w200,
fontFamily: 'Droid Sans Mono',
),
),
);

/// 刷新输出文本
processOut.refresh();
}
}
63 changes: 31 additions & 32 deletions lib/controllers/frpc_setting_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,39 +90,38 @@ class FrpcSettingController extends GetxController {
});*/
Get.dialog(FrpcDownloadDialogX(context: context).unarchiving(),
barrierDismissible: false);
//延时执行
Future.delayed(
const Duration(seconds: 2),
() async {
//延时执行
final bool unarchive = await FrpcArchive.unarchive(
platform: platform,
arch: arch[frpcDownloadArch.value]['arch'],
version: fcs.getSettingsFrpcVersion(),
);
if (unarchive) {
fcs.setSettingsFrpcVersion('0.51.3-2');
fcs.addInstalledVersion('0.51.3-2');
fcs.save();
/**if (!Platform.isWindows) {
print('*nix platform, change file permission');
await FrpcManagerStorage.setRunPermission();
}*/
_loadTip();
} else {
Get.snackbar(
'解压 Frpc 时发生错误..呜呜..',
'请检查磁盘是否被塞满了..或者是已经安装了！受不了了呜呜呜...',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
Get.close(0);
}
/// 关闭对话框
Get.close(0);
Get.close(0);
},
);
const Duration(seconds: 2),
() => FrpcArchive.unarchive(
platform: platform,
arch: arch[frpcDownloadArch.value]['arch'],
version: fcs.getSettingsFrpcVersion(),
).then((value) async {
Logger.debug(value);
if (value) {
fcs.setSettingsFrpcVersion('0.51.3-2');
fcs.addInstalledVersion('0.51.3-2');
fcs.save();
/**if (!Platform.isWindows) {
print('*nix platform, change file permission');
await FrpcManagerStorage.setRunPermission();
}*/
_loadTip();
} else {
Get.snackbar(
'解压 Frpc 时发生错误..呜呜..',
'请检查磁盘是否被塞满了..或者是已经安装了！受不了了呜呜呜...',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
Get.close(0);
}
/// 关闭对话框
Get.close(0);
Get.close(0);
}));
} else {
frpcDownloadShow.clear();
frpcDownloadShow.add(Text(
Expand Down
42 changes: 40 additions & 2 deletions lib/controllers/panel_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,49 @@ import 'package:get/get.dart';
import 'package:nyalcf/utils/network/dio/other/announcement.dart';

class DPanelController extends GetxController {
static var loaded = false;
var announcement = '喵喵喵？正在请求捏'.obs;
var announcementCommon = '喵喵喵？正在请求捏'.obs;

load() async {
announcement.value = await AnnouncementDio().getBroadcast();
announcementCommon.value = await AnnouncementDio().getCommon();
final announcementRes = await AnnouncementDio().getBroadcast();
final announcementCommonRes = await AnnouncementDio().getCommon();
if (announcementRes != null) {
announcement.value = announcementRes;
} else if (!loaded) {
announcement.value = '获取失败了啊呜，可能是猫猫把网线偷走了~';
Get.snackbar(
'获取公告失败',
'可能网线被猫猫偷走惹！',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
} else {
Get.snackbar(
'获取公告失败',
'可能不是最新的公告',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
}
if (announcementCommonRes != null) {
announcementCommon.value = announcementCommonRes;
} else if (!loaded) {
announcementCommon.value = '获取失败了啊呜，可能是猫猫把网线偷走了~';
Get.snackbar(
'获取通知失败',
'可能网线被猫猫偷走惹！',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
} else {
Get.snackbar(
'获取通知失败',
'可能不是最新的通知',
snackPosition: SnackPosition.BOTTOM,
animationDuration: const Duration(milliseconds: 300),
);
}
loaded = true;
}
}
Loading

0 comments on commit 3aa6267

Please sign in to comment.