|
|
@@ -83,7 +83,7 @@ Future<void> main() async {
|
|
|
await flutterLocalNotificationsPlugin.initialize(initializationSettings,
|
|
|
onSelectNotification: (String payload) async {
|
|
|
if (payload != null) {
|
|
|
- if(payload==notifyTypeNewMsg){
|
|
|
+ if (payload == notifyTypeNewMsg) {
|
|
|
RootPageView().bNIndex = 2;
|
|
|
EventBus().emit('ChangePage');
|
|
|
}
|
|
|
@@ -116,8 +116,9 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
|
|
|
});
|
|
|
EventBus().on('systemInformation', (arg) {
|
|
|
print('systemInformationasdasdasd');
|
|
|
- if(arg is SystemInformationBeanEntity){
|
|
|
- print('systemInformationasdasdasdcccccccccccccccccccccccccccccccccccccccc');
|
|
|
+ if (arg is SystemInformationBeanEntity) {
|
|
|
+ print(
|
|
|
+ 'systemInformationasdasdasdcccccccccccccccccccccccccccccccccccccccc');
|
|
|
showSystemMessages(arg);
|
|
|
}
|
|
|
});
|
|
|
@@ -336,6 +337,7 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
|
|
|
EasyLoading.instance
|
|
|
..contentPadding = EdgeInsets.symmetric(horizontal: 0, vertical: 12)
|
|
|
..alignment = Alignment.bottomCenter
|
|
|
+ ..loadingStyle = EasyLoadingStyle.light
|
|
|
..contentMargin = EdgeInsets.fromLTRB(20, 20, 20, 65);
|
|
|
EasyLoading.show(
|
|
|
indicator: Material(
|
|
|
@@ -573,6 +575,7 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
|
|
|
EasyLoading.instance
|
|
|
..contentPadding = EdgeInsets.symmetric(horizontal: 0, vertical: 12)
|
|
|
..alignment = Alignment.bottomCenter
|
|
|
+ ..loadingStyle = EasyLoadingStyle.light
|
|
|
..contentMargin = EdgeInsets.fromLTRB(20, 20, 20, 65);
|
|
|
EasyLoading.show(
|
|
|
indicator: Material(
|
|
|
@@ -980,62 +983,81 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
|
|
|
EasyLoading.instance
|
|
|
..contentPadding = EdgeInsets.symmetric(horizontal: 12, vertical: 12)
|
|
|
..alignment = Alignment.center
|
|
|
+ ..loadingStyle = EasyLoadingStyle.custom
|
|
|
+ ..backgroundColor = Colors.transparent
|
|
|
+ ..indicatorColor = Colors.black
|
|
|
+ ..progressColor = Colors.black
|
|
|
+ ..maskColor = Colors.black
|
|
|
+ ..textColor = Colors.black
|
|
|
..contentMargin = EdgeInsets.fromLTRB(20, 20, 20, 65);
|
|
|
EasyLoading.show(
|
|
|
indicator: Material(
|
|
|
- color: Colors.white,
|
|
|
- child: Center(
|
|
|
- child: Container(
|
|
|
- decoration: BoxDecoration(
|
|
|
- borderRadius: BorderRadius.circular(16),
|
|
|
- color: Colors.white,
|
|
|
- ),
|
|
|
- height: 180,
|
|
|
- padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
|
|
|
- child: Column(
|
|
|
- children: [
|
|
|
- Expanded(
|
|
|
- child: Center(
|
|
|
- child: Container(
|
|
|
- child: MyViews().myText(arg.content, MyColors.c333333, 14),
|
|
|
- margin: EdgeInsets.symmetric(horizontal: 20),
|
|
|
- ),
|
|
|
- ),
|
|
|
- ),
|
|
|
- Container(
|
|
|
- height: 0.5,
|
|
|
- color: MyColors.cE7E7E7,
|
|
|
- margin: EdgeInsets.only(bottom: 12),
|
|
|
+ color: Colors.transparent,
|
|
|
+ child: Container(
|
|
|
+ decoration: BoxDecoration(
|
|
|
+ borderRadius: BorderRadius.circular(16),
|
|
|
+ ),
|
|
|
+ height: MediaQuery.of(buildContext).size.height - 200,
|
|
|
+ padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
|
|
|
+ child: Column(
|
|
|
+ children: [
|
|
|
+ Expanded(child: Container()),
|
|
|
+ Container(
|
|
|
+ decoration: BoxDecoration(
|
|
|
+ color: Colors.white,
|
|
|
+ borderRadius: BorderRadius.circular(16),
|
|
|
),
|
|
|
- Container(
|
|
|
- margin: EdgeInsets.symmetric(horizontal: 10),
|
|
|
- child: Row(
|
|
|
- children: [
|
|
|
- Expanded(
|
|
|
- child: GestureDetector(
|
|
|
- onTap: () {
|
|
|
- EasyLoading.dismiss();
|
|
|
- },
|
|
|
- behavior: HitTestBehavior.translucent,
|
|
|
- child: Container(
|
|
|
- decoration: BoxDecoration(
|
|
|
- borderRadius: BorderRadius.circular(20),
|
|
|
- border: Border.all(
|
|
|
- color: MyColors.cFF4233, width: 1.1),
|
|
|
- color: Colors.white),
|
|
|
- child: MyViews().myText('我知道了', MyColors.cFF4233, 14),
|
|
|
- height: 40,
|
|
|
- alignment: Alignment.center,
|
|
|
- ),
|
|
|
- ),
|
|
|
+ child: Column(
|
|
|
+ children: [
|
|
|
+ Container(
|
|
|
+ child: Text(
|
|
|
+ '系统消息',
|
|
|
+ style: TextStyle(
|
|
|
+ color: MyColors.c333333,
|
|
|
+ fontSize: 14,
|
|
|
+ fontWeight: FontWeight.bold),
|
|
|
),
|
|
|
- ],
|
|
|
- ),
|
|
|
- )
|
|
|
- ],
|
|
|
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
- ),
|
|
|
+ margin:
|
|
|
+ EdgeInsets.symmetric(horizontal: 26, vertical: 15),
|
|
|
+ ),
|
|
|
+ Container(
|
|
|
+ child: Text(
|
|
|
+ arg.content,
|
|
|
+ style: TextStyle(color: MyColors.c333333, fontSize: 14),
|
|
|
+ ),
|
|
|
+ margin: EdgeInsets.symmetric(horizontal: 26),
|
|
|
+ alignment: Alignment.centerLeft,
|
|
|
+ ),
|
|
|
+ Container(
|
|
|
+ height: 0.5,
|
|
|
+ color: MyColors.cE7E7E7,
|
|
|
+ margin: EdgeInsets.only(bottom: 12, top: 12),
|
|
|
+ ),
|
|
|
+ GestureDetector(
|
|
|
+ onTap: () {
|
|
|
+ EasyLoading.dismiss();
|
|
|
+ },
|
|
|
+ behavior: HitTestBehavior.translucent,
|
|
|
+ child: Container(
|
|
|
+ width: 150,
|
|
|
+ margin: EdgeInsets.only(bottom: 14),
|
|
|
+ decoration: BoxDecoration(
|
|
|
+ borderRadius: BorderRadius.circular(20),
|
|
|
+ border:
|
|
|
+ Border.all(color: MyColors.cFF4233, width: 1.1),
|
|
|
+ color: Colors.white),
|
|
|
+ child: MyViews().myText('我知道了', MyColors.cFF4233, 14),
|
|
|
+ height: 40,
|
|
|
+ alignment: Alignment.center,
|
|
|
+ ),
|
|
|
+ )
|
|
|
+ ],
|
|
|
+ ),
|
|
|
+ ),
|
|
|
+ Expanded(child: Container()),
|
|
|
+ ],
|
|
|
),
|
|
|
+ alignment: Alignment.center,
|
|
|
),
|
|
|
),
|
|
|
);
|