🚑 hero组件异常

Author: toly1994328

lib/components/permanent/circle.dart

@@ -6,7 +6,7 @@ class Circle extends StatelessWidget {
   final bool showShadow;
   final Widget child;
 
-  Circle({this.color=Colors.blue, this.radius=6,this.showShadow=true,this.child});
+  const Circle({this.color=Colors.blue, this.radius=6,this.showShadow=true,this.child});
 
   @override
   Widget build(BuildContext context) {

lib/components/permanent/tag.dart

@@ -6,7 +6,7 @@ class Tag extends StatelessWidget {
   final double tranRate;
   final Color color;
 
-  Tag({this.size = const Size(100, 150),this.shadowHeight=9.0,this.tranRate=0.25,this.color=Colors.red});
+  const Tag({this.size = const Size(100, 150),this.shadowHeight=9.0,this.tranRate=0.25,this.color=Colors.red});
 
   @override
   Widget build(BuildContext context) {

lib/views/app/navigation/unit_bottom_bar.dart

@@ -25,7 +25,7 @@ class _UnitBottomBarState extends State<UnitBottomBar> {
   Widget build(BuildContext context) {
     return BottomAppBar(
         elevation: 0,
-        shape: CircularNotchedRectangle(),
+        shape: const CircularNotchedRectangle(),
         notchMargin: 5,
         color: widget.color,
         child: Row(
@@ -38,28 +38,27 @@ class _UnitBottomBarState extends State<UnitBottomBar> {
 
   List<String> get info => widget.itemData.keys.toList();
 
+  final borderTR = const BorderRadius.only(topRight: Radius.circular(10));
+  final borderTL = const BorderRadius.only(topLeft: Radius.circular(10));
+  final paddingTR = const EdgeInsets.only(top: 2, right: 2);
+  final paddingTL = const EdgeInsets.only(top: 2, left: 2);
+
   Widget _buildChild(BuildContext context, int i, Color color) {
     var active = i == _position;
     bool left = i == 0;
+
     return GestureDetector(
       onTap: () => _tapTab(i),
       onLongPress: () => _onLongPress(context, i),
       child: Material(
         elevation: 2,
-        shape: RoundedRectangleBorder(
-            borderRadius: left
-                ? BorderRadius.only(topRight: Radius.circular(10))
-                : BorderRadius.only(topLeft: Radius.circular(10))),
+        shape: RoundedRectangleBorder(borderRadius: left ? borderTR : borderTL),
         child: Container(
-            margin: left
-                ? EdgeInsets.only(top: 2, right: 2)
-                : EdgeInsets.only(top: 2, left: 2),
+            margin: left ? paddingTR : paddingTL,
             alignment: Alignment.center,
             decoration: BoxDecoration(
                 color: color.withAlpha(88),
-                borderRadius: left
-                    ? BorderRadius.only(topRight: Radius.circular(10))
-                    : BorderRadius.only(topLeft: Radius.circular(10))),
+                borderRadius: left ? borderTR : borderTL),
             height: 45,
             width: 100,
             child: Icon(

lib/views/app/navigation/unit_navigation.dart

@@ -42,7 +42,7 @@ class _UnitNavigationState extends State<UnitNavigation> {
                 FloatingActionButtonLocation.centerDocked,
             floatingActionButton: _buildSearchButton(state.homeColor),
             body: PageView(
-              physics: NeverScrollableScrollPhysics(),
+              physics:const NeverScrollableScrollPhysics(),
               //使用PageView实现页面的切换
               controller: _controller,
               children: <Widget>[
@@ -60,14 +60,14 @@ class _UnitNavigationState extends State<UnitNavigation> {
     return FloatingActionButton(
       elevation: 2,
       backgroundColor: color,
-      child: Icon(Icons.search),
+      child: const Icon(Icons.search),
       onPressed: () => Navigator.of(context).pushNamed(Router.search),
     );
   }
 
   _onTapNav(int index) {
     _controller.animateToPage(index,
-        duration: Duration(milliseconds: 200), curve: Curves.linear);
+        duration:const Duration(milliseconds: 200), curve: Curves.linear);
     if (index == 1) {
       BlocProvider.of<CollectBloc>(context).add(EventSetCollectData());
     }

lib/views/app/splash/unit_splash.dart

@@ -24,24 +24,14 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
   AnimationController _controller;
   AnimationController _secondController;
   double _factor;
-  double _secondFactor = 0.0;
   Animation _curveAnim;
-  Animation _curveAnim2;
-  Animation _bouncAnim;
+
   bool _animEnd = false;
 
   @override
   void initState() {
-//    SystemUiOverlayStyle systemUiOverlayStyle =
-//    SystemUiOverlayStyle(statusBarColor: Colors.red);
-//    SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
-//    SystemChrome.setSystemUIOverlayStyle(
-//        SystemUiOverlayStyle(statusBarColor: Colors.blue));
-    SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(
-//      systemNavigationBarColor: Colors.transparent,
-        statusBarColor: Colors.transparent);
+    SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(statusBarColor: Colors.transparent);
     SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
-//    SystemChrome.setEnabledSystemUIOverlays([]);
 
     _controller =
         AnimationController(duration: Duration(milliseconds: 1000), vsync: this)
@@ -58,18 +48,13 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
           });
     _secondController =
         AnimationController(duration: Duration(milliseconds: 600), vsync: this)
-          ..addListener(() => setState(() {
-                return _secondFactor = _curveAnim2.value;
-              }))
           ..addStatusListener((s) {
             if (s == AnimationStatus.completed) {
           Navigator.of(context).pushReplacementNamed(Router.nav);
             }
           });
     _curveAnim =
         CurvedAnimation(parent: _controller, curve: Curves.fastOutSlowIn);
-    _curveAnim2 =
-        CurvedAnimation(parent: _secondController, curve: Curves.fastOutSlowIn);
     _controller.forward();
     super.initState();
   }
@@ -79,14 +64,7 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
     var winH = MediaQuery.of(context).size.height;
     var winW = MediaQuery.of(context).size.width;
 
-    return
-//      GestureDetector(
-//      onTap: () {
-//        _controller.reset();
-//        _controller.forward();
-//      },
-//      child:
-        Scaffold(
+    return Scaffold(
       body: Stack(
         alignment: Alignment.center,
         children: <Widget>[
@@ -103,7 +81,6 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
           buildPower(),
         ],
       ),
-//      ),
     );
   }
 
@@ -113,8 +90,7 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
       color: Theme.of(context).primaryColor,
       fontWeight: FontWeight.bold,
       shadows: [
-        Shadow(
-          //阴影
+        const Shadow(
           color: Colors.grey,
           offset: Offset(1.0, 1.0), blurRadius: 1.0,
         )
@@ -131,7 +107,7 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
               AlignmentTween(begin: Alignment(-1, 0), end: Alignment.center)
                   .animate(_secondController),
           child: AnimatedOpacity(
-              duration: Duration(milliseconds: 300),
+              duration: const Duration(milliseconds: 300),
               opacity: _animEnd ? 1.0 : 0.0,
               child: ShaderMask(
                   shaderCallback: _buildShader,
@@ -156,8 +132,8 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
   Widget buildLogo(Color primaryColor) {
     return SlideTransition(
       position: Tween<Offset>(
-        begin: Offset(0, 0),
-        end: Offset(0, -1.5),
+        begin:const Offset(0, 0),
+        end:const Offset(0, -1.5),
       ).animate(_controller),
       child: RotationTransition(
           turns: _controller,
@@ -179,27 +155,24 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
     );
   }
 
-  Widget buildHead() {
-    return SlideTransition(
+  Widget buildHead() => SlideTransition(
         position: Tween<Offset>(
-          end: Offset(0, 0),
-          begin: Offset(0, -5),
+          end:const Offset(0, 0),
+          begin:const Offset(0, -5),
         ).animate(_controller),
         child: Container(
           height: 45,
           width: 45,
           child: Image.asset('assets/images/icon_head.png'),
         ));
-  }
 
-  Widget buildPower() {
-    return Positioned(
+  Widget buildPower() => Positioned(
       bottom: 30,
       right: 30,
       child: AnimatedOpacity(
-          duration: Duration(milliseconds: 300),
+          duration:const Duration(milliseconds: 300),
           opacity: _animEnd ? 1.0 : 0.0,
-          child: Text("Power By 张风捷特烈",
+          child:const Text("Power By 张风捷特烈",
               style: TextStyle(
                   color: Colors.grey,
                   shadows: [
@@ -210,5 +183,4 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
                   ],
                   fontSize: 16))),
     );
-  }
 }

lib/views/pages/search/loading_page.dart renamed to lib/views/common/loading_page.dart

@@ -19,13 +19,13 @@ class CategoryListItem extends StatelessWidget {
   Widget build(BuildContext context) {
     return Material(
       shadowColor: data.color.withAlpha(88),
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
       elevation: 2,
       child: Container(
         child: _buildChild(context),
-        padding: EdgeInsets.all(10),
+        padding: const EdgeInsets.all(10),
 
-        decoration: BoxDecoration(
+        decoration:const BoxDecoration(
           color: Colors.white,
           borderRadius: BorderRadius.all(Radius.circular(10)),
         ),
@@ -39,7 +39,7 @@ class CategoryListItem extends StatelessWidget {
     return Column(
       children: <Widget>[
         _buildTitle(themeColor),
-        Divider(),
+        const Divider(),
         Expanded(
             child: Stack(
               fit: StackFit.expand,
@@ -50,7 +50,7 @@ class CategoryListItem extends StatelessWidget {
                       style: TextStyle(
                           color: Colors.grey,
                           shadows: [
-                            Shadow(color: themeColor, offset: Offset(.2,.2),blurRadius: .5)
+                            Shadow(color: themeColor, offset:const Offset(.2,.2),blurRadius: .5)
                           ])),
                 ),
                   Positioned(
@@ -72,7 +72,7 @@ class CategoryListItem extends StatelessWidget {
                   )
               ],
             )),
-        Divider(),
+        const Divider(),
         Padding(
           padding: const EdgeInsets.all(5.0),
           child: Text(
@@ -107,66 +107,12 @@ class CategoryListItem extends StatelessWidget {
                 onDeleteItemClick(data);
               }
             },
-            child: Icon(
+            child: const Icon(
               CupertinoIcons.delete_solid,
               color: Colors.red,
             ),
           )
       ],
     );
   }
-
-//  Widget _buildLeading() => Padding(
-//        padding: const EdgeInsets.only(left: 5, right: 5),
-//        child: data.image == null
-//            ? Material(
-//                color: Colors.transparent,
-//                child: CircleText(
-//                  text: data.name,
-//                  size: 50,
-//                  color: itemColor,
-//                ),
-//              )
-//            : CircleImage(
-//                image: data.image,
-//                size: 50,
-//              ),
-//      );
-//
-//  Color get itemColor => Color(Cons.tabColors[data.family.index]);
-//
-//  Widget _buildTitle() {
-//    return Row(
-//      children: <Widget>[
-////        SizedBox(width: 10),
-//        Expanded(
-//          child: Text(data.name,
-//              overflow: TextOverflow.ellipsis,
-//              style: TextStyle(
-//                  fontSize: 17,
-//                  fontWeight: FontWeight.bold,
-//                  shadows: [
-//                    Shadow(color: Colors.white, offset: Offset(.3, .3))
-//                  ])),
-//        ),
-//      ],
-//    );
-//  }
-//
-//  Widget _buildSummary() {
-//    return Padding(
-//      padding: const EdgeInsets.only(left: 5, bottom: 10, top: 5),
-//      child: Container(
-//        child: Text(
-//          data.nameCN,
-//          maxLines: 2,
-//          overflow: TextOverflow.ellipsis,
-//          style: TextStyle(
-//              color: Colors.grey[600],
-//              fontSize: 14,
-//              shadows: [Shadow(color: Colors.white, offset: Offset(.5, .5))]),
-//        ),
-//      ),
-//    );
-//  }
 }