From c0d3d958ea7c04a2b0c187f7e4c85c7624131e96 Mon Sep 17 00:00:00 2001 From: "2846432477@qq.com" <2846432477@qq.com> Date: Mon, 28 Dec 2020 18:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=80=E4=B8=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81,=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=B4=AF=E8=AE=A1=E6=94=B6=E7=9B=8A=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shelved.patch | 18 ++++++++++++++++++ ..._2020_12_28__18_04__Default_Changelist_.xml | 4 ++++ .../mine/mine_data/mine_data_widget.dart | 3 ++- pubspec.yaml | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch new file mode 100644 index 0000000..18bc975 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch @@ -0,0 +1,18 @@ +Index: pubspec.yaml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>name: zhiying_base_widget\ndescription: A new Flutter plugin.\nversion: 0.0.1\nauthor:\nhomepage:\n\nenvironment:\n sdk: \">=2.8.0 <3.0.0\"\n\ndependencies:\n flutter:\n sdk: flutter\n\n flutter_swiper: ^1.1.6\n bloc: ^4.0.0\n event_bus: ^1.1.1\n pull_to_refresh: ^1.6.1\n flutter_cupertino_date_picker: ^1.0.26+2\n image_picker: ^0.6.7+3\n tab_indicator_styler: 1.0.0\n connectivity: ^0.4.9+3\n save_image: ^1.0.1\n image_cropper:\n git:\n url: 'http://192.168.0.138:3000/FnuoOS_Flutter_Components/Image_Cropper.git'\n ref: '1.2.3+1'\n # 系统分享\n share_extend: ^1.1.9\n flutter_native_image: ^0.0.5\n #字符检测\n string_validator: 0.1.4\n # 列表滑动删除\n flutter_slidable: 0.5.7\n # image_gallery_saver: ^1.6.0\n\n permission_handler:\n git:\n ref: 0.0.1\n url: http://192.168.0.138:3000/FnuoOS_Flutter_Components/permission_handler.git\n\n\n intl: 0.16.1\n\n loading_indicator: ^1.2.0\n\ndev_dependencies:\n flutter_test:\n sdk: flutter\n\n zhiying_comm:\n path: ../zhiying_comm\n\n# For information on the generic Dart part of this file, see the\n# following page: https://dart.dev/tools/pub/pubspec\n\n# The following section is specific to Flutter.\nflutter:\n # This section identifies this Flutter project as a plugin project.\n # The androidPackage and pluginClass identifiers should not ordinarily\n # be modified. They are used by the tooling to maintain consistency when\n # adding or updating assets for this project.\n plugin:\n androidPackage: cn.zhios.zhiying_base_widget\n pluginClass: ZhiyingBaseWidgetPlugin\n\n # To add assets to your plugin package, add an assets section, like this:\n assets:\n - assets/images/launch_image/launch_image.png\n - assets/images/empty/empty.png\n - assets/images/qrcode/default_qrcode.png\n #\n # For details regarding assets in packages, see\n # https://flutter.dev/assets-and-images/#from-packages\n #\n # An image asset can refer to one or more resolution-specific \"variants\", see\n # https://flutter.dev/assets-and-images/#resolution-aware.\n\n # To add custom fonts to your plugin package, add a fonts section here,\n # in this \"flutter\" section. Each entry in this list should have a\n # \"family\" key with the font family name, and a \"fonts\" key with a\n # list giving the asset and other descriptors for the font. For\n # example:\n fonts:\n - family: Din-Bold\n fonts:\n - asset: assets/fonts/DIN-Bold.otf\n - family: Din-Medium\n fonts:\n - asset: assets/fonts/DIN-Medium.otf\n - family: Din\n fonts:\n - asset: assets/fonts/DIN-Regular.otf\n\n #\n # For details regarding fonts in packages, see\n # https://flutter.dev/custom-fonts/#from-packages\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pubspec.yaml (revision cdaa6fadd2854f59327db04674e2b070713b6b5e) ++++ pubspec.yaml (date 1608880072000) +@@ -9,7 +9,7 @@ + + dependencies: + flutter: +- sdk: flutter ++ sdk: flutt + + flutter_swiper: ^1.1.6 + bloc: ^4.0.0 diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml new file mode 100644 index 0000000..c1d1747 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/lib/widgets/mine/mine_data/mine_data_widget.dart b/lib/widgets/mine/mine_data/mine_data_widget.dart index f8e36db..62aacbb 100644 --- a/lib/widgets/mine/mine_data/mine_data_widget.dart +++ b/lib/widgets/mine/mine_data/mine_data_widget.dart @@ -40,6 +40,7 @@ class MineDataWidget extends StatelessWidget { } Widget _createTop(BuildContext context) { + String isIosReview = await SharedPreferencesUtil.getStringValue(GlobalConfig.IS_IOS_REVIEW, defaultVal: '0'); return Container( width: double.infinity, height: 62, @@ -73,7 +74,7 @@ class MineDataWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - '累计收益', + isIosReview=='1' ? '' : '累计收益', style: TextStyle( fontSize: 11, fontWeight: FontWeight.w600, diff --git a/pubspec.yaml b/pubspec.yaml index 7f9d22c..368f5cc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: - sdk: flutter + sdk: flutt flutter_swiper: ^1.1.6 bloc: ^4.0.0