commit

lib/ClueModel/page/plan/PlanBar.dart

@@ -12,7 +12,7 @@ class PlanBarView extends StatelessWidget {
   final Function(int showIndex) managerListener;
   final ChangeNotifier notifier;
   int showIndex = -1;
-  List normalData = ["全部项目", "智能排序", "筛选"];
+  List normalData = ["全部项目", "智能筛选", "筛选"];
 
   PlanBarView(this.managerLive, this.managerListener, this.notifier) {
     if (!notifier?.hasListeners) {

lib/ClueModel/page/plan/PlanModel.dart

@@ -41,6 +41,8 @@ class PlanModel extends BaseModel {
   String max_price = "";
   String rank_type = "";
 
+  List<String> normalData = ["全部项目", "智能筛选", "筛选"];
+
   int page = 1;
   int sortPos = 0;
 
@@ -53,6 +55,8 @@ class PlanModel extends BaseModel {
             sortList = event.data.orders;
             picLive.notifyView(event.data.ranks);
             stateLive.notifyView(ENDLOADING);
+            normalData[1] = event.data.orders[0].name;
+            managerLive.notifyView(normalData);
             if (call != null) {
               call();
             }
@@ -70,10 +74,12 @@ class PlanModel extends BaseModel {
         });
   }
 
-  void projectClick(String id) {
+  void projectClick(String id, String name) {
     if (tag_id == id) {
       return;
     }
+    normalData[0] = name;
+    managerLive.notifyView(normalData);
     tag_id = id;
     feedsLive.notifyView(Pair(LOADING, null));
     refreshFeed(true);
@@ -90,9 +96,9 @@ class PlanModel extends BaseModel {
         .listen((event) {
           if (event.error == 0) {
             if (event.data.plans == null || event.data.plans.isEmpty) {
-              if(page==1){
+              if (page == 1) {
                 feedsLive.notifyView(Pair(EMPTY, []));
-              }else{
+              } else {
                 feedsLive.notifyView(Pair(ENDLOADING, []));
               }
             } else {
@@ -143,6 +149,8 @@ class PlanModel extends BaseModel {
     }
     sortPos = index;
     order_by = sortList[index].id.toString();
+    normalData[1]="${sortList[index].name}";
+    managerLive.notifyView(normalData);
     feedsLive.notifyView(Pair(LOADING, null));
     refreshFeed(true);
   }

lib/ClueModel/page/plan/PlanPage.dart

@@ -107,12 +107,12 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
     return Container(
       width: MediaQuery.of(context).size.width,
       //主页 剪去tabbar高度
-      height: MediaQuery.of(context).size.height - 79,
+      height: MediaQuery.of(context).size.height - 50,
       child: Stack(
         children: <Widget>[
           Container(
             width: MediaQuery.of(context).size.width,
-            height: MediaQuery.of(context).size.height - 79,
+            height: MediaQuery.of(context).size.height - 50,
 //                          child: child(),
             child: homeWarp(),
           ),
@@ -181,9 +181,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                   width: MediaQuery.of(context).size.width,
                   maxHeight: 450,
                   listener: projectMenuListener,
-                  child: ProjectView(_model.projectData, (id) {
+                  child: ProjectView(_model.projectData, (id,name) {
                     clickIndexOther(0);
-                    _model.projectClick(id);
+                    _model.projectClick(id,name);
                   }),
                   proListener: (pro) {
                     _model.backProgress(pro, 0);

lib/ClueModel/page/plan/ProjectView.dart

@@ -11,7 +11,7 @@ import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 class ProjectView extends StatefulWidget {
   final List<Tags> datas;
-  final Function(String id) clickCall;
+  final Function(String id,String name) clickCall;
 
   ProjectView(this.datas, this.clickCall);
 
@@ -82,7 +82,8 @@ class ProjectViewState extends State<ProjectView> {
                   child: baseText(widget.datas[selectIndex].subtags[index].name,
                       14, Color(0xff464646)),
                 ).gestureDetector(() {
-                  widget.clickCall("${widget.datas[selectIndex].subtags[index].tagId}");
+                  widget.clickCall("${widget.datas[selectIndex].subtags[index].tagId}"
+                  ,"${widget.datas[selectIndex].subtags[index].name}");
                 });
               },
               itemCount: widget.datas[selectIndex].subtags.length,

lib/ClueModel/page/top/TopPage.dart

@@ -161,7 +161,8 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
             SliverOverlapAbsorber(
                 handle: extend.NestedScrollView.sliverOverlapAbsorberHandleFor(
                     context),
-                sliver: baseSliverAppBar(_model.imageUrl)),
+                sliver: baseSliverAppBar(_model.imageUrl
+                ,height: 175)),
             SliverPersistentHeader(
               pinned: true,
               delegate: StickyTabBarDelegate(

lib/MainRouter/page/test/TP.dart

-/*
- * @author lsy
- * @date   2020/5/14
- **/
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:gm_flutter/commonModel/base/BaseState.dart';
-import 'package:gm_flutter/commonModel/util/WidgetUtil.dart';
-
-class TP extends StatefulWidget {
-  @override
-  State<StatefulWidget> createState() => TPState();
-}
-
-class TPState extends BaseState<TP> {
-
-  final key = GlobalKey<State>();
-
-  @override
-  Widget buildItem(BuildContext context) {
-//    if(context!=null){
-//      throw RecorderRunningException("?????");
-//    }throw
-    return Scaffold(
-      appBar: AppBar(
-        actions: <Widget>[
-          GestureDetector(
-            onTap: () async {
-
-            },
-            child: Container(
-              width: 60,
-              height: 56,
-              color: Colors.red,
-            ),
-          )
-        ],
-      ),
-      body: Container(
-        width: double.maxFinite,
-        height: double.maxFinite,
-        alignment: Alignment.center,
-        child: InkWell(
-            onTap: () async {
-              RenderBox box = key.currentContext.findRenderObject();
-              Offset offset = box.localToGlobal(Offset.zero);
-              final result = await showMenu(
-                  context: context,
-                  position: WidgetUtil.buttonMenuPosition(key.currentContext),
-                  items: <PopupMenuItem<String>>[
-                    new PopupMenuItem<String>(
-                        value: 'value01',
-                        child: Container(
-                          height: 5,
-                          width: 5,
-                          color: Colors.blue,
-                        )),
-                    new PopupMenuItem<String>(
-                        value: 'value02', child: new Text('Item Two')),
-                    new PopupMenuItem<String>(
-                        value: 'value03', child: new Text('Item Three')),
-                  ]);
-            },
-            child: Container(
-              key: key,
-              width: 20,
-              height: 20,
-              color: Colors.black,
-            )),
-      ),
-    );
-  }
-}
-
-class My extends PopupMenuEntry {
-  @override
-  State<StatefulWidget> createState() => MyState();
-
-  @override
-  double get height => 50;
-
-  @override
-  bool represents(value) {
-    return value;
-  }
-}
-
-class MyState extends State<My> {
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      margin: EdgeInsets.all(15),
-      height: 50,
-      width: 50,
-      color: Colors.red,
-    );
-  }
-}

lib/MainRouter/page/test/TestPage.dart

@@ -12,7 +12,6 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
 import 'package:gm_flutter/main.mark.dart';
 import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
-import 'TP.dart';
 
 class TestPage extends StatefulWidget {
   @override