diff --git a/android/app/build.gradle b/android/app/build.gradle index 69a82c20..aa38b250 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,7 +143,7 @@ android { ndk { /// 选择要添加的对应.so 库。 - abiFilters 'armeabi-v7a' + abiFilters 'armeabi-v7a','arm64-v8a','x86' } } debug { diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 9ab21a31..fd256b4b 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -410,26 +410,26 @@ class _CommunityDynamic extends State { ], ), ), - if (widget?.article?.author != widget.userId ?? "") - Expanded( - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - setState(() { - choiceShowBottomSheet(); - }); - }, - child: Container( - alignment: Alignment.center, - child: Text( - "...", - style: TextStyle( - fontSize: 18.sp, - fontWeight: MyFontWeight.medium, - color: Colors.black, - ), - ), - ))), + // if (widget?.article?.author != widget.userId ?? "") + // Expanded( + // child: GestureDetector( + // behavior: HitTestBehavior.opaque, + // onTap: () { + // setState(() { + // choiceShowBottomSheet(); + // }); + // }, + // child: Container( + // alignment: Alignment.center, + // child: Text( + // "...", + // style: TextStyle( + // fontSize: 18.sp, + // fontWeight: MyFontWeight.medium, + // color: Colors.black, + // ), + // ), + // ))), ], ), ], diff --git a/lib/community/report/report_page.dart b/lib/community/report/report_page.dart index 47a6d92b..b4527cf9 100644 --- a/lib/community/report/report_page.dart +++ b/lib/community/report/report_page.dart @@ -54,7 +54,6 @@ class _ReportPage extends State { if (baseData != null && baseData.isSuccess) { Navigator.of(context) .pushNamed('/router/report_success'); - editingController.clear(); } else { SmartDialog.showToast(baseData.msg,alignment: Alignment.center); } @@ -225,7 +224,7 @@ class _ReportPage extends State { }, child: content( - "色情低俗", + editingController.text = "色情低俗", 1 ), ), @@ -239,7 +238,7 @@ class _ReportPage extends State { }, child: content( - "政治宗教", + editingController.text = "政治宗教", 2 ), ), @@ -253,7 +252,7 @@ class _ReportPage extends State { }, child: content( - "广告骚扰", + editingController.text = "广告骚扰", 3 ), ), @@ -267,7 +266,7 @@ class _ReportPage extends State { }, child: content( - "虚假欺骗", + editingController.text = "虚假欺骗", 4 ), ), @@ -281,7 +280,7 @@ class _ReportPage extends State { }, child: content( - "侵权(诽谤、抄袭、冒用)", + editingController.text = "侵权(诽谤、抄袭、冒用)", 5 ), ), @@ -295,7 +294,7 @@ class _ReportPage extends State { }, child: content( - "不良封面/标题", + editingController.text ="不良封面/标题", 6 ), ), @@ -309,7 +308,7 @@ class _ReportPage extends State { }, child: content( - "赌博诈骗", + editingController.text = "赌博诈骗", 7 ), ), diff --git a/lib/retrofit/data/coupon.dart b/lib/retrofit/data/coupon.dart index b8aef9eb..8da93e46 100644 --- a/lib/retrofit/data/coupon.dart +++ b/lib/retrofit/data/coupon.dart @@ -21,6 +21,7 @@ class Coupon { String useEndTime; String promotionId; bool centreDisplay; + bool allProduct; String tenantCode; String tenantName; int isDelete; @@ -52,6 +53,7 @@ class Coupon { ..useEndTime = json['useEndTime'] as String ..promotionId = json['promotionId'] as String ..centreDisplay = json['centreDisplay'] as bool + ..allProduct = json['allProduct'] as bool ..tenantCode = json['tenantCode'] as String ..tenantName = json['tenantName'] as String ..isDelete = json['isDelete'] as int @@ -84,6 +86,7 @@ class Coupon { 'useEndTime': this.useEndTime, 'promotionId': this.promotionId, 'centreDisplay': this.centreDisplay, + 'allProduct' : this.allProduct, 'tenantCode': this.tenantCode, 'tenantName': this.tenantName, 'isDelete': this.isDelete, diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index afc6e94c..1f16bb3a 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -120,7 +120,8 @@ class NewCouponWidget extends StatelessWidget { children: [ Visibility( child: Text( - S.of(context).quanchangtongyong, + // S.of(context).quanchangtongyong, + (coupon?.allProduct ?? false) ? S.of(context).quanchangtongyong :"", style: TextStyle( color: Color(0xFF353535), fontSize: 12.sp,