jd
/
app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【直播】添加bottom sheet，NaviBar 界面更新

Browse Source
master
laiiihz 5 years ago
parent bc98f06f11
commit 6d15727530
9 changed files with 178 additions and 9 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/live/add_image.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
assets/live/add_stream.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
assets/live/add_video.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/live/recook_fab.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

15
lib/const/resource.dart
Unescape View File

@ -332,6 +332,21 @@ class R {
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/listtemp_recookmaketitle_bg.png)
static const String ASSETS_LISTTEMP_RECOOKMAKETITLE_BG_PNG = 'assets/listtemp_recookmaketitle_bg.png';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/live/.DS_Store)
static const String ASSETS_LIVE__DS_STORE = 'assets/live/.DS_Store';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/live/add_image.png)
static const String ASSETS_LIVE_ADD_IMAGE_PNG = 'assets/live/add_image.png';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/live/add_stream.png)
static const String ASSETS_LIVE_ADD_STREAM_PNG = 'assets/live/add_stream.png';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/live/add_video.png)
static const String ASSETS_LIVE_ADD_VIDEO_PNG = 'assets/live/add_video.png';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/live/recook_fab.png)
static const String ASSETS_LIVE_RECOOK_FAB_PNG = 'assets/live/recook_fab.png';
/// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/login_logo.png)
static const String ASSETS_LOGIN_LOGO_PNG = 'assets/login_logo.png';

15
lib/pages/live/pages/discovery_page.dart
Unescape View File

@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
class DiscoveryPage extends StatefulWidget {
DiscoveryPage({Key key}) : super(key: key);
@override
_DiscoveryPageState createState() => _DiscoveryPageState();
}
class _DiscoveryPageState extends State<DiscoveryPage> {
@override
Widget build(BuildContext context) {
return Scaffold();
}
}

35
lib/pages/live/widget/live_fab_location.dart
Unescape View File

@ -0,0 +1,35 @@
import 'package:flutter/material.dart';
import 'package:recook/constants/header.dart';
class FabLocation {
///copy from material/floating_action_button_location.dart
///
///相对centerDocked模式向下移 4pt
///
static const recook = _RecookFabLocation();
}
class _RecookFabLocation extends StandardFabLocation
with FabCenterOffsetX, CustomDockedOffsetY {
const _RecookFabLocation();
@override
String toString() => 'FabLocation.Recook';
}
mixin CustomDockedOffsetY on StandardFabLocation {
@override
double getOffsetY(
ScaffoldPrelayoutGeometry scaffoldGeometry, double adjustment) {
final double contentBottom = scaffoldGeometry.contentBottom;
final double contentMargin =
scaffoldGeometry.scaffoldSize.height - contentBottom;
final double bottomViewPadding = scaffoldGeometry.minViewPadding.bottom;
final double fabHeight = scaffoldGeometry.floatingActionButtonSize.height;
final double safeMargin =
bottomViewPadding > contentMargin ? bottomViewPadding : 0.0;
double fabY = contentBottom;
return fabY;
}
}

118
lib/pages/tabBar/TabbarWidget.dart
Unescape View File

@ -8,19 +8,22 @@
*/
import 'package:flutter/material.dart';
import 'package:recook/constants/config.dart';
import 'package:recook/constants/header.dart';
import 'package:recook/constants/styles.dart';
import 'package:recook/manager/user_manager.dart';
import 'package:recook/pages/business/business_page.dart';
import 'package:recook/pages/home/home_page.dart';
import 'package:recook/pages/live/pages/discovery_page.dart';
import 'package:recook/pages/live/widget/live_fab_location.dart';
import 'package:recook/pages/shop/widget/normal_shop_page.dart';
import 'package:recook/pages/shopping_cart/shopping_cart_page.dart';
import 'package:recook/pages/user/user_page.dart';
import 'package:recook/third_party/bugly_helper.dart';
import 'package:recook/utils/app_router.dart';
import 'package:recook/utils/print_util.dart';
import 'package:recook/utils/user_level_tool.dart';
import 'package:recook/utils/versionInfo/version_tool.dart';
import 'package:recook/widgets/cache_tab_bar_view.dart';
import 'package:recook/widgets/custom_image_button.dart';
import 'package:recook/widgets/tabbarWidget/ace_bottom_navigation_bar.dart';
class TabBarWidget extends StatefulWidget {
@ -46,6 +49,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
_tabController = TabController(
length: !AppConfig.getShowCommission() ? 4 : 5, vsync: this);
_bottomBarController = BottomBarController();
_tabController.addListener(_tabListener);
UserManager.instance.login.addListener(_loginListener);
UserManager.instance.selectTabbar.addListener(_selectTabbar);
@ -64,12 +68,107 @@ class _TabBarWidgetState extends State<TabBarWidget>
_tabController.index = UserManager.instance.selectTabbarIndex;
}
_tabListener() {
setState(() {});
}
@override
Widget build(BuildContext context) {
if (_context == null) {
_context = context;
}
return Scaffold(
floatingActionButton: _tabController.index == 2
? Container(
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(24),
),
child: CustomImageButton(
onPressed: () {
showModalBottomSheet(
context: context,
builder: (context) {
return Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.vertical(
top: Radius.circular(rSize(15))),
),
child: Builder(builder: (context) {
verticalButton(String title, String path) {
return CustomImageButton(
onPressed: () {},
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(height: rSize(20)),
Image.asset(
path,
height: rSize(44),
width: rSize(44),
),
SizedBox(height: rSize(10)),
Text(
title,
style: TextStyle(
fontSize: rSP(14),
color: Color(0xFF666666),
),
),
SizedBox(height: rSize(20)),
],
),
);
}
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [
verticalButton(
'直播',
R.ASSETS_LIVE_ADD_STREAM_PNG,
),
verticalButton(
'视频',
R.ASSETS_LIVE_ADD_VIDEO_PNG,
),
verticalButton(
'图文',
R.ASSETS_LIVE_ADD_IMAGE_PNG,
),
],
),
CustomImageButton(
height: rSize(66),
onPressed: () {},
child: Text('取消',
style: TextStyle(
color: Color(0xFF333333),
fontSize: rSP(14),
)),
),
],
);
}),
);
});
},
child: Container(
height: 40,
width: 40,
child: Image.asset(R.ASSETS_LIVE_RECOOK_FAB_PNG),
),
),
)
: null,
floatingActionButtonLocation: FabLocation.recook,
body: CacheTabBarView(
physics: NeverScrollableScrollPhysics(),
needAnimation: false,
@ -79,14 +178,14 @@ class _TabBarWidgetState extends State<TabBarWidget>
!AppConfig.getShowCommission()
? <Widget>[
HomePage(),
BusinessPage(),
DiscoveryPage(),
ShoppingCartPage(),
UserPage()
]
: <Widget>[
HomePage(),
BusinessPage(),
NormalShopPage(),
DiscoveryPage(),
ShoppingCartPage(),
UserPage()
],
@ -108,7 +207,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
!UserManager.instance.refreshUserPage.value;
}
} else {
if (index == 2) {
if (index == 1) {
UserManager.instance.refreshShopPage.value =
!UserManager.instance.refreshShopPage.value;
}
@ -132,6 +231,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
_bottomBarController.dispose();
UserManager.instance.login?.removeListener(_loginListener);
UserManager.instance.selectTabbar.removeListener(_selectTabbar);
_tabController?.removeListener(_tabListener);
super.dispose();
}
@ -211,16 +311,16 @@ class _BottomBarState extends State<BottomBar> {
image: AssetImage("assets/tabbar_sale_normal.png"),
imageSelected: AssetImage("assets/tabbar_sale_selected.png"),
),
NavigationItemBean(
textStr: '发现',
image: AssetImage("assets/tabbar_find_normal.png"),
imageSelected: AssetImage("assets/tabbar_find_selected.png"),
),
NavigationItemBean(
textStr: '店铺',
image: AssetImage("assets/tabbar_shop_normal.png"),
imageSelected: AssetImage("assets/tabbar_shop_selected.png"),
),
NavigationItemBean(
textStr: '发现',
image: AssetImage("assets/tabbar_find_normal.png"),
imageSelected: AssetImage("assets/tabbar_find_selected.png"),
),
NavigationItemBean(
textStr: '购物车',
image: AssetImage("assets/tabbar_cart_normal.png"),

4
pubspec.yaml
Unescape View File

@ -177,6 +177,9 @@ dependencies:
flip_card: ^0.4.4
#腾讯直播
dev_dependencies:
flutter_test:
sdk: flutter
@ -202,6 +205,7 @@ flutter:
- assets/lottery_redeem/
- assets/shop/
- assets/header/
- assets/live/
fonts:
- family: AppIcons
fonts:

Write Preview
Loading…
Cancel
Save