Commit 0f6b9210384c8de5078b86822efca2956ed87ded

Authored by wdn127929
1 parent 69938cb6

预订安排状态栏颜色统一修改

@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "210" 14 +def flutterVersionCode = "211"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '210' 16 + flutterVersionCode = '211'
17 } 17 }
18 18
19 -def flutterVersionName = "2.1.0" 19 +def flutterVersionName = "2.1.1"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.1.0' 21 + flutterVersionName = '2.1.1'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -186,6 +186,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -186,6 +186,7 @@ class InvicationPageState extends State<InvicationPage> {
186 186
187 _goBaseInfoPage() async { 187 _goBaseInfoPage() async {
188 bool needRefresh = await NavigatorUtil.goBaseInfoPage(context); 188 bool needRefresh = await NavigatorUtil.goBaseInfoPage(context);
  189 + Utils.changeStatusColor(color: Colors.transparent);
189 if (needRefresh != null && needRefresh) { 190 if (needRefresh != null && needRefresh) {
190 //刷新页面数据 191 //刷新页面数据
191 _getCustomerActivityBaseinfo(); 192 _getCustomerActivityBaseinfo();
@@ -221,11 +222,22 @@ class InvicationPageState extends State<InvicationPage> { @@ -221,11 +222,22 @@ class InvicationPageState extends State<InvicationPage> {
221 ); 222 );
222 return child; 223 return child;
223 }); 224 });
224 - Utils.setBarStatus(true, color: Colors.white); 225 + // Utils.setBarStatus(true, color: Colors.white);
225 } 226 }
226 227
227 ///浏览照片 228 ///浏览照片
228 /// 229 ///
  230 + void onTapDown(BuildContext context, TapDownDetails details) {
  231 + final RenderBox box = context.findRenderObject();
  232 + final Offset localOffset = box.globalToLocal(details.globalPosition);
  233 + final RenderBox containerBox = key.currentContext.findRenderObject();
  234 + final Offset containerOffset = containerBox.localToGlobal(localOffset);
  235 + final onTap = containerBox.paintBounds.contains(containerOffset);
  236 + if (onTap) {
  237 + _seePhoto();
  238 + }
  239 + }
  240 +
229 _seePhoto() { 241 _seePhoto() {
230 List<String> temp = []; 242 List<String> temp = [];
231 if (_baseIndoProvider.photoList.length > 0) { 243 if (_baseIndoProvider.photoList.length > 0) {
@@ -240,6 +252,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -240,6 +252,7 @@ class InvicationPageState extends State<InvicationPage> {
240 252
241 @override 253 @override
242 Widget build(BuildContext context) { 254 Widget build(BuildContext context) {
  255 + // Utils.changeStatusColor(color: Colors.transparent);
243 // TODO: implement build 256 // TODO: implement build
244 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); 257 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
245 couponProvider = Provider.of<CouponProvider>(context, listen: true); 258 couponProvider = Provider.of<CouponProvider>(context, listen: true);
@@ -533,9 +546,9 @@ class InvicationPageState extends State<InvicationPage> { @@ -533,9 +546,9 @@ class InvicationPageState extends State<InvicationPage> {
533 ), 546 ),
534 VEmptyView(28), 547 VEmptyView(28),
535 GestureDetector( 548 GestureDetector(
536 - onTap: () {  
537 - _seePhoto();  
538 - }, 549 + onTapDown:
  550 + (TapDownDetails details) =>
  551 + onTapDown(context, details),
539 child: Container( 552 child: Container(
540 child: Stack( 553 child: Stack(
541 alignment: Alignment.bottomCenter, 554 alignment: Alignment.bottomCenter,
@@ -267,11 +267,16 @@ class _BaseInfoPageState extends State<BaseInfoPage> { @@ -267,11 +267,16 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
267 qiniuUrl = _uploadImageProvider.erweima.qiniuUrl; 267 qiniuUrl = _uploadImageProvider.erweima.qiniuUrl;
268 } 268 }
269 269
270 - if (qiniuUrl != null) { 270 + if (qiniuUrl != null && qiniuUrl != '') {
271 tempList.add(qiniuUrl); 271 tempList.add(qiniuUrl);
272 272
273 ///没有上传完成的不可以点击 273 ///没有上传完成的不可以点击
274 _showPhotoView(context, 0, tempList); 274 _showPhotoView(context, 0, tempList);
  275 + } else {
  276 + Utils.getPickPermission(context, () {
  277 + _getFromPictureOrCamera(
  278 + title, model, ImageSource.gallery);
  279 + }, PermissionGroup.photos);
275 } 280 }
276 }, 281 },
277 child: ClipRRect( 282 child: ClipRRect(