Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta2 #395

Merged
merged 34 commits into from
Nov 8, 2019
Merged

Beta2 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c15e5fd
merge origin
DeckeDeng Jan 17, 2019
ef1bc9c
merge
DeckeDeng Jan 17, 2019
9bf3ec8
add local project futter build
DeckeDeng Jan 18, 2019
cdf2cda
Merge branch 'master' of https://github.com/alibaba/flutter-go
DeckeDeng Jan 18, 2019
5aa33ab
fx
Apr 8, 2019
e33596e
merge
DeckeDeng May 7, 2019
90f4dfe
解决冲突
DeckeDeng May 7, 2019
42f005d
Update README.md
DeckeDeng Jul 15, 2019
e213987
Update README.md
DeckeDeng Jul 15, 2019
a07304f
Update README.md
DeckeDeng Jul 15, 2019
7fcd34e
merge master
Jul 23, 2019
77f57b5
merge master
Jul 23, 2019
1f75d49
d
Aug 1, 2019
37e6557
icon
Aug 13, 2019
40b0c57
test
Nealyang Aug 15, 2019
5cf856d
Merge branch 'beta' of https://github.com/alibaba/flutter-go into beta2
Aug 15, 2019
68d91f2
tag:ios/huwei
Aug 21, 2019
faab944
Merge branch 'beta' of https://github.com/alibaba/flutter-go into beta2
Aug 21, 2019
75ffe70
merge
Nealyang Aug 28, 2019
ef0e421
bugfix
Nealyang Aug 28, 2019
656447e
Merge pull request #329 from Nealyang/beta
Nealyang Aug 28, 2019
9327074
Merge branch 'beta' of https://github.com/alibaba/flutter-go into beta2
Aug 29, 2019
69c97b9
apk
Aug 29, 2019
2524d79
ios 权限描述
Aug 29, 2019
595c1cb
Merge pull request #333 from DeckeDeng/beta2
DeckeDeng Aug 29, 2019
ac01e24
merge master
Sep 19, 2019
b01f517
add
Oct 30, 2019
b2f7b1d
merge master
Oct 30, 2019
4c85919
merge master
Oct 30, 2019
823bc86
回滚
Oct 30, 2019
b2e9744
xx
Oct 30, 2019
1436192
master code
Oct 30, 2019
5714438
ios 发布版本
Oct 31, 2019
083bc96
Merge branch 'master' into beta2
hanxu317317 Nov 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions .github/pull_request_template.md

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


# IntelliJ related
*.iml

*.ipr
*.iws
.idea/
Expand Down
10 changes: 10 additions & 0 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/xj.deng/development/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/xj.deng/alibaba/xj_fluttergo/flutter-go"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "FLUTTER_FRAMEWORK_DIR=/Users/xj.deng/development/flutter/bin/cache/artifacts/engine/ios-release"
export "FLUTTER_BUILD_NAME=1.0.6"
export "FLUTTER_BUILD_NUMBER=1.0.6"
12 changes: 7 additions & 5 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down Expand Up @@ -553,7 +553,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
CURRENT_PROJECT_VERSION = 125;
DEVELOPMENT_TEAM = 4WLT68XRNA;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -566,11 +566,12 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.2.5;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.alibaba.fluttergo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
Expand All @@ -584,7 +585,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
CURRENT_PROJECT_VERSION = 125;
DEVELOPMENT_TEAM = 4WLT68XRNA;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -597,11 +598,12 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.2.5;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.alibaba.fluttergo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Expand Down
22 changes: 19 additions & 3 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,37 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppleMusicUsageDescription</key>
<string>Apple音乐</string>
<key>NSCalendarsUsageDescription</key>
<string>测试所用相机权限</string>
<key>NSCameraUsageDescription</key>
<string>测试拍照</string>
<key>NSContactsUsageDescription</key>
<string>测试所用用户权限</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>测试所用地理权限</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>测试所用位置权限</string>
<key>NSMicrophoneUsageDescription</key>
<string>测试麦克风</string>
<key>NSMotionUsageDescription</key>
<string>测试所用内存权限</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>测试选择图片</string>
<key>NSPhotoLibraryUsageDescription</key>
<string></string>
<string>测试所用照片权限</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>测试所用语音识别权限</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand All @@ -53,5 +67,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>kTCCServiceMediaLibrary</key>
<string>测试所用音乐权限</string>
</dict>
</plist>
17 changes: 17 additions & 0 deletions mupp_build_env_init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#! /bin/bash
print 'entitlement config'
cd ios
ruby entitlement_config.rb
cd ..
#屏蔽Build Shell
sed -i "" "s/\/bin\/sh \\\\\"\\\$FLUTTER_ROOT/#\/bin\/sh \\\\\"\\\$FLUTTER_ROOT/" ./ios/Runner.xcodeproj/project.pbxproj
#拷贝已生成好的Dart代码中间产物
mtl_dir="ios/Flutter_MTL/Flutter"
flutter_dir="ios/Flutter"
[ -d ${flutter_dir} ] || mkdir ${flutter_dir}
rm -rf ${flutter_dir}/*
cp -r ${mtl_dir}/ ${flutter_dir}/
sizeStr=`wc -c ${flutter_dir}/Flutter.framework/Flutter`
lipoStr=`lipo -info ${flutter_dir}/Flutter.framework/Flutter`
echo "[KWLM]Flutter.framework size:${sizeStr}${lipoStr}"
cat ./ios/Runner.xcodeproj/project.pbxproj