From c4ca4748f9a4098db0b30979b70ba9aea885da14 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Sat, 17 Oct 2020 11:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E4=B8=AD=E5=BF=83=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=EF=BC=9A?= =?UTF-8?q?=E5=89=AF=E6=A0=87=E9=A2=98=EF=BC=8C=E5=93=81=E7=89=8C=E9=A6=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/live/live_stream/live_page.dart | 2 + .../live_stream/live_pick_goods_page.dart | 1 - .../pick_view/live_goods_card.dart | 50 ++++++++++++++++++- .../live/sub_page/live_host_center_page.dart | 12 ++++- lib/pages/live/widget/user_base_card.dart | 2 + 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/lib/pages/live/live_stream/live_page.dart b/lib/pages/live/live_stream/live_page.dart index 62cf54c..058d45b 100644 --- a/lib/pages/live/live_stream/live_page.dart +++ b/lib/pages/live/live_stream/live_page.dart @@ -11,6 +11,7 @@ import 'package:recook/manager/http_manager.dart'; import 'package:recook/manager/user_manager.dart'; import 'package:recook/pages/live/live_stream/live_blur_page.dart'; import 'package:recook/pages/live/live_stream/live_pick_goods_page.dart'; +import 'package:recook/pages/live/live_stream/pick_view/pick_cart.dart'; import 'package:recook/pages/live/live_stream/show_goods_list.dart'; import 'package:recook/pages/live/models/live_exit_model.dart'; import 'package:recook/pages/live/models/live_stream_info_model.dart'; @@ -59,6 +60,7 @@ class _LivePageState extends State { @override void dispose() { + PickCart.picked.clear(); Wakelock.disable(); _livePusher?.stopPush(); _livePusher?.stopPreview(); diff --git a/lib/pages/live/live_stream/live_pick_goods_page.dart b/lib/pages/live/live_stream/live_pick_goods_page.dart index 502322b..7ea57c6 100644 --- a/lib/pages/live/live_stream/live_pick_goods_page.dart +++ b/lib/pages/live/live_stream/live_pick_goods_page.dart @@ -42,7 +42,6 @@ class _LivePickGoodsPageState extends State @override void dispose() { _tabController?.dispose(); - PickCart.picked.clear(); super.dispose(); } diff --git a/lib/pages/live/live_stream/pick_view/live_goods_card.dart b/lib/pages/live/live_stream/pick_view/live_goods_card.dart index 0b04ee0..77917e3 100644 --- a/lib/pages/live/live_stream/pick_view/live_goods_card.dart +++ b/lib/pages/live/live_stream/pick_view/live_goods_card.dart @@ -2,9 +2,13 @@ import 'package:flutter/material.dart'; import 'package:oktoast/oktoast.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/header.dart'; +import 'package:recook/pages/live/live_stream/pick_view/brand_goods_list_view.dart'; import 'package:recook/pages/live/live_stream/pick_view/pick_cart.dart'; import 'package:recook/pages/live/models/goods_window_model.dart'; +import 'package:recook/pages/live/models/live_brand_model.dart'; import 'package:recook/pages/user/widget/recook_check_box.dart'; +import 'package:recook/utils/custom_route.dart'; +import 'package:recook/widgets/recook/recook_scaffold.dart'; class LiveGoodsCard extends StatefulWidget { final VoidCallback onPick; @@ -21,7 +25,6 @@ class _LiveGoodsCardState extends State { Widget build(BuildContext context) { final bool picked = PickCart.picked.containsKey(widget.model.id); return SizedBox( - height: rSize(86 + 15.0), child: MaterialButton( onPressed: () { if (picked) @@ -70,7 +73,50 @@ class _LiveGoodsCardState extends State { fontSize: rSP(14), ), ), - Spacer(), + Text( + widget.model.description, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: AppTextStyle.generate(ScreenAdapterUtils.setSp(14), + color: Colors.black54, fontWeight: FontWeight.w300), + ), + InkWell( + onTap: () { + PickCart.brandModel = LiveBrandModel( + id: widget.model.brandId, + name: widget.model.brandName, + logoUrl: widget.model.brandImg, + ); + CRoute.push( + context, + RecookScaffold( + title: '品牌馆', + whiteBg: true, + body: BrandGoodsListView( + onPick: () {}, + ), + ), + ); + }, + child: Row( + children: [ + FadeInImage.assetNetwork( + placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG, + image: Api.getImgUrl(widget.model.brandImg), + width: rSize(13), + height: rSize(13), + ), + rWBox(4), + Text( + widget.model.brandName, + style: TextStyle( + color: Color(0xffc70404), + fontSize: ScreenAdapterUtils.setSp(12), + ), + ), + ], + ), + ), Row( children: [ Text( diff --git a/lib/pages/live/sub_page/live_host_center_page.dart b/lib/pages/live/sub_page/live_host_center_page.dart index a90746d..1b719ef 100644 --- a/lib/pages/live/sub_page/live_host_center_page.dart +++ b/lib/pages/live/sub_page/live_host_center_page.dart @@ -8,8 +8,10 @@ import 'package:recook/pages/live/models/live_base_info_model.dart'; import 'package:recook/pages/live/models/live_time_data_model.dart'; import 'package:recook/pages/live/pages/goods_window_page.dart'; import 'package:recook/pages/live/sub_page/data_manager_page.dart'; +import 'package:recook/pages/live/sub_page/user_home/user_playback_view.dart'; import 'package:recook/utils/custom_route.dart'; import 'package:recook/utils/permission_tool.dart'; +import 'package:recook/widgets/recook/recook_scaffold.dart'; import 'package:recook/widgets/recook_back_button.dart'; import 'package:recook/widgets/recook_indicator.dart'; @@ -191,7 +193,15 @@ class _LiveHostCenterPageState extends State width: rSize(20), height: rSize(20), ), - onTap: () {}, + onTap: () { + CRoute.push( + context, + RecookScaffold( + title: '直播回放', + body: UserPlaybackView(userId: widget.model.userId), + ), + ); + }, ), _buildListTile( title: '商品橱窗', diff --git a/lib/pages/live/widget/user_base_card.dart b/lib/pages/live/widget/user_base_card.dart index 0775b69..146e93b 100644 --- a/lib/pages/live/widget/user_base_card.dart +++ b/lib/pages/live/widget/user_base_card.dart @@ -32,6 +32,8 @@ class _UserBaseCardState extends State { children: [ Text( widget.date, + overflow: TextOverflow.visible, + softWrap: false, style: TextStyle( color: Color(0xFF333333), fontSize: rSP(18),