Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !22

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -4,6 +4,9 @@
  * @Last Modified by: zx
  * @Last Modified time: 2020-07-03 13:47:57
  */
+import 'dart:ffi';
+import 'dart:math';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gm_flutter/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart';
@@ -29,7 +32,6 @@ class PlanCompareDetailPage extends StatefulWidget {
 class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
   PlanCompareDetailModel _model = new PlanCompareDetailModel();
   double screenWidth;
-
   @override
   void initState() {
     super.initState();
@@ -44,10 +46,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
 
   @override
   Widget buildItem(BuildContext context) {
-    screenWidth = MediaQuery
-        .of(context)
-        .size
-        .width;
+    screenWidth = MediaQuery.of(context).size.width;
     return Scaffold(
         appBar: baseAppBar(
             title: "对比详情",
@@ -66,14 +65,8 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
       initialData: _model.stateLive.data ?? LOADING,
       builder: (c, data) {
         if (data.data == FAIL) {
-          return errorItem(MediaQuery
-              .of(context)
-              .size
-              .width,
-              MediaQuery
-                  .of(context)
-                  .size
-                  .height, () {
+          return errorItem(MediaQuery.of(context).size.width,
+              MediaQuery.of(context).size.height, () {
             _model.init(widget._planIds);
           });
         }
@@ -96,14 +89,8 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
               initialData: _model.detailLive.data ?? Pair(LOADING, null),
               builder: (c, data) {
                 if (data.data.first == FAIL) {
-                      return errorItem(MediaQuery
-                          .of(context)
-                          .size
-                          .width,
-                          MediaQuery
-                              .of(context)
-                              .size
-                              .height, () {
+                  return errorItem(MediaQuery.of(context).size.width,
+                      MediaQuery.of(context).size.height, () {
                     _model.init(widget._planIds);
                   });
                 }
@@ -189,8 +176,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
                 width: (screenWidth - 30 - 11) / 2,
                 child: ClipRRect(
                   borderRadius: BorderRadius.circular(7),
-                      child: Image.asset(
-                          'assets/plan_compare_detail_info_bg.png',
+                  child: Image.asset('assets/plan_compare_detail_info_bg.png',
                       fit: BoxFit.cover),
                 ),
               )),
@@ -203,8 +189,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
           Positioned(
             left: 12,
             top: 48,
-                child: baseText(
-                    '￥' + planinfo.minPrice + '-' + planinfo.maxPrice,
+            child: baseText('￥' + planinfo.minPrice + '-' + planinfo.maxPrice,
                 14, Colors.red,
                 bold: true),
           ),
@@ -260,12 +245,14 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
     return Container(
         height: 170,
         child: Row(children: <Widget>[
-          Expanded(flex: 1, child: planPopularityLeftItem(groups.plans[0])),
-          Expanded(flex: 1, child: planPopularityRightItem(groups.plans[1]))
+          Expanded(
+              flex: 1, child: planPopularityLeftItem(groups.plans[0], groups)),
+          Expanded(
+              flex: 1, child: planPopularityRightItem(groups.plans[1], groups))
         ]));
   }
 
-  Widget planPopularityLeftItem(Plans plan) {
+  Widget planPopularityLeftItem(Plans plan, Groups groups) {
     return Container(
         height: 170,
         child: Stack(children: <Widget>[
@@ -317,7 +304,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
                   Positioned(
                     right: 0,
                     top: 0,
-                    width: 95 * 0.7,
+                    width: 95 * sellCount(0, groups.plans[1]),
                     height: 7,
                     child: ClipRRect(
                       borderRadius: BorderRadius.circular(3.5),
@@ -331,7 +318,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
         ]));
   }
 
-  Widget planPopularityRightItem(Plans plan) {
+  Widget planPopularityRightItem(Plans plan, Groups groups) {
     return Container(
         height: 170,
         child: Stack(children: <Widget>[
@@ -389,7 +376,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
                   Positioned(
                     left: 0,
                     top: 0,
-                    width: 95 * 0.3,
+                    width: 95 * sellCount(1, groups.plans[0]),
                     height: 7,
                     child: ClipRRect(
                       borderRadius: BorderRadius.circular(3.5),
@@ -460,4 +447,16 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
           ),
         ]));
   }
+
+  double sellCount(int index, Plans anotherPlans) {
+    Groups popularity = _model.detailLive.data.second[0];
+    Plans plans = popularity.plans[index];
+    int salesCount = int.parse(plans.salesCount);
+    int anSalesCount = int.parse(plans.salesCount);
+    if (salesCount >= anSalesCount) {
+      return 1.0;
+    } else {
+      return anSalesCount / salesCount;
+    }
+  }
 }