Merge branch 'test' of https://git.oa00.com/recook/recook into test

# Conflicts:
#	lib/pages/user/functions/user_benefit_func.dart
#	lib/pages/user/model/user_income_model1.dart
#	lib/pages/user/user_benefit_currency_pag.dart

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.0.0",
+  "flutterSdkVersion": "2.0.2",
   "flavors": {}
 }

android/build.gradle

@@ -4,6 +4,9 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url "https://mvn.mob.com/android"
+        }
     }
 
     dependencies {
@@ -18,6 +21,10 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url "https://mvn.mob.com/android"
+        }
+        
     }
 }
 

ios/Podfile

@@ -78,5 +78,8 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
+    end
   end
 end

ios/Podfile.lock

@@ -450,6 +450,6 @@ SPEC CHECKSUMS:
   webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
   WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
 
-PODFILE CHECKSUM: c6a56d267dffea0219218982f38a1cc8d204035b
+PODFILE CHECKSUM: 80e178f7acd39d9ad7aacc7d6a4e9dea0cb945ea
 
 COCOAPODS: 1.10.1

lib/pages/home/classify/classify_page.dart

@@ -176,7 +176,7 @@ class _ClassifyPageState extends BaseStoreState<ClassifyPage>
 
                 if (currentIndex < widget.data.length - 1 &&
                     notification.metrics.pixels.toInt() >
-                        notification.metrics.maxScrollExtent + 120) {
+                      ( notification.metrics.maxScrollExtent + 120).toInt()) {
                   if (!animating) {
                     animating = true;
                     currentIndex++;

lib/pages/home/home_page.dart

@@ -1421,9 +1421,17 @@ class _HomePageState extends BaseStoreState<HomePage>
   }
 
   Future<bool> requestPermission() async {
-    bool permission = await Permission.locationWhenInUse.isGranted;
+    if (Platform.isIOS) {
+      return true;
+    }
+    bool permission = await Permission.locationWhenInUse.isRestricted;
+    bool permanentDenied =
+        await Permission.locationWhenInUse.isPermanentlyDenied;
     if (!permission) {
-     await Permission.locationWhenInUse.request();
+      await Permission.locationWhenInUse.request();
+      if (permanentDenied) {
+        await PermissionTool.showOpenPermissionDialog(context, '打开定位权限');
+      }
       permission = await Permission.locationWhenInUse.isGranted;
     }
     return permission;
@@ -1431,7 +1439,7 @@ class _HomePageState extends BaseStoreState<HomePage>
 
   //抽奖功能
   _userLottery() async {
-    //TODO 暂时移除抽奖功能（大概率以后用不到）
+    //暂时移除抽奖功能（大概率以后用不到）
     // ResultData resultData = await HttpManager.post(
     //   UserApi.user_lottery,
     //   {'userID': UserManager.instance.user.info.id},

lib/pages/user/functions/user_benefit_func.dart

@@ -31,7 +31,6 @@ class UserBenefitFunc {
       if (result.data['data'] != null) {
         return UserIncomeModel.fromJson(result.data['data']);
       }
-    }
   }
 
   //未到账收益

lib/pages/user/model/user_income_model1.dart

@@ -0,0 +1,88 @@
+class UserIncomeModel1 {
+  num amount;
+  num all;
+  List<Detial> detial;
+
+  UserIncomeModel1({this.amount, this.all, this.detial});
+
+  UserIncomeModel1.fromJson(Map<String, dynamic> json) {
+    amount = json['amount'];
+    all = json['all'];
+    if (json['detial'] != null) {
+      detial = new List<Detial>();
+      json['detial'].forEach((v) {
+        detial.add(new Detial.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['amount'] = this.amount;
+    data['all'] = this.all;
+    if (this.detial != null) {
+      data['detial'] = this.detial.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class Detial {
+  int date;
+  num sale;
+  int count;
+  num coin;
+  List<Detail> detail;
+
+  Detial({this.date, this.sale, this.count, this.coin, this.detail});
+
+  Detial.fromJson(Map<String, dynamic> json) {
+    date = json['date'];
+    sale = json['sale'];
+    count = json['count'];
+    coin = json['coin'];
+    if (json['detail'] != null) {
+      detail = new List<Detail>();
+      json['detail'].forEach((v) {
+        detail.add(new Detail.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['date'] = this.date;
+    data['sale'] = this.sale;
+    data['count'] = this.count;
+    data['coin'] = this.coin;
+    if (this.detail != null) {
+      data['detail'] = this.detail.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class Detail {
+  int date;
+  num sale;
+  int count;
+  num coin;
+
+  Detail({this.date, this.sale, this.count, this.coin});
+
+  Detail.fromJson(Map<String, dynamic> json) {
+    date = json['date'];
+    sale = json['sale'];
+    count = json['count'];
+    coin = json['coin'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['date'] = this.date;
+    data['sale'] = this.sale;
+    data['count'] = this.count;
+    data['coin'] = this.coin;
+    return data;
+  }
+}

lib/pages/user/user_benefit_currency_pag.dart

@@ -494,7 +494,6 @@ class _UserBenefitCurrencyPageState extends State<UserBenefitCurrencyPage> {
           for (int i = 0; i < _gone.length; i++) {
             _gone[i] = true;
           }
-
           print(_models?.amount?.toStringAsFixed(2));
           print(_models?.all?.toStringAsFixed(2));
           setState(() {});

pubspec.yaml

@@ -2,7 +2,7 @@ name: recook
 description: Recook Market App.
 publish_to: "none"
 
-version: 1.8.5-dev+304
+version: 1.8.6-dev+305
 environment:
   sdk: ">=2.10.0 <3.0.0"
 

tool/grind.dart

@@ -101,7 +101,8 @@ clean() => defaultClean();
 
 @Task()
 buildApk() async {
-  await runAsync('flutter', arguments: [
+  await runAsync('fvm', arguments: [
+    'flutter',
     'build',
     'apk',
     '--target-platform=android-arm64',
@@ -119,7 +120,8 @@ buildApk() async {
 @Task()
 @Depends(getVersion)
 buildApkDev() async {
- await runAsync('flutter', arguments: [
+ await runAsync('fvm', arguments: [
+   'flutter',
     'build',
     'apk',
     '--target-platform=android-arm64',
@@ -137,10 +139,15 @@ buildApkDev() async {
 
 @Task()
 buildIos() async {
-  runAsync('flutter',
-      arguments: ['build', 'ios', '--dart-define', 'ISDEBUG=false']);
+  runAsync('fvm',
+      arguments: ['flutter','build', 'ios', '--dart-define', 'ISDEBUG=false']);
 }
 
+@Task()
+builIosDev()async{
+ runAsync('fvm',
+      arguments: ['flutter','build', 'ios', '--dart-define', 'ISDEBUG=true']);
+}
 @Task()
 Future<String> getVersion() async {
   String projectPath = Directory('.').absolute.path;