diff --git a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java index 6256890..d344ac2 100644 --- a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java +++ b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java @@ -158,9 +158,9 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN public Map getSetting() { Map map = new HashMap(); ///测试 -// map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80 http://inapi.izhyin.cn/ -// map.put("master_id", "123456"); -// map.put("secret_key", "123456"); + map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80 http://inapi.izhyin.cn/ + map.put("master_id", "123456"); + map.put("secret_key", "123456"); ///正式 // map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689 @@ -174,9 +174,9 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN // map.put("token", "123465"); - map.put("domain", "http://api.shengder.com/");//"http://120.76.175.204:8989");http://47.114.51.254:80 http://inapi.izhyin.cn/ - map.put("master_id", "98130614"); - map.put("secret_key", "123456"); +// map.put("domain", "http://api.shengder.com/");//"http://120.76.175.204:8989");http://47.114.51.254:80 http://inapi.izhyin.cn/ +// map.put("master_id", "98130614"); +// map.put("secret_key", "123456"); return map; } diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d1b60b2..2d25138 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -25,7 +25,7 @@ PODS: - securityGuard (= 5.4.191) - UTDID (= 1.1.0.16) - WindVane (= 8.5.0.46-bc11) - - flutter_kaduofen (0.0.1): + - flutter_clipboard_plugin (0.0.1): - Flutter - flutter_native_image (0.0.1): - Flutter @@ -50,8 +50,6 @@ PODS: - TOCropViewController (~> 2.5.2) - image_picker (0.0.1): - Flutter - - imei_plugin (0.0.1): - - Flutter - jdsdk (0.0.1): - Flutter - mob_linksdk_pro (3.3.7): @@ -211,8 +209,6 @@ PODS: - Flutter - zhiying_comm (0.0.1): - Flutter - - zhiying_credit_card (0.0.1): - - Flutter - zhiying_equity_card (0.0.1): - Flutter - zhiying_member_upgrade (0.0.1): @@ -230,7 +226,7 @@ DEPENDENCIES: - device_info (from `.symlinks/plugins/device_info/ios`) - Flutter (from `Flutter`) - flutter_alibc (from `.symlinks/plugins/flutter_alibc/ios`) - - flutter_kaduofen (from `.symlinks/plugins/flutter_kaduofen/ios`) + - flutter_clipboard_plugin (from `.symlinks/plugins/flutter_clipboard_plugin/ios`) - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) - flutter_user_agent (from `.symlinks/plugins/flutter_user_agent/ios`) @@ -240,7 +236,6 @@ DEPENDENCIES: - fluwx (from `.symlinks/plugins/fluwx/ios`) - image_cropper (from `.symlinks/plugins/image_cropper/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) - - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`) - jdsdk (from `.symlinks/plugins/jdsdk/ios`) - moblink (from `.symlinks/plugins/moblink/ios`) - mobpush_plugin (from `.symlinks/plugins/mobpush_plugin/ios`) @@ -275,7 +270,6 @@ DEPENDENCIES: - zhiying_base_widget (from `.symlinks/plugins/zhiying_base_widget/ios`) - zhiying_business_college (from `.symlinks/plugins/zhiying_business_college/ios`) - zhiying_comm (from `.symlinks/plugins/zhiying_comm/ios`) - - zhiying_credit_card (from `.symlinks/plugins/zhiying_credit_card/ios`) - zhiying_equity_card (from `.symlinks/plugins/zhiying_equity_card/ios`) - zhiying_member_upgrade (from `.symlinks/plugins/zhiying_member_upgrade/ios`) - zhiying_new_user_free (from `.symlinks/plugins/zhiying_new_user_free/ios`) @@ -316,8 +310,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_alibc: :path: ".symlinks/plugins/flutter_alibc/ios" - flutter_kaduofen: - :path: ".symlinks/plugins/flutter_kaduofen/ios" + flutter_clipboard_plugin: + :path: ".symlinks/plugins/flutter_clipboard_plugin/ios" flutter_native_image: :path: ".symlinks/plugins/flutter_native_image/ios" flutter_plugin_android_lifecycle: @@ -336,8 +330,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/image_cropper/ios" image_picker: :path: ".symlinks/plugins/image_picker/ios" - imei_plugin: - :path: ".symlinks/plugins/imei_plugin/ios" jdsdk: :path: ".symlinks/plugins/jdsdk/ios" moblink: @@ -406,8 +398,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/zhiying_business_college/ios" zhiying_comm: :path: ".symlinks/plugins/zhiying_comm/ios" - zhiying_credit_card: - :path: ".symlinks/plugins/zhiying_credit_card/ios" zhiying_equity_card: :path: ".symlinks/plugins/zhiying_equity_card/ios" zhiying_member_upgrade: @@ -431,7 +421,7 @@ SPEC CHECKSUMS: device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec flutter_alibc: 0e2a29e7c1de759672d87a260051240d209964b9 - flutter_kaduofen: 12c2c62ef2346a8899796e03c05ad8060002f59f + flutter_clipboard_plugin: b4f4432820ed598732eb18f6daa68a3ef26f711f flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 flutter_user_agent: 27c45d034dc31b80948d29998cea52cd3a7bf936 @@ -442,7 +432,6 @@ SPEC CHECKSUMS: FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a image_cropper: 3c16d7651730ffe85897f5a1c4e2547e6b54989a image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 - imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd jdsdk: 2ca38c7e3a2dfb0f3641425f8fd1e8d20357693f mob_linksdk_pro: 9ad768d8da15c410d51056319f43a76c7cc01347 mob_pushsdk: 9d391d6c12e1bd718d70fd9edcd972af3d6ca663 @@ -489,7 +478,6 @@ SPEC CHECKSUMS: zhiying_base_widget: 00868c0d2723a3a425c18b27204fbc67e3f7e59d zhiying_business_college: dc3ba7fb32aad4db421aa94dbbc1ef712e7d00cd zhiying_comm: 0daef4a480f4f4dbea3e11b615f3264aafea924b - zhiying_credit_card: 1ebff7a1f74683c6d4adc7bf2dc3aa3b83bbf7da zhiying_equity_card: 1afe5c3c8e5317dcebf55159b4087cd0d57e49ff zhiying_member_upgrade: 1207671575ad01ed3336c604e235843a98fa1a0c zhiying_new_user_free: 1640f83c12643475f03fabffcba13f498e555243 diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 39587e2..d3cc285 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -2,8 +2,6 @@ - NSLocationDefaultAccuracyReduced - YES CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -198,12 +196,14 @@ 获取相机权限更换头像或者扫码 NSContactsUsageDescription 获取访问通信录权限添加联系人信息 + NSLocationAlwaysAndWhenInUseUsageDescription + 获取定位权限用于搜索附近的网点和查找附近的油站信息 NSLocationAlwaysUsageDescription 获取定位权限用于搜索附近的网点和查找附近的油站信息 + NSLocationDefaultAccuracyReduced + YES NSLocationWhenInUseUsageDescription 获取定位权限用于搜索附近的网点和查找附近的油站信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 获取定位权限用于搜索附近的网点和查找附近的油站信息 NSMicrophoneUsageDescription 获取访问麦克风权限录制语音或视频 NSPhotoLibraryAddUsageDescription diff --git a/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart b/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart index 815cc42..f52695f 100644 --- a/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart +++ b/lib/dialog/global_dialog/notification_setting_dialog/notification_setting_dialog.dart @@ -240,7 +240,7 @@ class NotificationSettingDialogNew extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - width: 280, + width: 265, padding: EdgeInsets.all(20), // height: 382, decoration: BoxDecoration(