ciommit

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":"d1fc90937151d321097b8d6480f6dd1f","build/flutteroutput/aot/isolate_snapshot_data":"69213d2c044fbf7a43df17535b7589ad","build/flutteroutput/aot/isolate_snapshot_instr":"ba98dffff235ed3b3d0aa287ac98e46f","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":"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"}}
\ No newline at end of file

flutter.sh

@@ -9,7 +9,6 @@ buildDebug=1
 upload=0
 suff=debug
 
-
 dif=debug
 #dif=release
 message=埋点字段写反问题
@@ -21,7 +20,6 @@ else
 fi
 
 
-
 #=====更新版本号 TODO
 #cd /Users/apple/lsy/MergeTest
 #v=`grep ext.PUBLISH_VERSION build.gradle|cut -d'=' -f2`
@@ -42,137 +40,121 @@ fi
 #    exit
 #fi
 
-#  ======old=====
-#cd ${rootDir}/cache/artifacts/engine/android-arm-release
-#rm -rf lib
-#rm -rf io
-#unzip flutter.jar
-#mkdir ${projectDir}/android/app/src/main/assets
-#rm -rf ${projectDir}/android/app/src/main/assets/io
-#rm -rf ${projectDir}/android/app/src/main/assets/lib
-
-#mv ${pwd}io/* ${projectDir}/android/app/src/main/assets/io/
-#mv ${pwd}lib/* ${projectDir}/android/app/src/main/assets/lib/
-#cp ${pwd}darwin-x64/gen_snapshot ${projectDir}/android/app/src/main/assets/gen_snapshot
-#cd ..
-#cd darwin-x64/
-#cp ${pwd}icudtl.dat ${projectDir}/android/app/src/main/assets/
-
 #====clean
-cd ${projectDir}
-${rootFlutter} clean
-export PUB_HOSTED_URL=https://pub.flutter-io.cn
-export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
-${rootFlutter} packages get
-
+function clean(){
+    cd ${projectDir}
+    ${rootFlutter} clean
+    export PUB_HOSTED_URL=https://pub.flutter-io.cn
+    export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn
+    ${rootFlutter} packages get
+}
 
 #====build android
-${rootFlutter} build aot --release --output-dir=build/flutteroutput/aot
-${rootFlutter} build bundle --precompiled --asset-dir=build/flutteroutput/flutter_assets
-#
-rm -f -r android/packflutter/flutter/
-echo 'Copy flutter jar'
-mkdir -p android/packflutter/flutter/flutter/android-arm-release && cp ${rootDir}/cache/artifacts/engine/android-arm-release/flutter.jar "$_"
-echo 'Copy flutter asset'
-mkdir -p android/packflutter/flutter/assets/release && cp -r build/flutteroutput/aot/* "$_"
-mkdir -p android/packflutter/flutter/assets/release/flutter_assets && cp -r build/flutteroutput/flutter_assets/* "$_"
-echo 'Build and publish idlefish flutter to aar'
+function android(){
+    ${rootFlutter} build aot --release --output-dir=build/flutteroutput/aot
+    ${rootFlutter} build bundle --precompiled --asset-dir=build/flutteroutput/flutter_assets
+    rm -f -r android/packflutter/flutter/
+    echo 'Copy flutter jar'
+    mkdir -p android/packflutter/flutter/flutter/android-arm-release && cp ${rootDir}/cache/artifacts/engine/android-arm-release/flutter.jar "$_"
+    echo 'Copy flutter asset'
+    mkdir -p android/packflutter/flutter/assets/release && cp -r build/flutteroutput/aot/* "$_"
+    mkdir -p android/packflutter/flutter/assets/release/flutter_assets && cp -r build/flutteroutput/flutter_assets/* "$_"
+    echo 'Build and publish idlefish flutter to aar'
+
+    cd android/
+    if [ $buildDebug -eq  0 ]; then
+        ./gradlew assembleDebug
+    else
+        ./gradlew assembleRelease
+    fi
+    cd ..
+
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/app.aar
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/flutter_boost/outputs/aar/flutter_boost-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/flutter_boost.aar
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/gengmei_flutter_plugin/outputs/aar/gengmei_flutter_plugin-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/gengmei_flutter_plugin.aar
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/path_provider/outputs/aar/path_provider-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/path_provider.aar
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/sqflite/outputs/aar/sqflite-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/sqflite.aar
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/xservice_kit/outputs/aar/xservice_kit-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/xservice_kit.aar
+
+    cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/aar/app-${suff}.zip
+    cd /Users/apple/lsy/aar
+    unzip /Users/apple/lsy/aar/app-${suff}.zip
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/MergeTest/app/libs/jniLibs/armeabi-v7a/
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/Test/app/libs/armeabi-v7a/
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/gmalpha_flutter/build/
+    cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/aar_update/androd${message}/
+}
+
+function android_publish(){
+    cd /Users/apple/lsy/gengmei_alpha
+    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
+    git status
+    git add .
+    git commit -m "change app.so"
+    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
+    git status
+    git add .
+    git commit -m "change app.so"
+    git push
+}
 
-
-
-cd android/
-if [ $buildDebug -eq  0 ]; then
-    ./gradlew assembleDebug
-else
+#====upload
+function upload_android_aar(){
+    cd /Users/apple/lsy/MergeTest
+    ./gradlew clean
     ./gradlew assembleRelease
-fi
-cd ..
+    ./gradlew uploadArchives
+    cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/Test/app/libs/
+    cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/gmalpha_flutter/build/
 
-rm -rf /Users/apple/lsy/aar/
-mkdir /Users/apple/lsy/aar/
-rm -rf /Users/apple/lsy/aar_update/
-mkdir /Users/apple/lsy/aar_update/
-mkdir /Users/apple/lsy/aar_update/androd${message}/
-mkdir /Users/apple/lsy/aar_update/ios${message}/
-cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/app.aar
-cp -r /Users/apple/lsy/gmalpha_flutter/build/flutter_boost/outputs/aar/flutter_boost-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/flutter_boost.aar
-cp -r /Users/apple/lsy/gmalpha_flutter/build/gengmei_flutter_plugin/outputs/aar/gengmei_flutter_plugin-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/gengmei_flutter_plugin.aar
-cp -r /Users/apple/lsy/gmalpha_flutter/build/path_provider/outputs/aar/path_provider-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/path_provider.aar
-cp -r /Users/apple/lsy/gmalpha_flutter/build/sqflite/outputs/aar/sqflite-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/sqflite.aar
-cp -r /Users/apple/lsy/gmalpha_flutter/build/xservice_kit/outputs/aar/xservice_kit-${suff}.aar /Users/apple/lsy/MergeTest/app/libs/xservice_kit.aar
-
-cp -r /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-${suff}.aar /Users/apple/lsy/aar/app-${suff}.zip
-#mv /Users/apple/lsy/gmalpha_flutter/build/app/outputs/aar/app-debug.aar /Users/apple/lsy/aar/app-debug.zip
-cd /Users/apple/lsy/aar
-unzip /Users/apple/lsy/aar/app-${suff}.zip
-cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/MergeTest/app/libs/jniLibs/armeabi-v7a/
-cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/Test/app/libs/armeabi-v7a/
-cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/gmalpha_flutter/build/
-
-cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/libapp.so /Users/apple/lsy/aar_update/androd${message}/
-
-cd /Users/apple/lsy/gengmei_alpha
-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
-git status
-git add .
-git commit -m "change app.so"
-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
-git status
-git add .
-git commit -m "change app.so"
-git push
-
-
-#====upload
-#cd /Users/apple/lsy/MergeTest
-#./gradlew clean
-#./gradlew assembleRelease
-#./gradlew uploadArchives
-#cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/Test/app/libs/
-#cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/gmalpha_flutter/build/
-#
-#cd /Users/apple/lsy/flutter_aar
-#git add .
-#git commit -m "commit "
-#git push
+    cd /Users/apple/lsy/flutter_aar
+    git add .
+    git commit -m "commit "
+    git push
+}
 
 
 
 # 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}/
-#
-cd /Users/apple/lsy/GMAlpha
-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
-git status
-git add .
-git commit -m " change App.framwork"
-git push
-#
-
-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
-git status
-git add .
-git commit -m " change App.framwork"
-git push
-
-python /Users/apple/lsy/update.py
-#
+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}/
+}
+
+function ios_publish(){
+    cd /Users/apple/lsy/GMAlpha
+    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
+    git status
+    git add .
+    git add -a
+    git commit -m " change App.framwork"
+    git push
+
+    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
+    git status
+    git add .
+    git commit -m " change App.framwork"
+    git push
+}
+
+function notifyDingDing(){
+    python /Users/apple/lsy/update.py
+}
 #cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/Flutter.framework /Users/apple/lsy/aar_update/ios${message}/
 #cd /Users/apple/lsy/aar_update/
 #open .
@@ -218,12 +200,19 @@ python /Users/apple/lsy/update.py
 #    lipo -create "../../build/ios/Debug-iphonesimulator/${reg_enter_name}/lib${reg_enter_name}.a" "../../build/ios/Release-iphoneos/${reg_enter_name}/lib${reg_enter_name}.a" -o "../../build/ios/Release-iphoneos/${reg_enter_name}/lib${reg_enter_name}.a"
 #done
 
+rm -rf /Users/apple/lsy/aar/
+mkdir /Users/apple/lsy/aar/
+rm -rf /Users/apple/lsy/aar_update/
+mkdir /Users/apple/lsy/aar_update/
+mkdir /Users/apple/lsy/aar_update/androd${message}/
+mkdir /Users/apple/lsy/aar_update/ios${message}/
 
-#test
-#cd ${PWD}/build/app/outputs/aar/
-#open .
-
-#cp ${PWD}/build/app/outputs/aar/app-release.aar /Users/sylin/lsy/PLVideo/app/libs/
-#cp ${PWD}/build/app/outputs/aar/app-debug.aar /Users/sylin/lsy/PLVideo/app/libs/
+clean
+android
+#android_publish
+#upload_android_aar
+ios
+#ios_publish
+#notifyDingDing
 
 exit
\ No newline at end of file

ios/Flutter/App.framework/Info.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>8.0</string>
-</dict>
-</plist>

ios/Flutter/App.framework/flutter_assets/AssetManifest.json

-{"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

ios/Flutter/App.framework/flutter_assets/FontManifest.json

-[{"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

lib/commonModel/base/Temp.dart

@@ -7,14 +7,19 @@ import 'package:rxdart/rxdart.dart';
 
 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, "in": getNowTimeSecond()}));
+      "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, "out": getNowTimeSecond()}));
+      "PAGE_END", {"page_name": nowPage, "referrer": beforPage,
+    "in": startTime,
+    "out": getNowTimeSecond()}));
 }
 
 Observable<bool> click(String page_name, String button_name) {
@@ -24,9 +29,11 @@ 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,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));
@@ -34,10 +41,12 @@ 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,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));
@@ -45,9 +54,11 @@ 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,
     "out": getNowTimeSecond(),
     "button_name": button_name
   }));

lib/main.dart

@@ -87,22 +87,22 @@ class _MyAppState extends State<MyApp> {
       //  initialRoute: '/test',
 ////      调试的时候可以打开
 
-//      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"
-//          });
+      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, '');
 //          return RouterCenterImpl()
-//              .findActivityReportRouter()
-//              ?.getActivityReportPage(279, 1, '');
-////          return RouterCenterImpl()
-////              .findAlbumRouter()
-////              .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
-//        },
-//      },
+//              .findAlbumRouter()
+//              .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
+        },
+      },
 
       //调试的时候可以打开
       builder: FlutterBoost.init(postPush: _onRoutePushed),