commit

android/app/app.iml

@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/app/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/Downloads/flutter/bin/cache/artifacts/engine/android-arm64/flutter.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/d8dbc48720ab367d16710d1d4900d452/appcompat-v7-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/e645cd03456dfea8cf527eb38c52152a/support-fragment-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/9df4bf85fe8e809cc382807769af9038/animated-vector-drawable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/0fc6761e44e472fbfb8f0cfcb9305ed1/support-core-ui-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/0a01e704fb7fb58d49b64d0567188d80/support-core-utils-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/c0bcaa05958233de30ef6d0d14187f5b/support-vector-drawable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/286194e8db7b803b180001a7f1ec78ca/loader-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/4ee0d8adfd516cf69ff52fed474a8aea/viewpager-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/00fa33bf3e3b089f6168d10997305ea1/coordinatorlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/62951f13e1dff7b68e99737a25591852/drawerlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/955b3a5add435846ec514cdba546578d/slidingpanelayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/45698c5f24b94f4e033a70dfe4c87be0/customview-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/83b41701c0de3e28bd070ebc87303d81/swiperefreshlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/5fe9b608158ad92b2aed9ceb0430adf2/asynclayoutinflater-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/e1567367eeb68d692b5d7c70f20e9333/support-compat-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/828e60e57d3409736aa82b119e193a8e/versionedparcelable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/aeafa3300619b9402ba4d50bb9b311bd/cursoradapter-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/23b7eb20ab37d51bdaa9a0bf604bf1aa/runtime-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/c89bf3676b7d5f0450149dae08319c82/documentfile-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/70db1d15e1e0a76418b2f55c3661d860/localbroadcastmanager-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/a1b8340475297cd2b36cb72be623f2e7/print-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/7bd8d86f321e4dc05b470aa2c289b34f/viewmodel-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/8b49361f4c8607c01288bb8996c15789/livedata-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/beece5856765effdb761a59c187fce7c/livedata-core-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/2e52cc67f3c95d1ff217164455a507ac/runtime-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/9aee005a91c8299c09be70984d6d7b17/interpolator-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/apple/Library/Android/sdk/platforms/android-28/android.jar:/Users/apple/Library/Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$USER_HOME$/Downloads/flutter/bin/cache/artifacts/engine/android-arm64/flutter.jar:/Users/apple/lsy/gmalpha_flutter/build/app/intermediates/flutter/debug/libs.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/d8dbc48720ab367d16710d1d4900d452/appcompat-v7-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/e645cd03456dfea8cf527eb38c52152a/support-fragment-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/9df4bf85fe8e809cc382807769af9038/animated-vector-drawable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/0fc6761e44e472fbfb8f0cfcb9305ed1/support-core-ui-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/0a01e704fb7fb58d49b64d0567188d80/support-core-utils-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/c0bcaa05958233de30ef6d0d14187f5b/support-vector-drawable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/286194e8db7b803b180001a7f1ec78ca/loader-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/4ee0d8adfd516cf69ff52fed474a8aea/viewpager-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/00fa33bf3e3b089f6168d10997305ea1/coordinatorlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/62951f13e1dff7b68e99737a25591852/drawerlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/955b3a5add435846ec514cdba546578d/slidingpanelayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/45698c5f24b94f4e033a70dfe4c87be0/customview-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/83b41701c0de3e28bd070ebc87303d81/swiperefreshlayout-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/5fe9b608158ad92b2aed9ceb0430adf2/asynclayoutinflater-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/e1567367eeb68d692b5d7c70f20e9333/support-compat-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/828e60e57d3409736aa82b119e193a8e/versionedparcelable-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/aeafa3300619b9402ba4d50bb9b311bd/cursoradapter-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/23b7eb20ab37d51bdaa9a0bf604bf1aa/runtime-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/c89bf3676b7d5f0450149dae08319c82/documentfile-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/70db1d15e1e0a76418b2f55c3661d860/localbroadcastmanager-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/a1b8340475297cd2b36cb72be623f2e7/print-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/7bd8d86f321e4dc05b470aa2c289b34f/viewmodel-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/8b49361f4c8607c01288bb8996c15789/livedata-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/beece5856765effdb761a59c187fce7c/livedata-core-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/2e52cc67f3c95d1ff217164455a507ac/runtime-1.1.1/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/Users/apple/.gradle/caches/transforms-2/files-2.1/9aee005a91c8299c09be70984d6d7b17/interpolator-28.0.0/jars/classes.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/Users/apple/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/apple/Library/Android/sdk/platforms/android-28/android.jar:/Users/apple/Library/Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -192,6 +192,6 @@
     <orderEntry type="module" module-name="flutter_boost-0.0.420-android-flutter_boost" />
     <orderEntry type="module" module-name="sqflite" />
     <orderEntry type="module" module-name="android-path_provider" />
-    <orderEntry type="module" module-name="flutter_plugin-588b2bc09dc5e00799c85e51870c8d848e06f074-android-gengmei_flutter_plugin" />
+    <orderEntry type="module" module-name="android-gengmei_flutter_plugin" />
   </component>
 </module>
\ No newline at end of file

android/app/build.gradle

@@ -26,8 +26,8 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-//def isLib = false
-def isLib = true
+def isLib = false
+//def isLib = true
 
 if (isLib) {
     apply plugin: 'com.android.library'

android/app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.gmalpha_flutter">
 
-<!--    <application-->
-<!--        android:name="io.flutter.app.FlutterApplication"-->
-<!--        android:icon="@mipmap/ic_launcher"-->
-<!--        android:label="gmalpha_flutter"-->
-<!--        android:theme="@style/AppTheme">-->
-<!--        <activity-->
-<!--            android:name=".MainActivity"-->
-<!--            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"-->
-<!--            android:hardwareAccelerated="true"-->
-<!--            android:launchMode="singleTop"-->
-<!--            android:windowSoftInputMode="adjustResize">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-<!--            <meta-data-->
-<!--                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"-->
-<!--                android:value="true" />-->
-<!--        </activity>-->
-<!--        <provider-->
-<!--            android:name="android.support.v4.content.FileProvider"-->
-<!--            android:authorities="com.example.gengmei_flutter_plugin_example"-->
-<!--            android:exported="false"-->
-<!--            android:grantUriPermissions="true">-->
-<!--            <meta-data-->
-<!--                android:name="android.support.FILE_PROVIDER_PATHS"-->
-<!--                android:resource="@xml/file_paths" />-->
-<!--        </provider>-->
-<!--    </application>-->
+    <application
+        android:name="io.flutter.app.FlutterApplication"
+        android:icon="@mipmap/ic_launcher"
+        android:label="gmalpha_flutter"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:value="true" />
+        </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.example.gmalpha_flutter"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 </manifest>

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":"01f82102098a7dc10bb64a04dbe3d563","build/flutteroutput/aot/isolate_snapshot_data":"206f761c0b5201bdd170e3c1e4d8d404","build/flutteroutput/aot/isolate_snapshot_instr":"5a99093d8b8794ee6622902bc7f0b690","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
+{"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":"6aa1107af87155a0ade198493fbbfa28","build/flutteroutput/aot/isolate_snapshot_data":"2496d8bcce7266b6fd11c352fb50e9c7","build/flutteroutput/aot/isolate_snapshot_instr":"71688c0b3adc35d35adf7c67990843b7","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file

flutter.sh

@@ -90,19 +90,22 @@ function android_publish(){
     git checkout dev
     git stash
     git pull
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/gengmei_alpha/alpha/libs/armeabi-v7a/libapp.so
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/gengmei_alpha/alpha/libs/armeabi-v7a
     git status
     git add .
+    git add -A
     git commit -m "change app.so"
+    git status
     git push
-
     git checkout test
     git stash
     git pull
-    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/gengmei_alpha/alpha/libs/armeabi-v7a/libapp.so
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/gengmei_alpha/alpha/libs/armeabi-v7a
     git status
     git add .
+    git add -A
     git commit -m "change app.so"
+    git status
     git push
 }
 
@@ -135,7 +138,8 @@ function ios_publish(){
     git checkout test
     git stash
     git pull
-    cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
+    rm -rf /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
+    cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project
     git status
     git add .
     git add -A
@@ -146,7 +150,8 @@ function ios_publish(){
     git checkout dev
     git stash
     git pull
-    cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
+    rm -rf /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
+    cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project
     git status
     git add .
     git add -A

ios/.symlinks/plugins/gengmei_flutter_plugin

-/Users/apple/Downloads/flutter/.pub-cache/git/flutter_plugin-588b2bc09dc5e00799c85e51870c8d848e06f074
+/Users/apple/Downloads/flutter/.pub-cache/git/flutter_plugin-4e7c15a7f1e1b7c17655e87ab3ad3434bbe5cdae
\ 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/apple/Downloads/flutter
 FLUTTER_APPLICATION_PATH=/Users/apple/lsy/gmalpha_flutter
-FLUTTER_TARGET=lib/main.dart
+FLUTTER_TARGET=/Users/apple/lsy/gmalpha_flutter/lib/main.dart
 FLUTTER_BUILD_DIR=build
 SYMROOT=${SOURCE_ROOT}/../build/ios
-FLUTTER_FRAMEWORK_DIR=/Users/apple/Downloads/flutter/bin/cache/artifacts/engine/ios-release
+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

@@ -17,7 +17,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - Flutter (from `.symlinks/flutter/ios-release`)
+  - Flutter (from `.symlinks/flutter/ios`)
   - 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-release"
+    :path: ".symlinks/flutter/ios"
   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: 446b87ace8a3747a167979213b4aef59a0b5e5fa
+  Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
   flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156

ios/Pods/Local Podspecs/Flutter.podspec.json

@@ -15,7 +15,7 @@
     "tag": "1.0.0"
   },
   "platforms": {
-    "ios": "9.0"
+    "ios": "7.0"
   },
   "vendored_frameworks": "Flutter.framework"
 }

ios/Pods/Manifest.lock

@@ -17,7 +17,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - Flutter (from `.symlinks/flutter/ios-release`)
+  - Flutter (from `.symlinks/flutter/ios`)
   - 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-release"
+    :path: ".symlinks/flutter/ios"
   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: 446b87ace8a3747a167979213b4aef59a0b5e5fa
+  Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
   flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156

ios/Pods/Target Support Files/Flutter/Flutter.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Flutter
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
 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-release
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.symlinks/flutter/ios
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES

ios/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh

@@ -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-release/Flutter.framework"
+  install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/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-release/Flutter.framework"
+  install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/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-release/Flutter.framework"
+  install_framework "${PODS_ROOT}/../.symlinks/flutter/ios/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"

ios/Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig

-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"
+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"
 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'

ios/Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig

-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"
+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"
 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'

ios/Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig

-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"
+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"
 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'

ios/Pods/Target Support Files/flutter_boost/flutter_boost.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/flutter_boost
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit" "${PODS_ROOT}/../.symlinks/flutter/ios"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 OTHER_LDFLAGS = $(inherited) -l"c++"
 PODS_BUILD_DIR = ${BUILD_DIR}

ios/Pods/Target Support Files/gengmei_flutter_plugin/gengmei_flutter_plugin.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/gengmei_flutter_plugin
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia"
 PODS_BUILD_DIR = ${BUILD_DIR}

ios/Pods/Target Support Files/path_provider/path_provider.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/path_provider
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

ios/Pods/Target Support Files/sqflite/sqflite.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/sqflite
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_ROOT}/../.symlinks/flutter/ios"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

ios/Pods/Target Support Files/xservice_kit/xservice_kit.xcconfig

 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/xservice_kit
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios-release"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.symlinks/flutter/ios"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

lib/ActivityReportModel/page/ActivityReportModel.dart

@@ -42,12 +42,12 @@ class ActivityReportModel extends BaseModel {
   }
 
   end() {
-    pageEnd("brand_report", fromPage);
-//        .listen((value) {
-//      print("埋点 pageEnd 成功？:$value");
-//    }).onError((error) {
-//      print(error);
-//    });
+    pageEnd("brand_report", fromPage)
+        .listen((value) {
+      print("埋点 pageEnd 成功？:$value");
+    }).onError((error) {
+      print(error);
+    });
   }
 
   @override

lib/commonModel/base/Temp.dart

@@ -18,7 +18,7 @@ Observable<bool> pageStart(String nowPage, String beforPage) {
 Observable<bool> pageEnd(String nowPage, String beforPage) {
   return Observable.fromFuture(platform.invokeMethod(
       "PAGE_END", {"page_name": nowPage, "referrer": beforPage,
-    "in": startTime,
+    "in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
     "out": getNowTimeSecond()}));
 }
 
@@ -29,11 +29,10 @@ Observable<bool> click(String page_name, String button_name) {
 
 Observable<bool> jumpToH5(
     String nowPage, String beforPage, String button_name) {
-  print("startTIME $startTime");
   return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_H5", {
     "page_name": nowPage,
     "referrer": beforPage,
-    "in": startTime,
+    "in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));
@@ -41,12 +40,11 @@ Observable<bool> jumpToH5(
 
 Observable<bool> jumpToPictorial(String url, String nowPage, String beforPage,
      String button_name) {
-  print("startTIME $startTime");
   return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_PICTORIAL", {
     "url": url,
     "page_name": nowPage,
     "referrer": beforPage,
-    "in": startTime,
+    "in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));
@@ -54,11 +52,10 @@ Observable<bool> jumpToPictorial(String url, String nowPage, String beforPage,
 
 Observable<bool> jumpToSearch(
     String nowPage, String beforPage, String button_name) {
-  print("startTIME $startTime");
   return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_SEARCH", {
     "page_name": nowPage,
     "referrer": beforPage,
-    "in": startTime,
+    "in": startTime==null?DateTime.now().millisecondsSinceEpoch:startTime,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));

lib/main.dart

@@ -90,17 +90,17 @@ class _MyAppState extends State<MyApp> {
       routes: {
         // '/': (context) => CommentSuggest({"Cookie":" _gm_token=7e48641558699683; sessionid=nb3ze4ur7ucosln8sd8pzwojddenv9ym; _gtid=a1bc0a387e1911e996b9525400fa516d4094"}),
         '/': (context) {
-          Api.getInstance().initBuildConfig({
-            'Cookie':
-                '_gm_token=72ee1c1569466411; _gtid=58d3cc14df8711e99736525400e82fab81; sessionid=vhksn66854pejzjwi8ljhrmcew3domh2',
-            "buildConfig": "debug"
-          });
-          return RouterCenterImpl()
-              .findActivityReportRouter()
-              ?.getActivityReportPage(279, 1, '');
+//          Api.getInstance().initBuildConfig({
+//            'Cookie':
+//                '_gm_token=72ee1c1569466411; _gtid=58d3cc14df8711e99736525400e82fab81; sessionid=vhksn66854pejzjwi8ljhrmcew3domh2',
+//            "buildConfig": "debug"
+//          });
 //          return RouterCenterImpl()
-//              .findAlbumRouter()
-//              .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
+//              .findActivityReportRouter()
+//              ?.getActivityReportPage(279, 1, '');
+          return RouterCenterImpl()
+              .findAlbumRouter()
+              .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
         },
       },
 

pubspec.lock

@@ -211,8 +211,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
-      resolved-ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
+      ref: "4e7c15a7f1e1b7c17655e87ab3ad3434bbe5cdae"
+      resolved-ref: "4e7c15a7f1e1b7c17655e87ab3ad3434bbe5cdae"
       url: "git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git"
     source: git
     version: "0.0.735"

pubspec.yaml

@@ -34,7 +34,7 @@ dependencies:
   gengmei_flutter_plugin:
     git:
       url: 'git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git'
-      ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
+      ref: "4e7c15a7f1e1b7c17655e87ab3ad3434bbe5cdae"
 
 
 dev_dependencies: