diff --git a/assets/image/help1.png b/assets/image/help1.png deleted file mode 100644 index 2797bcd..0000000 Binary files a/assets/image/help1.png and /dev/null differ diff --git a/assets/image/help2.png b/assets/image/help2.png deleted file mode 100644 index bcc27cb..0000000 Binary files a/assets/image/help2.png and /dev/null differ diff --git a/assets/image/inputData.PNG b/assets/image/inputData.PNG new file mode 100644 index 0000000..c114e1f Binary files /dev/null and b/assets/image/inputData.PNG differ diff --git a/assets/image/inputData2.PNG b/assets/image/inputData2.PNG new file mode 100644 index 0000000..3ca1ac4 Binary files /dev/null and b/assets/image/inputData2.PNG differ diff --git a/assets/image/inputMethod.PNG b/assets/image/inputMethod.PNG new file mode 100644 index 0000000..d3c03bf Binary files /dev/null and b/assets/image/inputMethod.PNG differ diff --git a/assets/image/invMatrix.PNG b/assets/image/invMatrix.PNG new file mode 100644 index 0000000..a2eceb4 Binary files /dev/null and b/assets/image/invMatrix.PNG differ diff --git a/assets/image/sin.PNG b/assets/image/sin.PNG new file mode 100644 index 0000000..f143971 Binary files /dev/null and b/assets/image/sin.PNG differ diff --git a/lib/src/view/route/helpDetailRoute.dart b/lib/src/view/route/helpDetailRoute.dart index fe30013..6425fdc 100644 --- a/lib/src/view/route/helpDetailRoute.dart +++ b/lib/src/view/route/helpDetailRoute.dart @@ -5,106 +5,147 @@ import 'package:xiaoming/src/data/settingData.dart'; import 'package:xiaoming/src/language/xiaomingLocalizations.dart'; class HelpDetailRoute extends StatefulWidget { - HelpDetailRoute(this.index, {Key key}) : super(key: key); + HelpDetailRoute(this._index, {Key key}) : super(key: key); - final int index; + final int _index; @override - _HelpDetailRouteState createState() => _HelpDetailRouteState(index); + _HelpDetailRouteState createState() => _HelpDetailRouteState(); } class _HelpDetailRouteState extends State { - _HelpDetailRouteState(this.index); - - final int index; Text text; @override void initState() { - SettingData.nowPage = 2; super.initState(); + SettingData.nowPage = 2; } @override Widget build(BuildContext context) { SettingData.pageContext = context; - switch (index) { + List list = []; + + switch (widget._index) { case 1: - text = Text(XiaomingLocalizations.of(context).helpTabData1); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData1), + SizedBox( + height: 50.0, + ), + Card( + child: Image.asset( + 'assets/image/inputData.png', + fit: BoxFit.fitWidth, + ), + ), + SizedBox( + height: 50.0, + ), + Card( + child: Image.asset( + 'assets/image/inputData2.png', + fit: BoxFit.fitWidth, + ), + ), + ]); break; case 2: - text = Text(XiaomingLocalizations.of(context).helpTabData2); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData2), + ]); break; case 3: - text = Text(XiaomingLocalizations.of(context).helpTabData3); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData3), + SizedBox( + height: 50.0, + ), + Card( + child: Image.asset( + 'assets/image/inputMethod.png', + fit: BoxFit.fitWidth, + ), + ), + SizedBox( + height: 50.0, + ), + Card( + child: Image.asset( + 'assets/image/invMatrix.png', + fit: BoxFit.fitWidth, + ), + ), + SizedBox( + height: 50.0, + ), + Card( + child: Image.asset( + 'assets/image/sin.png', + fit: BoxFit.fitWidth, + ), + ), + ]); break; case 4: - text = Text(XiaomingLocalizations.of(context).helpTabData4); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData4), + ]); break; case 5: - text = Text(XiaomingLocalizations.of(context).helpTabData5); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData5), + ]); break; case 6: - text = Text(XiaomingLocalizations.of(context).helpTabData6); + list.addAll([ + Text(XiaomingLocalizations.of(context).helpTabData6), + ]); break; } - return DefaultTextStyle( - style: const TextStyle( - fontFamily: '.SF UI Text', - inherit: false, - fontSize: 17.0, - color: CupertinoColors.black, - ), - child: Provide( - builder: (context, child, sd) { - return sd.theme == "IOS" - ? CupertinoPageScaffold( - backgroundColor: CupertinoColors.lightBackgroundGray, - navigationBar: const CupertinoNavigationBar( - middle: Text("HelpDetail"), - previousPageTitle: 'Help', - ), - child: child, - ) - : Scaffold( - appBar: AppBar( - backgroundColor: Colors.blueGrey, - title: Text("HelpDetail"), - centerTitle: true, - ), - body: child, - ); - }, - child: ListView(children: [ - Container( - padding: const EdgeInsets.all(20.0), - child: Card( - margin: const EdgeInsets.all(20.0), - elevation: 0.0, - child: - Container(padding: const EdgeInsets.all(20.0), child: text), - ), - ), - Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - Image.asset( - 'assets/image/help1.png', - width: MediaQuery.of(context).size.width / 3, - height: 200.0, - fit: BoxFit.fitWidth, - ), - SizedBox( - width: MediaQuery.of(context).size.width / 12, - ), - Image.asset( - 'assets/image/help2.png', - width: MediaQuery.of(context).size.width / 3, - height: 200.0, - fit: BoxFit.fitWidth, + return Provide( + builder: (context, child, sd) { + return sd.theme == "IOS" + ? CupertinoPageScaffold( + backgroundColor: CupertinoColors.lightBackgroundGray, + navigationBar: const CupertinoNavigationBar( + middle: Text("HelpDetail"), + previousPageTitle: 'Help', + ), + child: child, ) - ]), - ]), - )); + : Scaffold( + backgroundColor: CupertinoColors.lightBackgroundGray, + appBar: AppBar( + backgroundColor: Colors.blueGrey, + title: Text("HelpDetail"), + centerTitle: true, + ), + body: child, + ); + }, + child: Center( + child: Container( + padding: const EdgeInsets.all(20.0), + child: Card( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: DefaultTextStyle( + style: const TextStyle( + fontFamily: '.SF UI Text', + fontWeight: FontWeight.w400, + inherit: false, + fontSize: 20.0, + color: CupertinoColors.black, + ), + child: ListView(children: list)), + ), + ), + ), + ), + ); } } diff --git a/lib/src/view/route/integralRoute.dart b/lib/src/view/route/integralRoute.dart index be152cf..4fda358 100644 --- a/lib/src/view/route/integralRoute.dart +++ b/lib/src/view/route/integralRoute.dart @@ -8,7 +8,6 @@ import 'package:xiaoming/src/data/settingData.dart'; import 'package:xiaoming/src/data/userData.dart'; import 'package:xiaoming/src/language/xiaomingLocalizations.dart'; import 'dart:async'; - import 'package:xiaoming/src/view/widget/myTextComposer.dart'; class IntegralRoute extends StatefulWidget { diff --git a/pubspec.yaml b/pubspec.yaml index b79df50..0460c79 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -56,6 +56,11 @@ flutter: assets: - assets/image/help1.png - assets/image/help2.png + - assets/image/inputData.png + - assets/image/inputData2.png + - assets/image/inputMethod.png + - assets/image/invMatrix.png + - assets/image/sin.png # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg