Skip to content

Commit 076b544

Browse files
matteriotmatteriot
committed
toast
git tag v1.0.5+79
1 parent 7b37fe2 commit 076b544

File tree

12 files changed

+50
-37
lines changed

12 files changed

+50
-37
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.0.5+79]
2+
3+
* toast
4+
15
## [1.0.5+78]
26

37
* Please login before Add Gateway

‎example/pubspec.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,10 +840,10 @@ packages:
840840
dependency: transitive
841841
description:
842842
name: openiothub_plugin
843-
sha256: c4d9875788253b625e01a3a8a28b4bfff3dd178668800745df6ab3ee6078c0e7
843+
sha256: "0d33019297b97b099905371b5f95e3796d7afaf8951b87e75e3d0f934c826a87"
844844
url: "https://pub.flutter-io.cn"
845845
source: hosted
846-
version: "1.0.2+46"
846+
version: "1.0.2+47"
847847
package_info_plus:
848848
dependency: transitive
849849
description:

‎lib/commPages/appInfo.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
44
import 'package:oktoast/oktoast.dart';
55
import 'package:openiothub_common_pages/openiothub_common_pages.dart';
66
import 'package:openiothub_common_pages/utils/goToUrl.dart';
7+
import 'package:openiothub_common_pages/utils/toast.dart';
78
import 'package:package_info_plus/package_info_plus.dart';
89
import 'package:tdesign_flutter/tdesign_flutter.dart';
910
// import 'package:tencent_kit/tencent_kit.dart';
@@ -43,9 +44,9 @@ class _AppInfoPageState extends State<AppInfoPage> {
4344
void _listenShareMsg(WechatResp resp) {
4445
// final String content = 'share: ${resp.errorCode} ${resp.errorMsg}';
4546
if (resp.errorCode == 0) {
46-
showToast(share_success);
47+
show_success(share_success,context);
4748
} else {
48-
showToast(share_failed);
49+
show_failed(share_failed,context);
4950
}
5051
}
5152

@@ -184,7 +185,7 @@ class _AppInfoPageState extends State<AppInfoPage> {
184185
theme: TDButtonTheme.primary,
185186
onTap: () async {
186187
if (!await WechatKitPlatform.instance.isInstalled()) {
187-
showToast(OpenIoTHubCommonLocalizations.of(context).wechat_not_installed);
188+
show_failed(OpenIoTHubCommonLocalizations.of(context).wechat_not_installed, context);
188189
return;
189190
}
190191
WechatKitPlatform.instance.shareWebpage(
@@ -209,7 +210,7 @@ class _AppInfoPageState extends State<AppInfoPage> {
209210
onTap: () async {
210211
if (!await WechatKitPlatform.instance
211212
.isInstalled()) {
212-
showToast(OpenIoTHubCommonLocalizations.of(context).wechat_not_installed);
213+
show_failed(OpenIoTHubCommonLocalizations.of(context).wechat_not_installed, context);
213214
return;
214215
}
215216
WechatKitPlatform.instance.shareWebpage(

‎lib/commPages/serverInfo.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:oktoast/oktoast.dart';
33
import 'package:openiothub_api/openiothub_api.dart';
4+
import 'package:openiothub_common_pages/utils/toast.dart';
45
import 'package:openiothub_grpc_api/proto/manager/serverManager.pb.dart';
56

67
import 'package:openiothub_common_pages/openiothub_common_pages.dart';
@@ -186,7 +187,7 @@ class _ServerInfoPageState extends State<ServerInfoPage> {
186187
serverInfo.description = _description_controller.text;
187188
serverInfo.isPublic = _is_public;
188189
ServerManager.UpdateServer(serverInfo)
189-
.then((value) => showToast(OpenIoTHubCommonLocalizations.of(context).update_success));
190+
.then((value) => show_success(OpenIoTHubCommonLocalizations.of(context).update_success, context));
190191
},
191192
child: Text(OpenIoTHubCommonLocalizations.of(context).confirm_modify)),
192193
];
@@ -204,7 +205,7 @@ class _ServerInfoPageState extends State<ServerInfoPage> {
204205
),
205206
onPressed: () {
206207
ServerManager.DelServer(widget.serverInfo)
207-
.then((value) => showToast(OpenIoTHubCommonLocalizations.of(context).delete_success))
208+
.then((value) => show_success(OpenIoTHubCommonLocalizations.of(context).delete_success, context))
208209
.then((value) => Navigator.of(context).pop());
209210
}),
210211
]),

‎lib/commPages/servers.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:oktoast/oktoast.dart';
33
import 'package:openiothub_api/openiothub_api.dart';
44
import 'package:openiothub_common_pages/commPages/serverInfo.dart';
5+
import 'package:openiothub_common_pages/utils/toast.dart';
56
import 'package:openiothub_constants/constants/Constants.dart';
67
import 'package:openiothub_grpc_api/proto/manager/serverManager.pb.dart';
78

@@ -283,7 +284,7 @@ class ServerPagesState extends State<ServerPages> {
283284
serverInfo.isPublic = _is_public;
284285
ServerManager.AddServer(serverInfo)
285286
.then((value) =>
286-
showToast("${OpenIoTHubCommonLocalizations.of(context).add_server}(${_name_controller.text})${OpenIoTHubCommonLocalizations.of(context).success}"))
287+
show_success("${OpenIoTHubCommonLocalizations.of(context).add_server}(${_name_controller.text})${OpenIoTHubCommonLocalizations.of(context).success}", context))
287288
.then((value) => Navigator.of(context).pop())
288289
.then((value) => _listMyServers());
289290
},

‎lib/gateway/GatewayQrPage.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'dart:io';
44
import 'package:flutter/material.dart';
55
import 'package:oktoast/oktoast.dart';
66
import 'package:openiothub_api/openiothub_api.dart';
7+
import 'package:openiothub_common_pages/utils/toast.dart';
78
import 'package:openiothub_constants/openiothub_constants.dart';
89
import 'package:openiothub_grpc_api/proto/manager/publicApi.pb.dart';
910
import 'package:qr_flutter/qr_flutter.dart';
@@ -31,9 +32,9 @@ class _GatewayQrPageState extends State<GatewayQrPage> {
3132
void _listenShareMsg(WechatResp resp) {
3233
// final String content = 'share: ${resp.errorCode} ${resp.errorMsg}';
3334
if (resp.errorCode == 0) {
34-
showToast(share_success);
35+
show_success(share_success, context);
3536
} else {
36-
showToast(share_failed);
37+
show_failed(share_failed, context);
3738
}
3839
}
3940

‎lib/user/LoginPage.dart‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import 'package:wechat_kit/wechat_kit.dart';
1616

1717
import 'package:openiothub_common_pages/openiothub_common_pages.dart';
1818

19+
import '../utils/toast.dart';
20+
1921
class LoginPage extends StatefulWidget {
2022
@override
2123
_State createState() => _State();
@@ -43,7 +45,7 @@ class _State extends State<LoginPage> {
4345
await UserManager.LoginWithWechatCode(resp.code!);
4446
await _handleLoginResp(userLoginResponse);
4547
} else {
46-
showToast("$wechat_login_failed:${resp.errorMsg}");
48+
show_failed("$wechat_login_failed:${resp.errorMsg}", context);
4749
}
4850
}
4951

@@ -117,12 +119,12 @@ class _State extends State<LoginPage> {
117119
onTap: () async {
118120
// 只有同意隐私政策才可以进行下一步
119121
if (!_isChecked) {
120-
showToast("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}");
122+
show_failed("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}", context);
121123
return;
122124
}
123125
if (_usermobile.text.isEmpty ||
124126
_userpassword.text.isEmpty) {
125-
showToast(OpenIoTHubCommonLocalizations.of(context).username_and_password_cant_be_empty);
127+
show_failed(OpenIoTHubCommonLocalizations.of(context).username_and_password_cant_be_empty, context);
126128
return;
127129
}
128130
LoginInfo loginInfo = LoginInfo();
@@ -215,7 +217,7 @@ class _State extends State<LoginPage> {
215217
onPressed: () async {
216218
// 只有同意隐私政策才可以进行下一步
217219
if (!_isChecked) {
218-
showToast("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}");
220+
show_failed("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}", context);
219221
return;
220222
}
221223
// 判断是否安装了微信，安装了微信则打开微信进行登录，否则显示二维码由手机扫描登录
@@ -237,7 +239,7 @@ class _State extends State<LoginPage> {
237239
loginFlag = generateRandomString(12);
238240
String qrUrl = await getPicUrl(loginFlag!);
239241
if (qrUrl == "") {
240-
showToast(OpenIoTHubCommonLocalizations.of(context).get_wechat_qr_code_failed);
242+
show_failed(OpenIoTHubCommonLocalizations.of(context).get_wechat_qr_code_failed, context);
241243
return;
242244
}
243245
// 循环获取登录结果
@@ -283,8 +285,8 @@ class _State extends State<LoginPage> {
283285
});
284286
Navigator.of(context).pop();
285287
} else {
286-
showToast(
287-
"${OpenIoTHubCommonLocalizations.of(context).login_failed}:code:${userLoginResponse.code},message:${userLoginResponse.msg}");
288+
show_failed(
289+
"${OpenIoTHubCommonLocalizations.of(context).login_failed}:code:${userLoginResponse.code},message:${userLoginResponse.msg}", context);
288290
}
289291
}
290292

@@ -321,13 +323,13 @@ class _State extends State<LoginPage> {
321323
} else if ((response.data["data"] as Map<String, dynamic>)
322324
.containsKey("scan") &&
323325
(response.data["data"] as Map<String, dynamic>)["scan"] == true) {
324-
showToast(OpenIoTHubCommonLocalizations.of(context).login_after_wechat_bind);
326+
show_success(OpenIoTHubCommonLocalizations.of(context).login_after_wechat_bind, context);
325327
} else if ((response.data["data"] as Map<String, dynamic>)
326328
.containsKey("scan") &&
327329
(response.data["data"] as Map<String, dynamic>)["scan"] == false) {
328330
// showToast("请扫码！");
329331
} else {
330-
showToast("${OpenIoTHubCommonLocalizations.of(context).wechat_fast_login_failed}：${response.data["msg"]}");
332+
show_failed("${OpenIoTHubCommonLocalizations.of(context).wechat_fast_login_failed}：${response.data["msg"]}", context);
331333
}
332334
}
333335
});

‎lib/user/RegisterPage.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:oktoast/oktoast.dart';
33
import 'package:openiothub_api/openiothub_api.dart';
44
import 'package:openiothub_common_pages/openiothub_common_pages.dart';
5+
import 'package:openiothub_common_pages/utils/toast.dart';
56
import 'package:openiothub_grpc_api/proto/manager/common.pb.dart';
67
import 'package:openiothub_grpc_api/proto/manager/userManager.pb.dart';
78
import 'package:tdesign_flutter/tdesign_flutter.dart';
@@ -57,12 +58,12 @@ class _State extends State<RegisterPage> {
5758
theme: TDButtonTheme.primary,
5859
onTap: () async {
5960
if (!_isChecked) {
60-
showToast("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}");
61+
show_failed("${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement1}☑️${OpenIoTHubCommonLocalizations.of(context).agree_to_the_user_agreement2}", context);
6162
return;
6263
}
6364
if (_usermobile.text.isEmpty ||
6465
_userpassword.text.isEmpty) {
65-
showToast(OpenIoTHubCommonLocalizations.of(context).username_and_password_cant_be_empty);
66+
show_failed(OpenIoTHubCommonLocalizations.of(context).username_and_password_cant_be_empty, context);
6667
return;
6768
}
6869
LoginInfo loginInfo = LoginInfo();
@@ -71,12 +72,12 @@ class _State extends State<RegisterPage> {
7172
OperationResponse operationResponse =
7273
await UserManager.RegisterUserWithUserInfo(loginInfo);
7374
if (operationResponse.code == 0) {
74-
showToast("${OpenIoTHubCommonLocalizations.of(context).register_success}${operationResponse.msg}");
75+
show_success("${OpenIoTHubCommonLocalizations.of(context).register_success}${operationResponse.msg}", context);
7576
if (Navigator.of(context).canPop()) {
7677
Navigator.of(context).pop();
7778
} else {}
7879
} else {
79-
showToast("${OpenIoTHubCommonLocalizations.of(context).register_failed}:${operationResponse.msg}");
80+
show_failed("${OpenIoTHubCommonLocalizations.of(context).register_failed}:${operationResponse.msg}", context);
8081
}
8182
}),
8283
Row(

‎lib/user/accountSecurityPage.dart‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
44
import 'package:oktoast/oktoast.dart';
55
import 'package:openiothub_api/openiothub_api.dart';
66
import 'package:openiothub_common_pages/user/LoginPage.dart';
7+
import 'package:openiothub_common_pages/utils/toast.dart';
78
import 'package:openiothub_constants/openiothub_constants.dart';
89
import 'package:openiothub_grpc_api/google/protobuf/wrappers.pb.dart';
910
import 'package:openiothub_grpc_api/proto/manager/common.pb.dart';
@@ -34,12 +35,12 @@ class _AccountSecurityPageState extends State<AccountSecurityPage> {
3435
OperationResponse operationResponse =
3536
await UserManager.BindWithWechatCode(resp.code!);
3637
if (operationResponse.code == 0) {
37-
showToast(bind_wechat_success);
38+
show_success(bind_wechat_success, context);
3839
} else {
39-
showToast("${bind_wechat_failed}:${operationResponse.msg}");
40+
show_failed("${bind_wechat_failed}:${operationResponse.msg}", context);
4041
}
4142
} else {
42-
showToast("${get_wechat_login_info_failed}:${resp.errorMsg}");
43+
show_failed("${get_wechat_login_info_failed}:${resp.errorMsg}", context);
4344
}
4445
}
4546

@@ -101,7 +102,7 @@ class _AccountSecurityPageState extends State<AccountSecurityPage> {
101102
state: 'auth',
102103
);
103104
} else {
104-
showToast(OpenIoTHubCommonLocalizations.of(context).no_wechat_installed);
105+
show_failed(OpenIoTHubCommonLocalizations.of(context).no_wechat_installed, context);
105106
}
106107
}),
107108
ListTile(
@@ -112,9 +113,9 @@ class _AccountSecurityPageState extends State<AccountSecurityPage> {
112113
UserManager.UnbindWechat()
113114
.then((OperationResponse operationResponse) {
114115
if (operationResponse.code == 0) {
115-
showToast(OpenIoTHubCommonLocalizations.of(context).unbind_wechat_success);
116+
show_success(OpenIoTHubCommonLocalizations.of(context).unbind_wechat_success, context);
116117
} else {
117-
showToast("${OpenIoTHubCommonLocalizations.of(context).unbind_wechat_failed_reason}${operationResponse.msg}");
118+
show_failed("${OpenIoTHubCommonLocalizations.of(context).unbind_wechat_failed_reason}${operationResponse.msg}", context);
118119
}
119120
});
120121
}),
@@ -277,10 +278,10 @@ class _AccountSecurityPageState extends State<AccountSecurityPage> {
277278
await UserManager.DeleteMyAccount(login_info);
278279
if (operationResponse.code == 0) {
279280
//删除账号成功
280-
showToast(OpenIoTHubCommonLocalizations.of(context).cancel_account_success);
281+
show_success(OpenIoTHubCommonLocalizations.of(context).cancel_account_success, context);
281282
Navigator.of(context).pop();
282283
} else {
283-
showToast("${OpenIoTHubCommonLocalizations.of(context).cancel_account_failed}:${operationResponse.msg}");
284+
show_failed("${OpenIoTHubCommonLocalizations.of(context).cancel_account_failed}:${operationResponse.msg}", context);
284285
}
285286
},
286287
),

‎lib/wifiConfig/airkiss.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter/services.dart';
88
import 'package:oktoast/oktoast.dart';
9+
import 'package:openiothub_common_pages/utils/toast.dart';
910
import 'package:openiothub_common_pages/wifiConfig/permission.dart';
1011
import 'package:network_info_plus/network_info_plus.dart';
1112
import 'package:permission_handler/permission_handler.dart';
@@ -160,7 +161,7 @@ class _AirkissState extends State<Airkiss> {
160161
child: Text(localizations!.start_adding_surrounding_smart_devices),
161162
onPressed: () async {
162163
if (_ssid == null || _password == null) {
163-
showToast(localizations!.wifi_info_cant_be_empty);
164+
show_failed(localizations!.wifi_info_cant_be_empty, context);
164165
return;
165166
}
166167
setState(() {
@@ -259,7 +260,7 @@ class _AirkissState extends State<Airkiss> {
259260

260261
_msg = localizations!.please_input_2p4g_wifi_password;
261262
});
262-
showToast("ssid:${wifiName!},bssid:${wifiBSSID!}");
263+
show_success("ssid:${wifiName!},bssid:${wifiBSSID!}", context);
263264
}
264265

265266
Future<bool> _configureWiFi() async {

0 commit comments

Comments
 (0)