commit

android/local.properties

-sdk.dir=/Users/gengmei/Library/Android/sdk
-flutter.sdk=/Users/gengmei/flutter
+sdk.dir=/Users/apple/Library/Android/sdk
+flutter.sdk=/Users/apple/Downloads/flutter
 flutter.buildMode=debug
 flutter.versionName=1.0.0
 flutter.versionCode=1
\ No newline at end of file

android/packflutter/flutter/assets/release/snapshot.d.fingerprint

-{"version":"20e59316b8b8474554b38493b8ca888794b0234a","properties":{"buildMode":"BuildMode.release","targetPlatform":"TargetPlatform.android_arm","entryPoint":"build/flutteroutput/aot/app.dill","sharedLib":"false","extraGenSnapshotOptions":"","engineHash":"fee001c93f25a1e7258e762781a7361f122d29f5","buildersUsed":"false"},"files":{"/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/lib/ui/ui.dart":"eb7755654f7eeb3b79fe0e7292ba8b7b","/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/sdk_ext/vmservice_io.dart":"6137595b8118b04910c4f137a94bad5f","build/flutteroutput/aot/app.dill":"c2208becc01123525a38ac1bbc26fdb6","build/flutteroutput/aot/isolate_snapshot_data":"d38b2f2763facc4c7bf117a1e6fb5de5","build/flutteroutput/aot/isolate_snapshot_instr":"5031855007921df2694f2b466ba94f11","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file
+{"version":"20e59316b8b8474554b38493b8ca888794b0234a","properties":{"buildMode":"BuildMode.release","targetPlatform":"TargetPlatform.android_arm","entryPoint":"build/flutteroutput/aot/app.dill","sharedLib":"false","extraGenSnapshotOptions":"","engineHash":"fee001c93f25a1e7258e762781a7361f122d29f5","buildersUsed":"false"},"files":{"/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/lib/ui/ui.dart":"eb7755654f7eeb3b79fe0e7292ba8b7b","/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/sdk_ext/vmservice_io.dart":"6137595b8118b04910c4f137a94bad5f","build/flutteroutput/aot/app.dill":"626d12d10ba6ad42df94afa030bb671b","build/flutteroutput/aot/isolate_snapshot_data":"01a493a8dfe5d0dd1ef68b102757aebf","build/flutteroutput/aot/isolate_snapshot_instr":"058b3f56570b6d1c23b48fa542d8a9bf","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file

ios/.symlinks/flutter

-/Users/gengmei/flutter/bin/cache/artifacts/engine
\ No newline at end of file
+/Users/apple/Downloads/flutter/bin/cache/artifacts/engine
\ No newline at end of file

ios/.symlinks/plugins/flutter_boost

-/Users/gengmei/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_boost-0.0.420
\ No newline at end of file
+/Users/apple/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_boost-0.0.420
\ No newline at end of file

ios/.symlinks/plugins/gengmei_flutter_plugin

-/Users/gengmei/flutter/.pub-cache/hosted/pub.flutter-io.cn/gengmei_flutter_plugin-0.0.731
\ No newline at end of file
+/Users/apple/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/gengmei_flutter_plugin-0.0.731
\ No newline at end of file

ios/.symlinks/plugins/path_provider

-/Users/gengmei/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.3.0
\ No newline at end of file
+/Users/apple/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.3.0
\ No newline at end of file

ios/.symlinks/plugins/sqflite

-/Users/gengmei/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.6+5
\ No newline at end of file
+/Users/apple/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.6+5
\ No newline at end of file

ios/.symlinks/plugins/xservice_kit

-/Users/gengmei/flutter/.pub-cache/hosted/pub.flutter-io.cn/xservice_kit-0.0.29
\ No newline at end of file
+/Users/apple/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/xservice_kit-0.0.29
\ No newline at end of file

ios/Flutter/Generated.xcconfig

 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/gengmei/flutter
-FLUTTER_APPLICATION_PATH=/Users/gengmei/Documents/workspace/gmalpha_flutter
-FLUTTER_TARGET=/Users/gengmei/Documents/workspace/gmalpha_flutter/lib/main.dart
+FLUTTER_ROOT=/Users/apple/Downloads/flutter
+FLUTTER_APPLICATION_PATH=/Users/apple/lsy/gmalpha_flutter
+FLUTTER_TARGET=/Users/apple/lsy/gmalpha_flutter/lib/main.dart
 FLUTTER_BUILD_DIR=build
 SYMROOT=${SOURCE_ROOT}/../build/ios
-FLUTTER_FRAMEWORK_DIR=/Users/gengmei/flutter/bin/cache/artifacts/engine/ios
+FLUTTER_FRAMEWORK_DIR=/Users/apple/Downloads/flutter/bin/cache/artifacts/engine/ios
 FLUTTER_BUILD_NAME=1.0.0
 FLUTTER_BUILD_NUMBER=1
+TRACK_WIDGET_CREATION=true

ios/Podfile.lock

@@ -53,4 +53,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 7f6a4806cddf47207b1cc19727536fd9f167aaa3
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.7.4

ios/Pods/Manifest.lock

@@ -53,4 +53,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 7f6a4806cddf47207b1cc19727536fd9f167aaa3
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.7.4

lib/ActivityReportModel/page/ActivityReportPage.dart

@@ -44,14 +44,12 @@ class ActivityReportState extends State<ActivityReportPage> {
         appBar: AppBar(
           title: Text(''),
           centerTitle: true,
-          leading: IconButton(
-            onPressed: () {
-              jumpToSearch();
+          leading: IMAGE.GestureDetector(
+            onTap: (){
               Navigator.pop(context,"");
+              jumpToSearch();
             },
-            icon: Icon(
-              Icons.keyboard_arrow_left,
-            ),
+            child: IMAGE.Image.asset("images/nav_back.png"),
           ),
           actions: <Widget>[
             GestureDetector(
@@ -66,8 +64,8 @@ class ActivityReportState extends State<ActivityReportPage> {
                         fontWeight: FontWeight.bold),
                   ))),
               onTap: () {
-                jumpToH5();
                 Navigator.pop(context,"");
+                jumpToH5();
               },
             )
           ],
@@ -123,8 +121,8 @@ class TopCard extends StatelessWidget {
   final share;
 
   TopCard({Key key, this.share}) : super(key: key);
-
   _moneyContainer(val) {
+
     return Container(
         child: Column(
       children: <Widget>[

lib/PrestigeModel/page/reputation/ReputationsPage.dart

@@ -54,13 +54,11 @@ class ReputationsState extends State<ReputationsPage> {
               },
             ),
             centerTitle: true,
-            leading: IconButton(
-              onPressed: () =>
-                  FlutterBoost.singleton.closePageForContext(context),
-              icon: Icon(
-                Icons.keyboard_arrow_left,
-                size: 30,
-              ),
+            leading: GestureDetector(
+              onTap: () {
+                FlutterBoost.singleton.closePageForContext(context);
+              },
+              child: Image.asset("images/nav_back.png"),
             )),
         body: StreamBuilder<PrestigeEntity>(
           stream: _model.prestigeLive.stream,