commit

android/app/app.iml

@@ -47,7 +47,6 @@
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
@@ -189,10 +188,10 @@
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="android-xservice_kit" />
+    <orderEntry type="module" module-name="xservice_kit-0.0.29-android-xservice_kit" />
     <orderEntry type="module" module-name="flutter_boost-0.0.420-android-flutter_boost" />
     <orderEntry type="module" module-name="sqflite" />
-    <orderEntry type="module" module-name="path_provider" />
-    <orderEntry type="module" module-name="gengmei_flutter_plugin-0.0.731-android-gengmei_flutter_plugin" />
+    <orderEntry type="module" module-name="android-path_provider" />
+    <orderEntry type="module" module-name="flutter_plugin-588b2bc09dc5e00799c85e51870c8d848e06f074-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>-->
-<!--    </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.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>
 </manifest>

android/app/src/main/res/xml/file_paths.xml

+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <!--path：需要临时授权访问的路径（.代表所有路径）-->
+    <!--name：就是你给这个访问路径起个名字-->
+    <external-path name="InstructiveRide" path="."/>
+</paths>
\ 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":"c20a2994763866d284b157d4153343f7","build/flutteroutput/aot/isolate_snapshot_data":"915c00e0227ba2a14bcb4b7eb3039545","build/flutteroutput/aot/isolate_snapshot_instr":"94944faad5c5a0a9e89e67b6e93f88ae","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":"074b99da2a45a038a6acc6e4cd6fd4fb","build/flutteroutput/aot/isolate_snapshot_data":"1f2ea3d0a682b4b684c36e58a7bcb80e","build/flutteroutput/aot/isolate_snapshot_instr":"9bb3badc3952ffd436b837f14f8227c4","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file

flutter.sh

@@ -111,22 +111,24 @@ cp -r /Users/apple/lsy/aar/jni/armeabi-v7a/* /Users/apple/lsy/gmalpha_flutter/bu
 
 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 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 add .
-#git commit -m "change app.so"
-#git push
+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
@@ -154,6 +156,7 @@ git push
 #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 " change App.framwork"
 #git push
@@ -163,16 +166,17 @@ git push
 #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 " change App.framwork"
 #git push
-
+#
+#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 .
 
-#python /Users/apple/lsy/update.py
 
 #cd ios/Pods
 #/usr/bin/env xcrun xcodebuild build -configuration Release ARCHS='arm64 armv7' -target flutter_boost BUILD_DIR=../../build/ios -sdk iphoneos -quiet

ios/.symlinks/plugins/gengmei_flutter_plugin

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

ios/Podfile.lock

@@ -46,7 +46,7 @@ SPEC CHECKSUMS:
   Flutter: 446b87ace8a3747a167979213b4aef59a0b5e5fa
   flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  gengmei_flutter_plugin: e1c4baf28b9004bfab468afbbcd2a4d80e5c66d5
+  gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156
   path_provider: d6b45f2abd6d46082316e15beadf67eeb95adb2a
   sqflite: 5ba50d7e98116c306c2d9c67067d2c963bdb4c9e
   xservice_kit: 076aa63eef6fad67a8fd1542f7b1cabb5a8b23fc

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

@@ -21,7 +21,13 @@
     ]
   },
   "platforms": {
-    "ios": "9.0"
+    "ios": "8.0"
   },
-  "vendored_frameworks": "Classes/*.framework"
+  "vendored_frameworks": "Classes/*.framework",
+  "frameworks": [
+    "AssetsLibrary",
+    "CoreMedia",
+    "AVFoundation",
+    "Accelerate"
+  ]
 }

ios/Pods/Manifest.lock

@@ -46,7 +46,7 @@ SPEC CHECKSUMS:
   Flutter: 446b87ace8a3747a167979213b4aef59a0b5e5fa
   flutter_boost: dd4635cb5672549d64a0a9e47accd1e9ee1c4de8
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  gengmei_flutter_plugin: e1c4baf28b9004bfab468afbbcd2a4d80e5c66d5
+  gengmei_flutter_plugin: 9461e8644c06c4a0e38292ddcca1cc55e6ac6156
   path_provider: d6b45f2abd6d46082316e15beadf67eeb95adb2a
   sqflite: 5ba50d7e98116c306c2d9c67067d2c963bdb4c9e
   xservice_kit: 076aa63eef6fad67a8fd1542f7b1cabb5a8b23fc

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

@@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${
 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'
-OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
+OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

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

@@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${
 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'
-OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
+OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

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

@@ -2,7 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${
 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'
-OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
+OTHER_LDFLAGS = $(inherited) -l"c++" -l"sqlite3" -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia" -framework "FMDB" -framework "Flutter" -framework "flutter_boost" -framework "gengmei_flutter_plugin" -framework "path_provider" -framework "sqflite" -framework "xservice_kit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

ios/Pods/Target Support Files/gengmei_flutter_plugin/gengmei_flutter_plugin-umbrella.h

@@ -12,6 +12,7 @@
 
 #import "GengmeiFlutterPlugin.h"
 #import "AlbumItem.h"
+#import "ResultManager.h"
 
 FOUNDATION_EXPORT double gengmei_flutter_pluginVersionNumber;
 FOUNDATION_EXPORT const unsigned char gengmei_flutter_pluginVersionString[];

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"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "Accelerate" -framework "AssetsLibrary" -framework "CoreMedia"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}

lib/ActivityReportModel/page/ActivityReportPage.dart

@@ -40,13 +40,16 @@ class ActivityReportState extends State<ActivityReportPage> {
   @override
   Widget build(BuildContext context) {
     ScreenUtil.instance = ScreenUtil(width: 375, height: 667)..init(context);
-    return Scaffold(
+    return IMAGE.WillPopScope(
+      child: Scaffold(
           appBar: AppBar(
             title: Text(''),
             centerTitle: true,
-          leading: GestureDetector(
-            onTap: (){
-              Navigator.pop(context,"");
+            leading: IMAGE.GestureDetector(
+              onTap: () {
+                click("brand_report", "return");
+                _model.end();
+                Navigator.pop(context, "");
                 jumpToSearch();
               },
               child: IMAGE.Image.asset("images/nav_back.png"),
@@ -64,7 +67,9 @@ class ActivityReportState extends State<ActivityReportPage> {
                               fontWeight: FontWeight.bold),
                         ))),
                 onTap: () {
-                Navigator.pop(context,"");
+                  click("brand_report", "test_again");
+                  _model.end();
+                  Navigator.pop(context, "");
                   jumpToH5();
                 },
               )
@@ -90,14 +95,21 @@ class ActivityReportState extends State<ActivityReportPage> {
                     children: <Widget>[
                       TopCard(share: data.data.data.report?.share),
                       SizedBox(height: ScreenUtil().setHeight(8)),
-                    PictorialCard(pictorialList: data.data.data.report?.cards, id: _model.id),
+                      PictorialCard(_model,
+                        pictorialList: data.data.data.report?.cards,
+                        id: _model.id,),
                       SizedBox(height: ScreenUtil().setHeight(38))
                     ],
                   ),
                 ),
               );
             },
-        ));
+          )),
+      onWillPop: (){
+        _model.end();
+        Navigator.pop(context, "");
+      },
+    );
   }
 
   Widget errorItem(String reason) {
@@ -113,7 +125,6 @@ class ActivityReportState extends State<ActivityReportPage> {
   @override
   void dispose() {
     super.dispose();
-    _model.end();
     _model.dispose();
   }
 }
@@ -122,8 +133,8 @@ class TopCard extends StatelessWidget {
   final share;
 
   TopCard({Key key, this.share}) : super(key: key);
-  _moneyContainer(val) {
 
+  _moneyContainer(val) {
     return Container(
         child: Column(
       children: <Widget>[
@@ -161,8 +172,7 @@ class TopCard extends StatelessWidget {
               style: TextStyle(
                   fontSize: ScreenUtil().setSp(20),
                   color: _goldenColor,
-              fontWeight: FontWeight.bold
-            ),
+                  fontWeight: FontWeight.bold),
             ),
             SizedBox(width: 4),
             Text(
@@ -187,16 +197,13 @@ class TopCard extends StatelessWidget {
             style: TextStyle(
                 fontSize: ScreenUtil().setSp(20),
                 color: _goldenColor,
-                fontWeight: FontWeight.bold
-              ),
+                fontWeight: FontWeight.bold),
           ),
           SizedBox(width: 4),
           Text(
             '名',
             style: TextStyle(
-                fontSize: 11,
-                color: _goldenColor,
-                fontWeight: FontWeight.bold),
+                fontSize: 11, color: _goldenColor, fontWeight: FontWeight.bold),
           )
         ],
       ),
@@ -205,7 +212,7 @@ class TopCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if(share == null) {
+    if (share == null) {
       return Container();
     }
     return Container(
@@ -239,7 +246,7 @@ class TopCard extends StatelessWidget {
                     style: TextStyle(
                       color: ALColors.Color323232,
                       fontSize: ScreenUtil().setSp(12),
-                      height: 17/12,
+                      height: 17 / 12,
                       fontWeight: FontWeight.bold,
                       letterSpacing: 1.5,
                     ),
@@ -354,11 +361,11 @@ class TopCard extends StatelessWidget {
 class PictorialCard extends StatelessWidget {
   final List<Cards> pictorialList;
   final id;
+  final ActivityReportModel _model;
 
-  PictorialCard({Key key, this.pictorialList, this.id}) : super(key: key);
+  PictorialCard(this._model,{Key key, this.pictorialList, this.id}) : super(key: key);
 
   Widget _gridViewItemUI(BuildContext context, item) {
-
     return Container(
         width: ScreenUtil().setWidth(110),
         height: ScreenUtil().setWidth(110),
@@ -366,19 +373,21 @@ class PictorialCard extends StatelessWidget {
           imageUrl: '${item.image}',
           width: ScreenUtil().setWidth(110),
           fit: BoxFit.cover,
-        )
-      );
+        ));
   }
 
   Widget _listViewUI(BuildContext context, item) {
+    var indexOf = pictorialList.indexOf(item);
     List<Widget> list = [];
     item.drafts.forEach((item) {
       list.add(_gridViewItemUI(context, item));
     });
     return Container(
-      margin: EdgeInsets.only(top: 32),
+        margin: EdgeInsets.only(top: ScreenUtil().setHeight(32)),
         child: GestureDetector(
             onTap: () {
+              click("brand_report", "recommand_${indexOf + 1}");
+              _model.end();
               jumpToPictorial('${item.protocol}&survey_record_id=$id');
             },
             child: Column(
@@ -386,14 +395,13 @@ class PictorialCard extends StatelessWidget {
               children: <Widget>[
                 Container(
                   width: ScreenUtil().setWidth(343),
-                margin: EdgeInsets.only(bottom: ScreenUtil().setHeight(14)),
-                child: Wrap(
-                  spacing: 6,
-                  children: list),
+                  padding:
+                      EdgeInsets.only(bottom: ScreenUtil().setHeight(11.0)),
+                  child: Wrap(spacing: 6, children: list),
                 ),
                 Container(
-                  width: double.maxFinite,
-                  height: 53,
+                    width: ScreenUtil().setWidth(343),
+                    height: ScreenUtil().setHeight(53),
                     color: Colors.white,
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
@@ -402,7 +410,8 @@ class PictorialCard extends StatelessWidget {
                         Stack(
                           children: <Widget>[
                             Container(
-                            padding: EdgeInsets.only(right: ScreenUtil().setWidth(12)),
+                              padding: EdgeInsets.only(
+                                  right: ScreenUtil().setWidth(12)),
                               child: Text(
                                 '${item.guide}',
                                 style: TextStyle(
@@ -425,14 +434,12 @@ class PictorialCard extends StatelessWidget {
                       ],
                     ))
               ],
-          )
-        )
-      );
+            )));
   }
 
   @override
   Widget build(BuildContext context) {
-    if(pictorialList == null) {
+    if (pictorialList == null) {
       return Container();
     }
     return Column(

lib/AlbumModel/AlbumRouter.dart

@@ -10,6 +10,6 @@ import 'package:gmalpha_flutter/Annotations/anno/Router.dart';
 
 @Router("albumModel", AlbumRouterImpl)
 abstract class AlbumRouter implements RouterBaser {
-  Widget getAlbumPage(
+  Widget getAlbumPage(String provider,
       bool showCamera, int bigSelectImage, List<String> selectedImages);
 }

lib/AlbumModel/AlbumRouterImpl.dart

@@ -9,8 +9,8 @@ import 'package:gmalpha_flutter/AlbumModel/page/album/AlbumPage.dart';
 
 class AlbumRouterImpl implements AlbumRouter {
   @override
-  Widget getAlbumPage(
+  Widget getAlbumPage(String provider,
       bool showCamera, int bigSelectSize, List<String> selectedImages) {
-    return AlbumPage(showCamera, bigSelectSize, selectedImages);
+    return AlbumPage(provider,showCamera, bigSelectSize, selectedImages);
   }
 }

lib/AlbumModel/page/album/AlbumModel.dart

@@ -28,6 +28,8 @@ class AlbumModel extends BaseModel {
   String _nowDirName = MainDir;
   StreamSubscription _listen;
   bool showCamera = true;
+  final String provider;
+
   int _maxCount = 1;
 
   get selectList => _selectList;
@@ -48,7 +50,8 @@ class AlbumModel extends BaseModel {
 
   get dirList => _dirList;
 
-  AlbumModel(this.showCamera, int maxCount, List<String> selectedList) {
+  AlbumModel(
+      this.provider, this.showCamera, int maxCount, List<String> selectedList) {
     this._maxCount = maxCount;
     if (selectedList != null && !selectedList.isEmpty) {
       this._selectList.clear();
@@ -105,10 +108,10 @@ class AlbumModel extends BaseModel {
       if (value != null) {
         _mainValue = value;
         value.forEach((key, eachValue) {
-          print("VALUE!!!  $eachValue");
+          print("VALUE!!!  $key");
           if (eachValue != null && !eachValue.isEmpty) {
             if (key == MainDir) {
-//              albumLive.notifyView(eachValue);
+              albumLive.notifyView(eachValue);
               titleData.notifyView(MainDirExplain);
               _dirList.add(DirBean(
                   MainDirExplain, eachValue.length, File(eachValue[0].path)));
@@ -186,7 +189,7 @@ class AlbumModel extends BaseModel {
     if (_selectList.isEmpty) {
       Navigator.pop(context, "");
     } else {
-      Navigator.pop(context, _selectList[0]);
+      Navigator.pop(context, _selectList);
     }
   }
 

lib/AlbumModel/page/album/AlbumPage.dart

@@ -13,8 +13,9 @@ import 'AlbumModel.dart';
 class AlbumPage extends StatefulWidget {
   AlbumModel model;
 
-  AlbumPage(bool showCamera, int maxCount, List<String> selectedList) {
-    model = new AlbumModel(showCamera, maxCount, selectedList);
+  AlbumPage(String provider, bool showCamera, int maxCount,
+      List<String> selectedList) {
+    model = new AlbumModel(provider, showCamera, maxCount, selectedList);
   }
 
   @override
@@ -32,7 +33,6 @@ class AlbumState extends State<AlbumPage> {
     _model.initScanImages(context);
   }
 
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -131,9 +131,10 @@ class AlbumState extends State<AlbumPage> {
               crossAxisSpacing: 5,
               mainAxisSpacing: 5,
               childAspectRatio: 1),
-          itemCount: imgList.data.length + 2,
+          itemCount:
+              _model.showCamera ? imgList.data.length + 1 : imgList.data.length,
           itemBuilder: (BuildContext context, int index) {
-            if (index == 0) {
+            if (index == 0 && _model.showCamera) {
               return GestureDetector(
                   onTap: () => _model.nativeCamera(context),
                   child: Container(
@@ -154,28 +155,7 @@ class AlbumState extends State<AlbumPage> {
                         ],
                       )));
             }
-            if (index == 1) {
-              return GestureDetector(
-                  onTap: () => _model.AiCamera(context),
-                  child: Container(
-                      color: Colors.orange,
-                      child: Column(
-                        children: <Widget>[
-                          Expanded(
-                            child: Container(),
-                          ),
-                          Icon(Icons.camera_alt),
-                          Container(
-                            margin: EdgeInsets.fromLTRB(0, 5, 0, 0),
-                            child: Text("AI相机"),
-                          ),
-                          Expanded(
-                            child: Container(),
-                          ),
-                        ],
-                      )));
-            }
-            int newIndex = index - 2;
+            int newIndex = _model.showCamera ? index - 1 : index;
             if (imgList.data[newIndex] == null ||
                 imgList.data[newIndex].path == null) {
               return Icon(

lib/AlbumModel/repository/AlbumRepository.dart

@@ -39,7 +39,7 @@ class AlbumRepository {
   }
 
   Observable<String> nativeCamera() {
-//    return Observable.fromFuture(GengmeiFlutterPlugin.nativeCamera());
+    return Observable.fromFuture(GengmeiFlutterPlugin.nativeCamera(""));
   }
 
   Observable<String> aiCamera() {

lib/main.dart

@@ -28,12 +28,13 @@ class _MyAppState extends State<MyApp> {
       'comment_suggest': (pageName, params, _) => CommentSuggest(params),
       'message_home': (pageName, params, _) => MessageHomePage(params),
       'album': (pageName, params, _) {
+        var provider=params["provider"] as String;
         var param = params["needCamera"] as bool;
         var param1 = params["maxCount"] as int;
         var param2 = params["selectedPath"] as List<String>;
         return RouterCenterImpl()
             .findAlbumRouter()
-            .getAlbumPage(param, param1, param2);
+            .getAlbumPage(provider,param, param1, param2);
       },
       "prestige": (pageName, params, _) {
         String fromPage = params["fromPage"];
@@ -77,15 +78,18 @@ 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"});
-    //       return RouterCenterImpl().findActivityReportRouter()?.getActivityReportPage(169, 1, '');
-    //     },
-    //  },
-
+      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()
+//              .findAlbumRouter()
+//              .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
+        },
+      },
 
       //调试的时候可以打开
       builder: FlutterBoost.init(postPush: _onRoutePushed),

pubspec.lock

@@ -210,10 +210,12 @@ packages:
   gengmei_flutter_plugin:
     dependency: "direct main"
     description:
-      name: gengmei_flutter_plugin
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.731"
+      path: "."
+      ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
+      resolved-ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
+      url: "git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git"
+    source: git
+    version: "0.0.735"
   glob:
     dependency: transitive
     description:

pubspec.yaml

@@ -28,9 +28,13 @@ dependencies:
   rxdart: ^0.22.0  #链式编程
   pull_to_refresh: ^1.5.0
   flutter_boost: ^0.0.420
-  gengmei_flutter_plugin: ^0.0.731
+#  gengmei_flutter_plugin: ^0.0.731
   cached_network_image: ^1.1.1
   flutter_screenutil: ^0.5.3
+  gengmei_flutter_plugin:
+    git:
+      url: 'git@git.wanmeizhensuo.com:linshengyu/flutter_plugin.git'
+      ref: "588b2bc09dc5e00799c85e51870c8d848e06f074"
 
 
 dev_dependencies: