fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into dev

master
w-R 3 years ago
parent
afec80d208 58437ca219
commit
245592a7f2
25 changed files with 284 additions and 230 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      android/app/build.gradle
  2. 2
      android/app/src/main/assets/data/dcloud_control.xml
  3. 5
      android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt
  4. 1
      lib/generated/intl/messages_en.dart
  5. 1
      lib/generated/intl/messages_zh_CN.dart
  6. 1
      lib/generated/intl/messages_zh_Hans_CN.dart
  7. 1
      lib/generated/intl/messages_zh_Hant_CN.dart
  8. 1
      lib/generated/intl/messages_zh_TW.dart
  9. 10
      lib/generated/l10n.dart
  10. 1
      lib/l10n/intl_en.arb
  11. 1
      lib/l10n/intl_zh_CN.arb
  12. 1
      lib/l10n/intl_zh_Hans_CN.arb
  13. 1
      lib/l10n/intl_zh_Hant_CN.arb
  14. 1
      lib/l10n/intl_zh_TW.arb
  15. 18
      lib/login/login_page.dart
  16. 5
      lib/main.dart
  17. 25
      lib/mine/roll_center_page.dart
  18. 24
      lib/order/order_detail_page.dart
  19. 1
      lib/setting/setting_page.dart
  20. 24
      lib/union/union_view/store_info.dart
  21. 7
      lib/view_widget/mine_vip_view.dart
  22. 6
      lib/web/web_page.dart
  23. 71
      lib/web/web_view/comment_list.dart
  24. 6
      lib/web/web_view/input_comment.dart
  25. 42
      lib/web/web_view/web_content.dart

2
android/app/build.gradle
Unescape View File

@ -190,6 +190,8 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.12.0'
implementation 'com.alibaba:fastjson:1.2.54'
implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release'
implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
// HMS Core Push 模块依赖包
implementation 'com.huawei.hms:push:5.3.0.304'

2
android/app/src/main/assets/data/dcloud_control.xml
Unescape View File

@ -1,4 +1,4 @@
<hbuilder version="1.9.9.80110" debug="false" syncDebug ="false">
<hbuilder version="1.9.9.80110" debug="false" syncDebug="true">
<apps>
<app appid="__UNI__ACD00DA" appver="1.0"/>
<app appid="__UNI__E60E056" appver="1.0"/>

5
android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt
Unescape View File

@ -24,7 +24,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
/// This local reference serves to register the plugin with the Flutter Engine and unregister it
/// when the Flutter Engine is detached from the Activity
private lateinit var channel : MethodChannel
private lateinit var context : Context;
private lateinit var context : Context
override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
context = flutterPluginBinding.applicationContext;
@ -44,7 +44,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
.setMenuDefFontColor("#000000")
.setMenuDefFontWeight("normal")
.setMenuActionSheetItems(sheetItems)
.setEnableBackground(true)
.setEnableBackground(false) //后台运行
.build()
DCUniMPSDK.getInstance().initialize(context, config) {
result.success(it)
@ -60,6 +60,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
}
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack {
Logger.e("用户点击了退出 it: $it")
DCUniMPSDK.getInstance().closeCurrentApp()
}
}
} else if (call.method == "isInitialize") {

1
lib/generated/intl/messages_en.dart
Unescape View File

@ -214,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息～"),
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),

1
lib/generated/intl/messages_zh_CN.dart
Unescape View File

@ -213,6 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息～"),
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),

1
lib/generated/intl/messages_zh_Hans_CN.dart
Unescape View File

@ -213,6 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息～"),
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),

1
lib/generated/intl/messages_zh_Hant_CN.dart
Unescape View File

@ -213,6 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("還沒有消息～"),
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"),

1
lib/generated/intl/messages_zh_TW.dart
Unescape View File

@ -213,6 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("還沒有消息～"),
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"),

10
lib/generated/l10n.dart
Unescape View File

@ -4955,6 +4955,16 @@ class S {
);
}
/// `还没有优惠券可以领取~`
String get haimeiyouyouhuiquankeyilingqu {
return Intl.message(
'还没有优惠券可以领取~',
name: 'haimeiyouyouhuiquankeyilingqu',
desc: '',
args: [],
);
}
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(

1
lib/l10n/intl_en.arb
Unescape View File

@ -512,6 +512,7 @@
"yaoqingrenshoujihao_": "邀请人手机号:{shoujihao}",
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",

1
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -514,6 +514,7 @@
"yaoqingrenshoujihao_": "邀请人手机号:{shoujihao}",
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",

1
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

@ -514,6 +514,7 @@
"yaoqingrenshoujihao_": "邀请人手机号:{shoujihao}",
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",

1
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

@ -507,6 +507,7 @@
"yaoqingrenshoujihao_": "邀请人手機號:{shoujihao}",
"saomashibieguanzhugongzonghao": "掃碼識別，關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",

1
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -506,6 +506,7 @@
"yaoqingrenshoujihao_": "邀请人手機號:{shoujihao}",
"saomashibieguanzhugongzonghao": "掃碼識別，關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",

18
lib/login/login_page.dart
Unescape View File

@ -85,11 +85,12 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Image image;
buildImageInfo(BuildContext context) async {
image = Image.asset("assets/image/laoban.png");
double screenWidth = MediaQuery.of(this.context).size.width;
image.image
.resolve(ImageConfiguration())
.addListener(ImageStreamListener((ImageInfo info, bool _) {
double width = info.image.width.toDouble();
double screenWidth = 375;
if (!mounted) return;
if ((width / screenWidth) < rota) {
rota = (screenWidth * 1.04) / width;
}
@ -98,22 +99,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
}));
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
}
@override
void initState() {
super.initState();
isLogin();
try {
buildImageInfo(this.context);
} catch(ex) {}
}
initController() {
@ -390,6 +380,10 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
@override
Widget build(BuildContext context) {
try {
buildImageInfo(this.context);
} catch(ex) {}
if (animatedContainer != null && !animatedContainer.isAnimating) {
animatedContainer.forward();
}

5
lib/main.dart
Unescape View File

@ -110,8 +110,9 @@ initSdk() async {
if (Platform.isAndroid) {
XgAndroidApi androidApi = xgFlutterPlugin.getXgAndroidApi();
//小米
// androidApi.setMiPushAppId(appId:"APP_ID");
// androidApi.setMiPushAppKey(appKey: "APPKEY");
androidApi.setMiPushAppId(appId:"2882303761520050452");
androidApi.setMiPushAppKey(appKey: "5582005091452");
androidApi.enableOtherPush();
androidApi.regPush();
}

25
lib/mine/roll_center_page.dart
Unescape View File

@ -11,6 +11,7 @@ import 'package:huixiang/view_widget/item_title.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:huixiang/view_widget/new_coupon_widget.dart';
import 'package:huixiang/view_widget/no_data_view.dart';
import 'package:huixiang/view_widget/receive_success.dart';
import 'package:huixiang/view_widget/selector_store_dialog.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
@ -34,8 +35,11 @@ class _RollCenterPage extends State<RollCenterPage> {
super.initState();
SharedPreferences.getInstance().then((value) => {
apiService = ApiService(Dio(),
context: context, token: value.getString('token')),
apiService = ApiService(
Dio(),
context: context,
token: value.getString('token'),
),
queryCoupon(),
});
_refreshController = RefreshController(initialRefresh: false);
@ -114,7 +118,8 @@ class _RollCenterPage extends State<RollCenterPage> {
onRefresh: refreshCoupon,
onLoading: queryCoupon,
physics: BouncingScrollPhysics(),
child: ListView.builder(
child: (coupons != null && coupons.length > 0)
? ListView.builder(
itemBuilder: (context, position) {
return GestureDetector(
child: NewCouponWidget(
@ -136,7 +141,7 @@ class _RollCenterPage extends State<RollCenterPage> {
}
},
() {
setState(() {
setState((){
coupons[position].isEx = !coupons[position].isEx;
});
},
@ -144,10 +149,15 @@ class _RollCenterPage extends State<RollCenterPage> {
),
);
},
itemCount: coupons != null ? coupons.length : 0,
itemCount: (coupons != null && coupons.length > 0) ? coupons.length : 0,
)
: NoDataView(
isShowBtn: false,
text: S.of(context).haimeiyouyouhuiquankeyilingqu,
fontSize: 16.sp,
),
),
),
)
],
),
),
@ -168,7 +178,8 @@ class _RollCenterPage extends State<RollCenterPage> {
backgroundColor: Colors.transparent,
builder: (context) {
return SelectorStoreWidget(storeList);
});
},
);
}
showAlertDialog() {

24
lib/order/order_detail_page.dart
Unescape View File

@ -36,8 +36,11 @@ class _OrderDetailPage extends State<OrderDetailPage> {
super.initState();
SharedPreferences.getInstance().then((value) {
apiService =
ApiService(Dio(), context: context, token: value.getString("token"));
apiService = ApiService(
Dio(),
context: context,
token: value.getString("token"),
);
queryDetails();
});
}
@ -62,11 +65,11 @@ class _OrderDetailPage extends State<OrderDetailPage> {
isTakeOut = orderInfo.isTakeOut;
refundStatus = orderInfo.refundStatus;
// storeType = orderInfo.storeVO.posType.code;
print("refund_status: $refundStatus");
print("payStatus: $payStatus");
print("orderStatus: $orderStatus");
print("sendStatus: $sendStatus");
print("isTakeOut: $isTakeOut");
print("order refund_status: $refundStatus");
print("order payStatus: $payStatus");
print("order orderStatus: $orderStatus");
print("order sendStatus: $sendStatus");
print("order isTakeOut: $isTakeOut");
if (mounted)
setState(() {
statusTitle();
@ -470,7 +473,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
return AlertDialog(
content: Container(
width: MediaQuery.of(context).size.width - 84.w,
height: 120.h,
height: 140.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -528,12 +531,13 @@ class _OrderDetailPage extends State<OrderDetailPage> {
flex: 1,
),
],
)
),
],
),
),
);
});
},
);
}
Widget paySelector() {

1
lib/setting/setting_page.dart
Unescape View File

@ -190,6 +190,7 @@ class _SettingPage extends State<SettingPage> {
if (miniAppids != null && miniAppids.length > 0) {
miniAppids.forEach((element) async {
print("appid: $element");
await Min.closeCurrentApp();
String path = await Min.getAppBasePath(element);
AppUtils.deleteDirectory(Directory(path));
String filePath = "";

24
lib/union/union_view/store_info.dart
Unescape View File

@ -66,35 +66,37 @@ class _StoreInfos extends State<StoreInfos> {
children: [
Row(
children: [
Text(
Expanded(
child: Container(
alignment:
Alignment.centerLeft,
child: Text(
widget.storeInfo != null
? widget.storeInfo.storeName
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: MyFontWeight.medium,
),
),
Expanded(
child: Container(
alignment:
Alignment.centerRight,
child: Text(
),
),
Text(
S.of(context).ren(
widget.storeInfo != null
? widget.storeInfo
.perCapitaConsumption
: "",
),
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF353535),
),
),
),
),
],
),
Text(
@ -117,10 +119,8 @@ class _StoreInfos extends State<StoreInfos> {
),
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Text(

7
lib/view_widget/mine_vip_view.dart
Unescape View File

@ -312,9 +312,10 @@ class MineVipView extends StatelessWidget {
});
}
},
child: (tag == null || tag == "")
? widget
: Hero(tag: tag, child: widget),
child: widget,
//(tag == null || tag == "")
// ? widget
// : Hero(tag: tag, child: widget)
);
}
}

6
lib/web/web_page.dart
Unescape View File

@ -249,7 +249,9 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
WebHeader(widget.arguments, activity, article,16),
/// 富文本的内容
WebContent(activity, article),
WebContent(activity, article, (){
setState(() {});
}),
/// 富文本的评论
CommentList(
@ -318,7 +320,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
Offset first = firstRenderBox.localToGlobal(Offset.zero);
scrollController.animateTo(first.dy + scrollController.offset -
(kToolbarHeight + MediaQuery.of(context).padding.top),
duration: Duration(milliseconds: 1000),
duration: Duration(milliseconds: 300),
curve: Curves.easeIn);
}

71
lib/web/web_view/comment_list.dart
Unescape View File

@ -54,7 +54,7 @@ class _CommentList extends State<CommentList> {
LoginTipsDialog().show(context);
return;
}
BaseData baseData = await apiService.commentLike(id).catchError((error){});
BaseData baseData = await apiService.commentLike(id).catchError((error) {});
if (baseData != null && baseData.isSuccess) {
memberList.forEach((element) {
if (element.id == id) {
@ -136,15 +136,15 @@ class _CommentList extends State<CommentList> {
showPressMenu(memberList[position].createUser,
memberList[position]);
},
child: commentItem(memberList[position], position,
memberList.length),
child: commentItem(
memberList[position], position, memberList.length),
),
);
},
),
if (memberList != null && memberList.length > 0)
Container(
height: 63.h,
height: commentHeight,
decoration: BoxDecoration(
color: Color(0xFFF2F2F2),
boxShadow: [
@ -156,7 +156,8 @@ class _CommentList extends State<CommentList> {
),
],
),
alignment: Alignment.center,
alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: 22.h),
child: Text(
S.of(context).yixiansquanbupinglun,
style: TextStyle(
@ -168,8 +169,13 @@ class _CommentList extends State<CommentList> {
if (memberList == null || memberList.length == 0)
Container(
width: double.infinity,
height: 80.h,
alignment: Alignment.center,
height: MediaQuery.of(context).size.height -
kToolbarHeight -
MediaQuery.of(context).padding.top -
160.h,
alignment: Alignment.topCenter,
color: Color(0xFFF2F2F2),
padding: EdgeInsets.only(top: 22.h),
child: Text(
S.of(context).zanwupinglun,
style: TextStyle(
@ -182,30 +188,41 @@ class _CommentList extends State<CommentList> {
],
),
),
SizedBox(
height: 12.h,
),
],
);
}
double commentHeight = 60.h;
contentHeight() {
double contentHeight = MediaQuery.of(context).size.height -
kToolbarHeight -
MediaQuery.of(context).padding.top -
160.h;
if ((contentHeight - 60.h) > (128.h * memberList.length)) {
commentHeight = contentHeight - (128.h * memberList.length);
}
}
//评论列表
queryMemberCommentList() async {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
if (apiService == null)
apiService = ApiService(Dio(),
context: context, token: sharedPreferences.getString("token"));
BaseData<PageInfo<MemberCommentList>> baseData =
await apiService.memberCommentList({
apiService = ApiService(
Dio(),
context: context,
token: sharedPreferences.getString("token"),
);
BaseData<PageInfo<MemberCommentList>> baseData = await apiService.memberCommentList({
"pageNum": 1,
"pageSize": 100,
"relationalId":
widget.arguments["activityId"] ?? widget.arguments["articleId"],
"relationalId": widget.arguments["activityId"] ?? widget.arguments["articleId"],
"relationalType": 1,
}).catchError((error) {});
if (baseData != null && baseData.isSuccess) {
commentTotal = baseData.data.size;
memberList = baseData.data.list;
contentHeight();
setState(() {});
}
}
@ -216,24 +233,6 @@ class _CommentList extends State<CommentList> {
return;
}
SharedPreferences.getInstance().then((value) {
// showModalBottomSheet(
// context: context,
// backgroundColor: Colors.transparent,
// builder: (context) {
// return CommentMenu(
// (type) {
// print("click: $type");
// if (type == "huifu") {
// widget.reply(memberComment);
// } else if (type == "shanchu") {
// widget.delCommentTips();
// }
// },
// isSelf: userId == value.getString("userId"),
// );
// },
// );
SmartDialog.show(
widget: CommentMenu(
(type) {
@ -369,8 +368,8 @@ class _CommentList extends State<CommentList> {
),
Container(
padding: EdgeInsets.only(
left: 68,
right: 16,
left: 68.w,
right: 16.w,
top: 16.h,
bottom: 16.h,
),

6
lib/web/web_view/input_comment.dart
Unescape View File

@ -64,9 +64,7 @@ class _InputComment extends State<InputComment> {
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0),
),
child: Column(
children: [
Container(
child: Container(
margin: EdgeInsets.symmetric(horizontal: 4.w),
alignment: Alignment.topLeft,
child: TextField(
@ -84,8 +82,6 @@ class _InputComment extends State<InputComment> {
),
),
),
],
),
),
),
if (widget.isKeyBoardShow)

42
lib/web/web_view/web_content.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:chewie/chewie.dart';
import 'package:flutter/services.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_html/image_render.dart';
import 'package:chewie/src/chewie_progress_colors.dart' as chewie;
@ -15,8 +16,9 @@ class WebContent extends StatefulWidget {
final Activity activity;
final Article article;
final Function exitFull;
WebContent(this.activity, this.article);
WebContent(this.activity, this.article, this.exitFull);
@override
State<StatefulWidget> createState() {
@ -107,15 +109,7 @@ class _WebContent extends State<WebContent> {
Widget videoWidget(double width, double height, src, sandboxMode) {
print("src : $src");
return MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaleFactor: 0.9,
),
child: Container(
width: MediaQuery.of(context).size.width - 17,
height: (MediaQuery.of(context).size.width) / (width / height),
child: chewies = Chewie(
controller: chewieAudioController = ChewieController(
chewieAudioController = ChewieController(
videoPlayerController: videoPlayerController =
VideoPlayerController.network(
src,
@ -126,6 +120,11 @@ class _WebContent extends State<WebContent> {
//自动播放
looping: false,
//循环播放
allowFullScreen: true,
// systemOverlaysAfterFullScreen: [],
// systemOverlaysOnEnterFullScreen: [],
// deviceOrientationsAfterFullScreen: [],
// deviceOrientationsOnEnterFullScreen: [],
// 拖动条样式颜色
materialProgressColors: chewie.ChewieProgressColors(
playedColor: Colors.white,
@ -134,12 +133,35 @@ class _WebContent extends State<WebContent> {
bufferedColor: Colors.transparent,
),
autoInitialize: true,
);
chewieAudioController.addListener(_fullScreenListener);
return MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaleFactor: 0.9,
),
child: Container(
width: MediaQuery.of(context).size.width - 17,
height: (MediaQuery.of(context).size.width) / (width / height),
child: chewies = Chewie(
controller: chewieAudioController,
),
),
);
}
Future<void> _fullScreenListener() async {
print("object: isPlaying: ${videoPlayerController.value.isPlaying}");
print("object: isFullScreen: ${chewieAudioController.isFullScreen}");
if (!chewieAudioController.isFullScreen) {
Future.delayed(Duration(seconds: 1), () {
widget.exitFull();
});
}
}
Widget audioWidget(showControls, loop, autoplay, src, width) {
return Container(
width: width,

Write Preview
Loading…
Cancel
Save