Commit 905aaafe authored by jinzhu's avatar jinzhu

Merge branch 'master' of git.wanmeizhensuo.com:mobile/gmalpha_flutter

parents 6064943b 64ba3cef
This diff is collapsed.
sdk.dir=/Users/gengmei/Library/Android/sdk sdk.dir=/Users/gengmei/Library/Android/sdk
flutter.sdk=/Users/gengmei/Library/Android/sdk/flutter flutter.sdk=/Users/gengmei/Library/Android/sdk/flutter
flutter.buildMode=debug flutter.buildMode=release
flutter.versionName=1.0.0 flutter.versionName=1.0.0
flutter.versionCode=1 flutter.versionCode=1
\ No newline at end of file
...@@ -41,5 +41,6 @@ Icon? ...@@ -41,5 +41,6 @@ Icon?
build/ build/
# 暂时忽略不追踪 因为android 要跑起来需要更改很多配置 # 暂时忽略不追踪 因为android 要跑起来需要更改很多配置
#.android/ #.android/
*.android/local.properties
.ios/ .ios/
.flutter-plugins .flutter-plugins
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" /> <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/.idea" />
<excludeFolder url="file://$MODULE_DIR$/.pub" /> <excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" /> <orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Flutter Plugins" level="project" /> <orderEntry type="library" name="Flutter Plugins" level="project" />
......
...@@ -438,7 +438,7 @@ class DioUtil { ...@@ -438,7 +438,7 @@ class DioUtil {
options.connectTimeout = 10 * 1000; options.connectTimeout = 10 * 1000;
options.receiveTimeout = 20 * 1000; options.receiveTimeout = 20 * 1000;
options.contentType = ContentType.parse('application/x-www-form-urlencoded'); options.contentType = ContentType.parse('application/x-www-form-urlencoded');
options.baseUrl = 'http://earth.gmapp.env/'; options.baseUrl = 'https://earth.iyanzhi.com/';
Map<String, dynamic> headers = Map<String, dynamic>(); Map<String, dynamic> headers = Map<String, dynamic>();
headers['Accept'] = 'application/json'; headers['Accept'] = 'application/json';
return options; return options;
......
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Jun 06 12:08:59 CST 2019
ndk.dir=/Users/gengmei/Library/Android/sdk/ndk-bundle
sdk.dir=/Users/gengmei/Library/Android/sdk
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