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

Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

new_revision_app
wurong 2 years ago
parent
af8a18b6dc 521159c43c
commit
6ef29fad43
7 changed files with 177 additions and 181 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. 27
      ios/Podfile.lock
  2. 18
      ios/Runner.xcodeproj/project.pbxproj
  3. 4
      ios/Runner/Info.plist
  4. 2
      lib/login/new_login_page.dart
  5. 2
      lib/utils/status_utils.dart
  6. 2
      lib/view_widget/new_coupon_widget.dart
  7. 303
      pubspec.lock

27
ios/Podfile.lock
Unescape View File

@ -50,8 +50,7 @@ PODS:
- image_pickers (0.0.1):
- AFNetworking
- Flutter
- SDWebImage
- ZLPhotoBrowser
- ZLPhotoBrowser-objc (= 1.0.4)
- mob_sharesdk_spec2 (0.0.1):
- AEINFoundation
- mob_sharesdk_spec2/ShareSDK (= 0.0.1)
@ -179,8 +178,9 @@ PODS:
- SDWebImage (5.13.4):
- SDWebImage/Core (= 5.13.4)
- SDWebImage/Core (5.13.4)
- shared_preferences_ios (0.0.1):
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- sharesdk_plugin (1.1.4):
- Flutter
- mob_sharesdk_spec2
@ -237,9 +237,8 @@ PODS:
- Flutter
- webview_flutter (0.0.1):
- Flutter
- ZLPhotoBrowser (4.3.7):
- ZLPhotoBrowser/Core (= 4.3.7)
- ZLPhotoBrowser/Core (4.3.7)
- ZLPhotoBrowser-objc (1.0.4):
- SDWebImage
DEPENDENCIES:
- emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`)
@ -256,7 +255,7 @@ DEPENDENCIES:
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- scan (from `.symlinks/plugins/scan/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`)
- SSZipArchive (~> 2.4.2)
- thumbnails (from `.symlinks/plugins/thumbnails/ios`)
@ -278,7 +277,7 @@ SPEC REPOS:
- SDWebImage
- SSZipArchive
- TPNS-iOS
- ZLPhotoBrowser
- ZLPhotoBrowser-objc
EXTERNAL SOURCES:
emoji_picker_flutter:
@ -309,8 +308,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/permission_handler/ios"
scan:
:path: ".symlinks/plugins/scan/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
sharesdk_plugin:
:path: ".symlinks/plugins/sharesdk_plugin/ios"
thumbnails:
@ -341,7 +340,7 @@ SPEC CHECKSUMS:
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492
image_pickers: 075764ed041c5e3089fcd4d040384ecdb23840e0
image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2
number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
OpenWeChatSDK: 8fb6c3c7ce9a57f37d001060282de1f138d09940
@ -350,7 +349,7 @@ SPEC CHECKSUMS:
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
sharesdk_plugin: d9c8e928116aba323b21da64b4437ed766ee843e
SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
@ -358,10 +357,10 @@ SPEC CHECKSUMS:
TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
ZLPhotoBrowser: f571bdaec6d0b64ae94a29787e4c7cbd8900d10f
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 9a26c1c4037e42be4afc95d70f8bd02a4b989a1c

18
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -596,7 +596,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -667,7 +667,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.6;
MARKETING_VERSION = 3.2.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -747,7 +747,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
"MTL_ENABLE_DEBUG_INFO[arch=*]" = YES;
ONLY_ACTIVE_ARCH = YES;
@ -798,7 +798,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -869,7 +869,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.6;
MARKETING_VERSION = 3.2.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -962,7 +962,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.6;
MARKETING_VERSION = 3.2.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",

4
ios/Runner/Info.plist
Unescape View File

@ -173,5 +173,9 @@
<string>https://hx.lotus-wallet.com/app/</string>
<key>io.flutter.embedded_views_preview</key>
<string>YES</string>
<key>UIBackgroundModes</key>
<array>
<string>location</string>
</array>
</dict>
</plist>

2
lib/login/new_login_page.dart
Unescape View File

@ -416,7 +416,7 @@ class _NewLoginPage extends State<NewLoginPage> {
Container(
height: 30.h,
width: MediaQuery.of(context).size.width - 100.w,
margin: EdgeInsets.only(bottom:5.h),
margin: EdgeInsets.only(bottom:10.h),
child: TextField(
style: TextStyle(
height: 1.h,

2
lib/utils/status_utils.dart
Unescape View File

@ -174,7 +174,7 @@ class StatusUtils {
Expanded(
flex: 1,
child: Container(
margin: EdgeInsets.only(left: 37.w),
margin: EdgeInsets.only(left: 20.w),
alignment: Alignment.centerLeft,
child: Text(
S.of(context).qudanhao(dayFlowCode),

2
lib/view_widget/new_coupon_widget.dart
Unescape View File

@ -88,7 +88,7 @@ class NewCouponWidget extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 15.sp,
height: 1.2.h,
height: 1.3.h,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF0D0D0D),
),

303
pubspec.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save