3-group-ios/WallPaper_FSX_Flutter
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改firebase配置

Browse Source
This commit is contained in:
fengshengxiong 2024-05-31 01:34:37 -07:00
parent af8d93a809
commit 4b6121e15e
7 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firebase.json
View File

@ -1 +1 @@
{"flutter":{"platforms":{"android":{"default":{"projectId":"nowwallpaper","appId":"1:318284530945:android:c7dd2abf520a9840250700","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"nowwallpaper","appId":"1:318284530945:ios:754fb4ceebd09514250700","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"nowwallpaper","configurations":{"android":"1:318284530945:android:c7dd2abf520a9840250700","ios":"1:318284530945:ios:754fb4ceebd09514250700"}}}}}} {"flutter":{"platforms":{"android":{"default":{"projectId":"nowwallpaper","appId":"1:318284530945:android:c7dd2abf520a9840250700","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"nowwallpaper","appId":"1:318284530945:ios:7bacbc490f39d820250700","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"nowwallpaper","configurations":{"android":"1:318284530945:android:c7dd2abf520a9840250700","ios":"1:318284530945:ios:7bacbc490f39d820250700"}}}}}}

59
ios/Runner.xcodeproj/project.pbxproj
View File

@ -202,7 +202,7 @@
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
39CCEDF39CF579238AE308F0 /* [CP] Embed Pods Frameworks */, 39CCEDF39CF579238AE308F0 /* [CP] Embed Pods Frameworks */,
405E88F0300BCE9602B4DA07 /* [CP] Copy Pods Resources */, 405E88F0300BCE9602B4DA07 /* [CP] Copy Pods Resources */,
A619BA3878CFD24C03A25DF3 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */, 456CF4E894A8BC296C35D84E /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
); );
buildRules = ( buildRules = (
); );
@ -347,6 +347,24 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
456CF4E894A8BC296C35D84E /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
};
9740EEB61CF901F6004384FC /* Run Script */ = { 9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1; alwaysOutOfDate = 1;
@ -384,24 +402,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
A619BA3878CFD24C03A25DF3 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
@ -511,16 +511,19 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = SXL2QAUF62; DEVELOPMENT_TEAM = T93S37G27F;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.now.wallpaper; PRODUCT_BUNDLE_IDENTIFIER = com.lux.now.wallpaper;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
@ -696,16 +699,19 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = SXL2QAUF62; DEVELOPMENT_TEAM = T93S37G27F;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.now.wallpaper; PRODUCT_BUNDLE_IDENTIFIER = com.lux.now.wallpaper;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
@ -719,16 +725,19 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = SXL2QAUF62; DEVELOPMENT_TEAM = T93S37G27F;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.now.wallpaper; PRODUCT_BUNDLE_IDENTIFIER = com.lux.now.wallpaper;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";

4
ios/Runner/GoogleService-Info.plist
View File

@ -9,7 +9,7 @@
<key>PLIST_VERSION</key> <key>PLIST_VERSION</key>
<string>1</string> <string>1</string>
<key>BUNDLE_ID</key> <key>BUNDLE_ID</key>
<string>com.now.wallpaper</string> <string>com.lux.now.wallpaper</string>
<key>PROJECT_ID</key> <key>PROJECT_ID</key>
<string>nowwallpaper</string> <string>nowwallpaper</string>
<key>STORAGE_BUCKET</key> <key>STORAGE_BUCKET</key>
@ -25,6 +25,6 @@
<key>IS_SIGNIN_ENABLED</key> <key>IS_SIGNIN_ENABLED</key>
<true></true> <true></true>
<key>GOOGLE_APP_ID</key> <key>GOOGLE_APP_ID</key>
<string>1:318284530945:ios:754fb4ceebd09514250700</string> <string>1:318284530945:ios:7bacbc490f39d820250700</string>
</dict> </dict>
</plist> </plist>

12
lib/common/utils/permission_util.dart
View File

@ -27,7 +27,7 @@ class PermissionUtil {
switch (permissionStatus) { switch (permissionStatus) {
// 拒绝状态 // 拒绝状态
case PermissionStatus.denied: case PermissionStatus.denied:
_showFailedDialog(newPermissionList); showFailedDialog(newPermissionList);
return false; return false;
// 允许状态 // 允许状态
case PermissionStatus.granted: case PermissionStatus.granted:
@ -37,7 +37,7 @@ class PermissionUtil {
// 永久拒绝 活动限制 // 永久拒绝 活动限制
case PermissionStatus.restricted: case PermissionStatus.restricted:
case PermissionStatus.permanentlyDenied: case PermissionStatus.permanentlyDenied:
_showFailedDialog(newPermissionList, isPermanentlyDenied: true); showFailedDialog(newPermissionList, isPermanentlyDenied: true);
break; break;
} }
} else { } else {
@ -79,10 +79,10 @@ class PermissionUtil {
// 如果有一个拒绝那么就失败了 // 如果有一个拒绝那么就失败了
} else if (status.isDenied || status2.isDenied) { } else if (status.isDenied || status2.isDenied) {
_showFailedDialog( showFailedDialog(
[Permission.locationWhenInUse, Permission.locationAlways]); [Permission.locationWhenInUse, Permission.locationAlways]);
} else { } else {
_showFailedDialog( showFailedDialog(
[Permission.locationWhenInUse, Permission.locationAlways], [Permission.locationWhenInUse, Permission.locationAlways],
isPermanentlyDenied: true, isPermanentlyDenied: true,
); );
@ -105,7 +105,7 @@ class PermissionUtil {
} }
/// 权限拒绝后弹窗 /// 权限拒绝后弹窗
static _showFailedDialog(List<Permission> permissionList, {bool isPermanentlyDenied = false}) async { static showFailedDialog(List<Permission> permissionList, {bool isPermanentlyDenied = false}) async {
Get.dialog( Get.dialog(
barrierDismissible: false, barrierDismissible: false,
RemindDialog( RemindDialog(
@ -137,7 +137,7 @@ class PermissionUtil {
} }
} }
String explain = ''; String explain = '';
if (failedPermission == Permission.storage) { if (failedPermission == Permission.storage || failedPermission == Permission.photosAddOnly) {
explain = 'To save wallpapers to gallery, we need this permission'; explain = 'To save wallpapers to gallery, we need this permission';
} }
return explain; return explain;

4
lib/firebase_options.dart
View File

@ -59,11 +59,11 @@ class DefaultFirebaseOptions {
static const FirebaseOptions ios = FirebaseOptions( static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyBAVP2-PNvC07OPHepWpCCb6QzVTRk1cMM', apiKey: 'AIzaSyBAVP2-PNvC07OPHepWpCCb6QzVTRk1cMM',
appId: '1:318284530945:ios:754fb4ceebd09514250700', appId: '1:318284530945:ios:7bacbc490f39d820250700',
messagingSenderId: '318284530945', messagingSenderId: '318284530945',
projectId: 'nowwallpaper', projectId: 'nowwallpaper',
storageBucket: 'nowwallpaper.appspot.com', storageBucket: 'nowwallpaper.appspot.com',
iosBundleId: 'com.now.wallpaper', iosBundleId: 'com.lux.now.wallpaper',
); );
} }

5
lib/modules/wallpaper_det/wallpaper_det_controller.dart
View File

@ -74,8 +74,7 @@ class WallpaperDetController extends GetxController {
// Android 10以下版本，需要申请存储权限 // Android 10以下版本，需要申请存储权限
int sdkVersion = await DeviceInfoUtil.getAndroidSystemVersion(); int sdkVersion = await DeviceInfoUtil.getAndroidSystemVersion();
if (sdkVersion < 29) { if (sdkVersion < 29) {
bool status = await PermissionUtil.checkPermission([Permission.storage]); canSave = await PermissionUtil.checkPermission([Permission.storage]);
canSave = status;
} }
} }
if (canSave) { if (canSave) {
@ -147,7 +146,7 @@ class WallpaperDetController extends GetxController {
await imageFile.writeAsBytes(pngBytes); await imageFile.writeAsBytes(pngBytes);
filePath = imagePath; filePath = imagePath;
final result = await ImageGallerySaver.saveImage(pngBytes); final result = await ImageGallerySaver.saveImage(pngBytes, quality: 100);
if (result['isSuccess']) { if (result['isSuccess']) {
toast('Saved to album'); toast('Saved to album');
} else { } else {

2
pubspec.yaml
View File

@ -136,8 +136,6 @@ flutter:
# - images/a_dot_burr.jpeg # - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg # - images/a_dot_ham.jpeg
- assets/images/ - assets/images/
- assets/images/2.0x/
- assets/images/3.0x/
- assets/icon/ - assets/icon/
- assets/json/ - assets/json/