From 1943fde6ebf5782fe75cf877cac23de9caf079b2 Mon Sep 17 00:00:00 2001 From: LollipopKit Date: Sun, 31 Oct 2021 21:40:36 +0800 Subject: [PATCH] remove useless function --- lib/data/model/server/cpu_status.dart | 22 ----------- lib/data/model/server/disk_info.dart | 19 ---------- .../model/server/server_private_info.dart | 37 ++++++++++--------- lib/data/provider/server.dart | 6 +-- lib/data/res/icon/common.dart | 3 ++ lib/data/res/{ => icon}/linux_icons.dart | 0 lib/data/res/url.dart | 2 + lib/data/store/server.dart | 2 +- lib/view/page/server/tab.dart | 26 ++++++++----- 9 files changed, 46 insertions(+), 71 deletions(-) create mode 100644 lib/data/res/icon/common.dart rename lib/data/res/{ => icon}/linux_icons.dart (100%) diff --git a/lib/data/model/server/cpu_status.dart b/lib/data/model/server/cpu_status.dart index ae34cdbf..fa275d2a 100644 --- a/lib/data/model/server/cpu_status.dart +++ b/lib/data/model/server/cpu_status.dart @@ -33,28 +33,6 @@ class CpuStatus { this.irq, this.softirq, ); - CpuStatus.fromJson(Map json) { - id = json["id"]; - user = json["user"]?.toInt(); - sys = json["sys"]?.toInt(); - nice = json["nice"]?.toInt(); - idle = json["idle"]?.toInt(); - iowait = json["iowait"]?.toInt(); - irq = json["irq"]?.toInt(); - softirq = json["softirq"]?.toInt(); - } - Map toJson() { - final Map data = {}; - data["id"] = id; - data["user"] = user; - data["sys"] = sys; - data["nice"] = nice; - data["idle"] = idle; - data["iowait"] = iowait; - data["irq"] = irq; - data["softirq"] = softirq; - return data; - } int get total => user + sys + nice + idle + iowait + irq + softirq; } diff --git a/lib/data/model/server/disk_info.dart b/lib/data/model/server/disk_info.dart index 762c470a..61e51080 100644 --- a/lib/data/model/server/disk_info.dart +++ b/lib/data/model/server/disk_info.dart @@ -25,23 +25,4 @@ class DiskInfo { this.size, this.avail, ); - - DiskInfo.fromJson(Map json) { - mountPath = json["mountPath"].toString(); - mountLocation = json["mountLocation"].toString(); - usedPercent = int.parse(json["usedPercent"]); - used = json["used"].toString(); - size = json["size"].toString(); - avail = json["avail"].toString(); - } - Map toJson() { - final Map data = {}; - data["mountPath"] = mountPath; - data["mountLocation"] = mountLocation; - data["usedPercent"] = usedPercent; - data["used"] = used; - data["size"] = size; - data["avail"] = avail; - return data; - } } diff --git a/lib/data/model/server/server_private_info.dart b/lib/data/model/server/server_private_info.dart index dcaf4b9d..c2bedb4f 100644 --- a/lib/data/model/server/server_private_info.dart +++ b/lib/data/model/server/server_private_info.dart @@ -13,25 +13,27 @@ class ServerPrivateInfo { } */ - String? name; - String? ip; - int? port; - String? user; - Object? authorization; + late String name; + late String ip; + late int port; + late String user; + late Object authorization; + String? pubKeyId; - ServerPrivateInfo({ - this.name, - this.ip, - this.port, - this.user, - this.authorization, - }); + ServerPrivateInfo( + {required this.name, + required this.ip, + required this.port, + required this.user, + required this.authorization, + this.pubKeyId}); ServerPrivateInfo.fromJson(Map json) { - name = json["name"]?.toString(); - ip = json["ip"]?.toString(); - port = json["port"]?.toInt(); - user = json["user"]?.toString(); + name = json["name"].toString(); + ip = json["ip"].toString(); + port = json["port"].toInt(); + user = json["user"].toString(); authorization = json["authorization"]; + pubKeyId = json["pubKeyId"]?.toString(); } Map toJson() { final Map data = {}; @@ -40,11 +42,12 @@ class ServerPrivateInfo { data["port"] = port; data["user"] = user; data["authorization"] = authorization; + data["pubKeyId"] = pubKeyId; return data; } } -List? getServerInfoList(dynamic data) { +List getServerInfoList(dynamic data) { List ss = []; if (data is String) { data = json.decode(data); diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index 1aa64848..e9f89796 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -50,9 +50,9 @@ class ServerProvider extends BusyProvider { SSHClient genClient(ServerPrivateInfo spi) { return SSHClient( - host: spi.ip!, - port: spi.port!, - username: spi.user!, + host: spi.ip, + port: spi.port, + username: spi.user, passwordOrKey: spi.authorization); } diff --git a/lib/data/res/icon/common.dart b/lib/data/res/icon/common.dart new file mode 100644 index 00000000..9c7a5583 --- /dev/null +++ b/lib/data/res/icon/common.dart @@ -0,0 +1,3 @@ +import 'package:flutter/widgets.dart'; + +final appIcon = Image.asset('assets/app_icon.png'); diff --git a/lib/data/res/linux_icons.dart b/lib/data/res/icon/linux_icons.dart similarity index 100% rename from lib/data/res/linux_icons.dart rename to lib/data/res/icon/linux_icons.dart diff --git a/lib/data/res/url.dart b/lib/data/res/url.dart index 07986eb3..01414ecd 100644 --- a/lib/data/res/url.dart +++ b/lib/data/res/url.dart @@ -1,3 +1,5 @@ const backendUrl = 'https://v2.custed.lolli.tech'; const baseUrl = backendUrl + '/res/toolbox'; const joinQQGroupUrl = 'https://jq.qq.com/?_wv=1027&k=G0hUmPAq'; +const myGithub = 'https://github.com/LollipopKit'; +const rainSunMeGithub = 'https://github.com/RainSunMe'; diff --git a/lib/data/store/server.dart b/lib/data/store/server.dart index 743b1775..b806a0c1 100644 --- a/lib/data/store/server.dart +++ b/lib/data/store/server.dart @@ -12,7 +12,7 @@ class ServerStore extends PersistentStore { List fetch() { return getServerInfoList( - json.decode(box.get('servers', defaultValue: '[]')!))!; + json.decode(box.get('servers', defaultValue: '[]')!)); } void delete(ServerPrivateInfo s) { diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 7a81d524..76e5a893 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -48,12 +48,20 @@ class _ServerPageState extends State Widget build(BuildContext context) { super.build(context); return Scaffold( - body: SingleChildScrollView( - padding: const EdgeInsets.symmetric(horizontal: 7), - child: AnimationLimiter( - child: Consumer(builder: (_, pro, __) { - return Column( - children: AnimationConfiguration.toStaggeredList( + body: Consumer(builder: (_, pro, __) { + if (pro.servers.isEmpty) { + return const Center( + child: Text( + 'There is not server.\nClick the fab to add one.', + textAlign: TextAlign.center, + ), + ); + } + return SingleChildScrollView( + padding: const EdgeInsets.symmetric(horizontal: 7), + child: AnimationLimiter( + child: Column( + children: AnimationConfiguration.toStaggeredList( duration: const Duration(milliseconds: 377), childAnimationBuilder: (widget) => SlideAnimation( verticalOffset: 50.0, @@ -65,9 +73,9 @@ class _ServerPageState extends State const SizedBox(height: 13), ...pro.servers.map((e) => _buildEachServerCard(e)) ], - )); - })), - ), + ))), + ); + }), floatingActionButton: FloatingActionButton( onPressed: () => AppRoute(const ServerEditPage(), 'Add server info page')