Commit a554919b authored by 林生雨's avatar 林生雨

commit

parent 94cb725d
sdk.dir=/Users/apple/Library/Android/sdk
flutter.sdk=/Users/apple/Downloads/flutter
flutter.buildMode=release
flutter.buildMode=debug
flutter.versionName=1.0.0
flutter.versionCode=1
\ No newline at end of file
......@@ -4,7 +4,6 @@ targets:
code_gen_demo|mark_builder:
enabled: true
builders:
user:
......
......@@ -141,6 +141,7 @@ function ios(){
cd ${projectDir}
flutter build ios --release --no-codesign
cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/aar_update/ios${message}/
cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project
}
function ios_publish(){
......@@ -226,11 +227,11 @@ mkdir /Users/apple/lsy/aar_update/androd${message}/
mkdir /Users/apple/lsy/aar_update/ios${message}/
clean
android_apk
#android_apk
#android
#android_publish
#upload_android_aar
#ios
ios
#ios_publish
#notifyDingDing
......
<svg width="13" height="22" viewBox="0 0 13 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 1L2 11L12 21" stroke="#323232" stroke-width="1.5"/>
</svg>
/Users/apple/Downloads/flutter/.pub-cache/git/flutter_plugin-11f928f7165e76994978f521a25e89d8d25824b7
\ No newline at end of file
/Users/apple/Downloads/flutter/.pub-cache/git/flutter_plugin-c26d6a260da11c0bd3ce85ea80e81bc5a4ee837b
\ No newline at end of file
{"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"images/arrow_right.png":["images/arrow_right.png"],"images/black_person.png":["images/black_person.png"],"images/dark_grey_person.png":["images/dark_grey_person.png"],"images/golden_person.png":["images/golden_person.png"],"images/light_grey_person.png":["images/light_grey_person.png"],"images/message_att.png":["images/message_att.png"],"images/message_like.png":["images/message_like.png"],"images/message_noti.png":["images/message_noti.png"],"images/nav_back.png":["images/nav_back.png"],"images/right_icon.png":["images/right_icon.png"],"images/you_icon.png":["images/you_icon.png"]}
\ No newline at end of file
{"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"images/arrow_right.png":["images/arrow_right.png"],"images/arrow_right@2x.png":["images/arrow_right@2x.png"],"images/black_person.png":["images/black_person.png"],"images/dark_grey_person.png":["images/dark_grey_person.png"],"images/golden_person.png":["images/golden_person.png"],"images/left_arrow.png":["images/left_arrow.png"],"images/left_arrow.svg":["images/left_arrow.svg"],"images/light_grey_person.png":["images/light_grey_person.png"],"images/message_att.png":["images/message_att.png"],"images/message_att@2x.png":["images/message_att@2x.png"],"images/message_like.png":["images/message_like.png"],"images/message_like@2x.png":["images/message_like@2x.png"],"images/message_noti.png":["images/message_noti.png"],"images/message_noti@2x.png":["images/message_noti@2x.png"],"images/nav_back.png":["images/nav_back.png"],"images/right_icon.png":["images/right_icon.png"],"images/right_icon@2x.png":["images/right_icon@2x.png"],"images/you_icon.png":["images/you_icon.png"]}
\ No newline at end of file
[{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]},{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"}]
\ No newline at end of file
[{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]},{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"},{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"}]
\ No newline at end of file
......@@ -4223,6 +4223,28 @@ Apache License
See the License for the specific language governing permissions and
limitations under the License.
--------------------------------------------------------------------------------
flutter_svg
Copyright (c) 2018 Dan Field
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
freetype2
Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
......@@ -10860,6 +10882,30 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
path_drawing
path_parsing
Copyright (c) 2018 Dan Field
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
path_provider
......@@ -10889,6 +10935,33 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
petitparser
xml
The MIT License
Copyright (c) 2006-2019 Lukas Renggli.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
--------------------------------------------------------------------------------
pull_to_refresh
......
<svg width="13" height="22" viewBox="0 0 13 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 1L2 11L12 21" stroke="#323232" stroke-width="1.5"/>
</svg>
......@@ -4,6 +4,6 @@ FLUTTER_APPLICATION_PATH=/Users/apple/lsy/gmalpha_flutter
FLUTTER_TARGET=lib/main.dart
FLUTTER_BUILD_DIR=build
SYMROOT=${SOURCE_ROOT}/../build/ios
FLUTTER_FRAMEWORK_DIR=/Users/apple/Downloads/flutter/bin/cache/artifacts/engine/ios
FLUTTER_FRAMEWORK_DIR=/Users/apple/Downloads/flutter/bin/cache/artifacts/engine/ios-release
FLUTTER_BUILD_NAME=1.0.0
FLUTTER_BUILD_NUMBER=1
......@@ -17,7 +17,7 @@ PODS:
- Flutter
DEPENDENCIES:
- Flutter (from `.symlinks/flutter/ios`)
- Flutter (from `.symlinks/flutter/ios-release`)
- flutter_boost (from `.symlinks/plugins/flutter_boost/ios`)
- gengmei_flutter_plugin (from `.symlinks/plugins/gengmei_flutter_plugin/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
......@@ -30,7 +30,7 @@ SPEC REPOS:
EXTERNAL SOURCES:
Flutter:
:path: ".symlinks/flutter/ios"
:path: ".symlinks/flutter/ios-release"
flutter_boost:
:path: ".symlinks/plugins/flutter_boost/ios"
gengmei_flutter_plugin:
......@@ -43,7 +43,7 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/xservice_kit/ios"
SPEC CHECKSUMS:
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
Flutter: 446b87ace8a3747a167979213b4aef59a0b5e5fa
flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156
......
......@@ -15,7 +15,7 @@
"tag": "1.0.0"
},
"platforms": {
"ios": "7.0"
"ios": "9.0"
},
"vendored_frameworks": "Flutter.framework"
}
......@@ -17,7 +17,7 @@ PODS:
- Flutter
DEPENDENCIES:
- Flutter (from `.symlinks/flutter/ios`)
- Flutter (from `.symlinks/flutter/ios-release`)
- flutter_boost (from `.symlinks/plugins/flutter_boost/ios`)
- gengmei_flutter_plugin (from `.symlinks/plugins/gengmei_flutter_plugin/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
......@@ -30,7 +30,7 @@ SPEC REPOS:
EXTERNAL SOURCES:
Flutter:
:path: ".symlinks/flutter/ios"
:path: ".symlinks/flutter/ios-release"
flutter_boost:
:path: ".symlinks/plugins/flutter_boost/ios"
gengmei_flutter_plugin:
......@@ -43,7 +43,7 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/xservice_kit/ios"
SPEC CHECKSUMS:
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
Flutter: 446b87ace8a3747a167979213b4aef59a0b5e5fa
flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156
......
This source diff could not be displayed because it is too large. You can view the blob instead.
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Flutter
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.symlinks/flutter/ios
PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.symlinks/flutter/ios-release
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
......@@ -162,7 +162,7 @@ strip_invalid_archs() {
if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework"
install_framework "${BUILT_PRODUCTS_DIR}/flutter_boost/flutter_boost.framework"
install_framework "${BUILT_PRODUCTS_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework"
install_framework "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework"
......@@ -171,7 +171,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
fi
if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework"
install_framework "${BUILT_PRODUCTS_DIR}/flutter_boost/flutter_boost.framework"
install_framework "${BUILT_PRODUCTS_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework"
install_framework "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework"
......@@ -180,7 +180,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
fi
if [[ "$CONFIGURATION" == "Profile" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework"
install_framework "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework"
install_framework "${BUILT_PRODUCTS_DIR}/flutter_boost/flutter_boost.framework"
install_framework "${BUILT_PRODUCTS_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework"
install_framework "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework"
......
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost/flutter_boost.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider/path_provider.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite/sqflite.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit/xservice_kit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost/flutter_boost.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider/path_provider.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite/sqflite.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit/xservice_kit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB/FMDB.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost/flutter_boost.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin/gengmei_flutter_plugin.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/path_provider/path_provider.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/sqflite/sqflite.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit/xservice_kit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_LDFLAGS = $(inherited) -l"c++"
PODS_BUILD_DIR = ${BUILD_DIR}
......
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia"
PODS_BUILD_DIR = ${BUILD_DIR}
......
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/path_provider
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/sqflite
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
......@@ -2,6 +2,26 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>位置</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>位置</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>位置</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>位置</string>
<key>NSAppleMusicUsageDescription</key>
<string>音乐</string>
<key>NSCameraUsageDescription</key>
<string>照相机</string>
<key>NSContactsUsageDescription</key>
<string>NSContactsUsageDescription</string>
<key>NSMicrophoneUsageDescription</key>
<string>麦克风</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>相册</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>相册</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
......
......@@ -9,9 +9,11 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:gmalpha_flutter/ActivityReportModel/service/remote/entity/ActivityReportEntity.dart';
import 'package:flutter/material.dart';
import 'package:gmalpha_flutter/ActivityReportModel/page/ActivityReportModel.dart';
import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
import 'package:gmalpha_flutter/commonModel/base/BasePage.dart';
import 'package:gmalpha_flutter/commonModel/base/Temp.dart';
import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
import 'package:flutter_svg/flutter_svg.dart';
final _goldenColor = Color(0xFFB9A689);
......@@ -46,12 +48,20 @@ class ActivityReportState extends BasePage<ActivityReportPage> {
title: Text(''),
centerTitle: true,
leading: IMAGE.GestureDetector(
onTap: () {
Navigator.pop(context, "");
jumpToSearch("brand_report", _model.fromPage, "return");
},
child: IMAGE.Image.asset("images/nav_back.png"),
),
onTap: () {
super.pageStop();
RouterCenterImpl()
.findBuriedRouter()
?.onClick(pageName(), "return");
Navigator.pop(context, "");
jumpToNative("search", null);
},
// child: IMAGE.Image.asset("images/nav_back.png"),
child: IMAGE.Center(
child: SvgPicture.asset(
"images/left_arrow.svg",
color: IMAGE.Color(0xff323232),
))),
actions: <Widget>[
GestureDetector(
child: Container(
......@@ -66,8 +76,12 @@ class ActivityReportState extends BasePage<ActivityReportPage> {
))),
onTap: () {
// click("", "");
super.pageStop();
RouterCenterImpl()
.findBuriedRouter()
?.onClick(pageName(), "test_again");
Navigator.pop(context, "");
jumpToH5("brand_report", _model.fromPage, "test_again");
jumpToH5("question", null);
},
)
],
......@@ -396,8 +410,11 @@ class PictorialCard extends StatelessWidget {
margin: EdgeInsets.only(top: ScreenUtil().setHeight(32)),
child: GestureDetector(
onTap: () {
jumpToPictorial('${item.protocol}&survey_record_id=$id',
"brand_report", _model.fromPage, "recommand_${indexOf + 1}");
RouterCenterImpl()
.findBuriedRouter()
?.onClick("brand_report", "recommand_${indexOf + 1}");
jumpToNative("pictorial",
{"url": '${item.protocol}&survey_record_id=$id'});
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......
......@@ -45,7 +45,6 @@ class AlbumModel extends BaseModel {
}
bool showPop = false;
bool isAndroid = Platform.isAndroid;
List<DirBean> _dirList = List();
get dirList => _dirList;
......@@ -72,6 +71,11 @@ class AlbumModel extends BaseModel {
newPath != null) {
itemList[i].path = newPath;
}
var realPath=map[k][i]["realPath"] as String;
if ((itemList[i].realPath == null || itemList[i].realPath.isEmpty) &&
realPath != null) {
itemList[i].realPath = realPath;
}
}
});
// var recordList=_mainValue[_nowDirName];
......@@ -99,11 +103,9 @@ class AlbumModel extends BaseModel {
}
void initScanImages(BuildContext context) {
if (isAndroid) {
_listen = GengmeiFlutterPlugin.phoneImagesEvent
.receiveBroadcastStream()
.listen(_onEvent, onError: _onError);
}
_listen = GengmeiFlutterPlugin.phoneImagesEvent
.receiveBroadcastStream()
.listen(_onEvent, onError: _onError);
AlbumRepository.getInstance().scanPhoneImg().listen((value) {
if (value != null) {
_mainValue = value;
......@@ -148,14 +150,8 @@ class AlbumModel extends BaseModel {
return false;
}
_selectList.forEach((value) {
if (isAndroid) {
if (value == albumLive.data[index].realPath) {
haveIt = true;
}
} else {
if (value == albumLive.data[index].path) {
haveIt = true;
}
if (value == albumLive.data[index].realPath) {
haveIt = true;
}
});
return haveIt;
......@@ -166,12 +162,7 @@ class AlbumModel extends BaseModel {
}
void clickItem(BuildContext context, int index) {
String path;
if (isAndroid) {
path = albumLive.data[index].realPath;
} else {
path = albumLive.data[index].path;
}
String path = albumLive.data[index].realPath;
if (!_selectList.contains(path)) {
if (_selectList.length >= _maxCount) {
......
......@@ -157,7 +157,8 @@ class AlbumState extends State<AlbumPage> {
}
int newIndex = _model.showCamera ? index - 1 : index;
if (imgList.data[newIndex] == null ||
imgList.data[newIndex].path == null) {
imgList.data[newIndex].path == null ||
imgList.data[newIndex].realPath == null) {
return Icon(
Icons.photo,
size: 20,
......
......@@ -29,4 +29,10 @@ class BuriedImpl implements BuriedRouter {
void onEvent(String type, Map<String, String> params) {
BuriedCenter.getInstance().onEvent(type, params);
}
@override
void onClick(String pageName, String buttonName) {
BuriedCenter.getInstance().onEvent(
"CLICK_EVENT", {"page_name": pageName, "button_name": buttonName});
}
}
......@@ -18,4 +18,6 @@ abstract class BuriedRouter extends RouterBaser {
String isPush});
void onEvent(String type, Map<String, String> params);
void onClick(String pageName,String buttonName);
}
......@@ -38,11 +38,7 @@ class SendTask {
temp.forEach((k, v) {
CacheManager.getInstance().get(MEMORY_CACHE).save(k, v);
});
_sendBuriedData(
assemRequset(
request
)
);
_sendBuriedData(assemRequset(request));
}).catchError((error) {
print(error);
});
......@@ -73,6 +69,10 @@ class SendTask {
.get(MEMORY_CACHE)
.get("android_device_id") ??
"";
_deviceInfo.idfv =
CacheManager.getInstance().get(MEMORY_CACHE).get("idfv") ?? "";
_deviceInfo.idfa =
CacheManager.getInstance().get(MEMORY_CACHE).get("idfa") ?? "";
}
if (_appInfo == null) {
_appInfo = new AppInfo();
......
......@@ -180,6 +180,8 @@ class DeviceInfo extends $pb.GeneratedMessage {
..aOS(9, 'model')
..aOS(10, 'sysVersion')
..aOS(11, 'androidDeviceId')
..aOS(12, 'idfv')
..aOS(13, 'idfa')
..hasRequiredFields = false;
DeviceInfo._() : super();
......@@ -334,6 +336,30 @@ class DeviceInfo extends $pb.GeneratedMessage {
$core.bool hasAndroidDeviceId() => $_has(10);
@$pb.TagNumber(11)
void clearAndroidDeviceId() => clearField(11);
@$pb.TagNumber(12)
$core.String get idfv => $_getSZ(11);
@$pb.TagNumber(12)
set idfv($core.String v) {
$_setString(11, v);
}
@$pb.TagNumber(12)
$core.bool hasIdfv() => $_has(11);
@$pb.TagNumber(12)
void clearIdfv() => clearField(12);
@$pb.TagNumber(13)
$core.String get idfa => $_getSZ(12);
@$pb.TagNumber(13)
set idfa($core.String v) {
$_setString(12, v);
}
@$pb.TagNumber(13)
$core.bool hasIdfa() => $_has(12);
@$pb.TagNumber(13)
void clearIdfa() => clearField(13);
}
class AppInfo extends $pb.GeneratedMessage {
......
......@@ -78,6 +78,8 @@ const DeviceInfo$json = const {
'5': 9,
'10': 'androidDeviceId'
},
const {'1': 'idfv', '3': 12, '4': 1, '5': 9, '10': 'idfv'},
const {'1': 'idfa', '3': 13, '4': 1, '5': 9, '10': 'idfa'},
],
};
......
......@@ -10,6 +10,7 @@ import 'package:gmalpha_flutter/PrestigeModel/page/reputation/ReputationsModel.d
import 'package:gmalpha_flutter/PrestigeModel/service/remote/entity/PrestigeEntity.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:gmalpha_flutter/commonModel/base/BasePage.dart';
import 'package:flutter_svg/flutter_svg.dart';
class ReputationsPage extends StatefulWidget {
ReputationsModel _model;
......@@ -58,7 +59,11 @@ class ReputationsState extends BasePage<ReputationsPage> {
onTap: () {
FlutterBoost.singleton.closePageForContext(context);
},
child: Image.asset("images/nav_back.png"),
// child: Image.asset("images/nav_back.png"),
child: Center(
child: SvgPicture.asset("images/left_arrow.svg",
color: Color(0xff323232)),
),
)),
body: StreamBuilder<PrestigeEntity>(
stream: _model.prestigeLive.stream,
......
......@@ -32,6 +32,12 @@ abstract class BasePage<T extends StatefulWidget> extends State<T> {
}
}
void pageStop(){
RouterCenterImpl().findBuriedRouter()?.onPageEnd(
pageName(), "$startTime", "${DateTime.now().millisecondsSinceEpoch}",
referrer: referrer());
}
@override
void dispose() {
super.dispose();
......
......@@ -8,58 +8,20 @@ import 'package:rxdart/rxdart.dart';
const BURIED_METHOD = "FLUTTER_BURIED";
const platform = const MethodChannel('flutter_bury_channel');
var startTime;
Observable<bool> pageStart(String nowPage, String beforPage) {
startTime=getNowTimeSecond();
return Observable.fromFuture(platform.invokeMethod(
"PAGE_START", {"page_name": nowPage, "referrer": beforPage}));
}
Observable<bool> pageEnd(String nowPage, String beforPage) {
return Observable.fromFuture(platform.invokeMethod(
"PAGE_END", {"page_name": nowPage, "referrer": beforPage,
"in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
"out": getNowTimeSecond()}));
}
Observable<bool> click(String page_name, String button_name) {
return Observable.fromFuture(platform.invokeMethod(
"CLICK_EVENT", {"page_name": page_name, "button_name": button_name}));
}
Observable<bool> jumpToH5(
String nowPage, String beforPage, String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_H5", {
"page_name": nowPage,
"referrer": beforPage,
"in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
"out": getNowTimeSecond(),
"button_name": button_name
}));
}
Observable<bool> jumpToPictorial(String url, String nowPage, String beforPage,
String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_PICTORIAL", {
"url": url,
"page_name": nowPage,
"referrer": beforPage,
"in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
"out": getNowTimeSecond(),
"button_name": button_name
}));
}
Observable<bool> jumpToSearch(
String nowPage, String beforPage, String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_SEARCH", {
"page_name": nowPage,
"referrer": beforPage,
"in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
"out": getNowTimeSecond(),
"button_name": button_name
}));
void jumpToH5(String jumpToName, Map params) {
Map map = {"page_name": jumpToName};
if (params != null) {
map.addAll(params);
}
platform.invokeMethod("FLUTTER_TO_H5", map);
}
void jumpToNative(String jumpToName, Map params) {
Map map = {"page_name": jumpToName};
if (params != null) {
map.addAll(params);
}
platform.invokeMethod("FLUTTER_TO_NATIVE", map);
}
Future getBuriedInfo() async {
......
......@@ -83,26 +83,22 @@ class _MyAppState extends State<MyApp> {
return MaterialApp(
title: 'Flutter Boost example',
debugShowCheckedModeBanner: false,
routes: {
'/': (context) {
// routes: {
// '/': (context) {
// Api.getInstance().initBuildConfig({
// 'Cookie':
// '_gm_token=72ee1c1569466411; _gtid=58d3cc14df8711e99736525400e82fab81; sessionid=vhksn66854pejzjwi8ljhrmcew3domh2',
// "buildConfig": "debug"
// });
// return RouterCenterImpl()
// .findActivityReportRouter()
// ?.getActivityReportPage(279, 1, '');
//// return RouterCenterImpl()
//// .findActivityReportRouter()
//// ?.getActivityReportPage(279, 1, '');
//// return RouterCenterImpl().findPrestigeRouter()?.getReputationsPage(1, "ww", "ww");
// return RouterCenterImpl()
// .findAlbumRouter()
// .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
return RouterCenterImpl().findAlbumRouter().getAlbumPage(
"",
true,
8,
null);
},
},
// },
// },
builder: FlutterBoost.init(postPush: _onRoutePushed),
theme: new ThemeData(
primaryColor: Colors.white,
......
......@@ -31,6 +31,8 @@ message DeviceInfo {
string model = 9;
string sys_version = 10;
string android_device_id = 11;
string idfv=12;
string idfa=13;
}
message AppInfo {
......
......@@ -195,6 +195,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.5.3"
flutter_svg:
dependency: "direct main"
description:
name: flutter_svg
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.14.1"
flutter_test:
dependency: "direct dev"
description: flutter
......@@ -211,8 +218,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "11f928f7165e76994978f521a25e89d8d25824b7"
resolved-ref: "11f928f7165e76994978f521a25e89d8d25824b7"
ref: c26d6a260da11c0bd3ce85ea80e81bc5a4ee837b
resolved-ref: c26d6a260da11c0bd3ce85ea80e81bc5a4ee837b
url: "git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git"
source: git
version: "0.0.735"
......@@ -356,6 +363,20 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.2"
path_drawing:
dependency: transitive
description:
name: path_drawing
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.1"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.4"
path_provider:
dependency: transitive
description:
......@@ -370,6 +391,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.0"
platform:
dependency: transitive
description:
......@@ -557,6 +585,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.13"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.5.0"
xservice_kit:
dependency: transitive
description:
......@@ -572,5 +607,5 @@ packages:
source: hosted
version: "2.1.16"
sdks:
dart: ">=2.3.0-dev.0.1 <3.0.0"
flutter: ">=1.2.1 <2.0.0"
dart: ">=2.4.0 <3.0.0"
flutter: ">=1.5.9-pre.94 <2.0.0"
......@@ -34,9 +34,10 @@ dependencies:
gengmei_flutter_plugin:
git:
url: 'git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git'
ref: "11f928f7165e76994978f521a25e89d8d25824b7"
ref: "c26d6a260da11c0bd3ce85ea80e81bc5a4ee837b"
protobuf: ^0.14.4
grpc: ^2.1.2
flutter_svg: ^0.14.1
dev_dependencies:
source_gen: '>=0.8.0'
......@@ -64,17 +65,18 @@ flutter:
# To add Flutter specific assets to your application, add an assets section,
# like this:
assets:
- images/nav_back.png
- images/message_att.png
- images/message_like.png
- images/arrow_right.png
- images/message_noti.png
- images/black_person.png
- images/dark_grey_person.png
- images/golden_person.png
- images/light_grey_person.png
- images/you_icon.png
- images/right_icon.png
- images/
# - images/nav_back.png
# - images/message_att.png
# - images/message_like.png
# - images/arrow_right.png
# - images/message_noti.png
# - images/black_person.png
# - images/dark_grey_person.png
# - images/golden_person.png
# - images/light_grey_person.png
# - images/you_icon.png
# - images/right_icon.png
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.io/assets-and-images/#resolution-aware.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment