diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index aca9f499..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#### What does this PR do?
-
-[TrelloCard/Issue/Story](LINK_TO_STORY)
-
-##### Why are we doing this? Any context or related work?
-
-#### Where should a reviewer start?
-
-#### Manual testing steps?
-
-#### Screenshots
-
----
-
-#### Database changes
-
-#### Deployment instructions
-
-#### New ENV variables
diff --git a/.gitignore b/.gitignore
index e99c7b82..bdc2c7bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
# IntelliJ related
-*.iml
+
*.ipr
*.iws
.idea/
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
new file mode 100755
index 00000000..c9c6343b
--- /dev/null
+++ b/ios/Flutter/flutter_export_environment.sh
@@ -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"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 2b500e72..110536b3 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -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 = (
@@ -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 = (
@@ -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;
@@ -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 = (
@@ -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;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index c6bb52b8..68c927b9 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -17,23 +17,37 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- $(FLUTTER_BUILD_NAME)
+ $(MARKETING_VERSION)
CFBundleSignature
????
CFBundleVersion
- $(FLUTTER_BUILD_NUMBER)
+ $(CURRENT_PROJECT_VERSION)
LSApplicationCategoryType
LSRequiresIPhoneOS
+ NSAppleMusicUsageDescription
+ Apple音乐
+ NSCalendarsUsageDescription
+ 测试所用相机权限
NSCameraUsageDescription
测试拍照
+ NSContactsUsageDescription
+ 测试所用用户权限
+ NSLocationAlwaysUsageDescription
+ 测试所用地理权限
+ NSLocationWhenInUseUsageDescription
+ 测试所用位置权限
NSMicrophoneUsageDescription
测试麦克风
+ NSMotionUsageDescription
+ 测试所用内存权限
NSPhotoLibraryAddUsageDescription
测试选择图片
NSPhotoLibraryUsageDescription
-
+ 测试所用照片权限
+ NSSpeechRecognitionUsageDescription
+ 测试所用语音识别权限
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -53,5 +67,7 @@
UIViewControllerBasedStatusBarAppearance
+ kTCCServiceMediaLibrary
+ 测试所用音乐权限
diff --git a/mupp_build_env_init.sh b/mupp_build_env_init.sh
new file mode 100644
index 00000000..5057c3ee
--- /dev/null
+++ b/mupp_build_env_init.sh
@@ -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