添加判断题，完成问卷调查逻辑

lib/model/manager/quetionnaire_submit_model.dart

@@ -0,0 +1,50 @@
+// class QuestionnaireSubmitModel {
+//   int id;
+//   List<AppQuestionnaireAnswerSubmits> appQuestionnaireAnswerSubmits;
+
+//   QuestionnaireSubmitModel({this.id, this.appQuestionnaireAnswerSubmits});
+
+//   QuestionnaireSubmitModel.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     if (json['appQuestionnaireAnswerSubmits'] != null) {
+//       appQuestionnaireAnswerSubmits = new List<AppQuestionnaireAnswerSubmits>();
+//       json['appQuestionnaireAnswerSubmits'].forEach((v) {
+//         appQuestionnaireAnswerSubmits
+//             .add(new AppQuestionnaireAnswerSubmits.fromJson(v));
+//       });
+//     }
+//   }
+
+//   Map<String, dynamic> toJson() {
+//     final Map<String, dynamic> data = new Map<String, dynamic>();
+//     data['id'] = this.id;
+//     if (this.appQuestionnaireAnswerSubmits != null) {
+//       data['appQuestionnaireAnswerSubmits'] =
+//           this.appQuestionnaireAnswerSubmits.map((v) => v.toJson()).toList();
+//     }
+//     return data;
+//   }
+// }
+
+class AppQuestionnaireAnswerSubmits {
+  int topicId;
+  List<int> choiceAnswer;
+  String shortAnswer;
+
+  AppQuestionnaireAnswerSubmits(
+      {this.topicId, this.choiceAnswer, this.shortAnswer});
+
+  AppQuestionnaireAnswerSubmits.fromJson(Map<String, dynamic> json) {
+    topicId = json['topicId'];
+    choiceAnswer = json['choiceAnswer'].cast<int>();
+    shortAnswer = json['shortAnswer'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['topicId'] = this.topicId;
+    data['choiceAnswer'] = this.choiceAnswer;
+    data['shortAnswer'] = this.shortAnswer;
+    return data;
+  }
+}

lib/ui/manager/questionnaire/questionnaire_detail_page.dart

@@ -1,12 +1,13 @@
 import 'package:akuCommunity/base/base_style.dart';
 import 'package:akuCommunity/constants/api.dart';
 import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart';
+import 'package:akuCommunity/model/manager/quetionnaire_submit_model.dart';
 import 'package:akuCommunity/pages/manager_func.dart';
 import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_siglecheck.dart';
+import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_truefalse.dart';
 import 'package:akuCommunity/ui/manager/questionnaire/questionnarie_raido_check.dart';
 import 'package:akuCommunity/widget/bee_divider.dart';
 import 'package:akuCommunity/widget/bee_scaffold.dart';
-import 'package:akuCommunity/widget/buttons/bee_single_check.dart';
 import 'package:akuCommunity/widget/buttons/bottom_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -26,16 +27,14 @@ class QuestionnaireDetailPage extends StatefulWidget {
 class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
   QuestionnaireDetialModel _model;
   bool _onload = true;
-  int _select;
+
-  List<int> _radio = [];
+  List<AppQuestionnaireAnswerSubmits> _submitModels = [];
-  int _expanded;
-  String _expand;
-  String _short;
   Widget _emptyWidget() {
     return Container();
   }
 
-  Widget _expandedCheck(String title, List<QuestionnaireChoiceVoList> answers) {
+  Widget _expandedCheck(String title, List<QuestionnaireChoiceVoList> answers,
+      List<AppQuestionnaireAnswerSubmits> submitModels, int index) {
     return Container(
       width: double.infinity,
       child: Column(
@@ -57,8 +56,8 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
                   actions: answers
                       .map((e) => CupertinoActionSheetAction(
                           onPressed: () {
-                            _expanded = e.id;
+                            submitModels[index].choiceAnswer.first = e.id;
-                            _expand = e.answer;
+                            submitModels[index].shortAnswer = e.answer;
                             Get.back();
                             setState(() {});
                           },
@@ -81,7 +80,7 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
                   width: double.infinity,
                   padding:
                       EdgeInsets.symmetric(horizontal: 32.w, vertical: 28.w),
-                  child: (_expand ?? '请选择')
+                  child: (submitModels[index].shortAnswer ?? '请选择')
                       .text
                       .color(ktextSubColor)
                       .size(28.sp)
@@ -101,7 +100,8 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
     );
   }
 
-  Widget _shortAnswer(String title) {
+  Widget _shortAnswer(String title,
+      List<AppQuestionnaireAnswerSubmits> submitModels, int index) {
     return Container(
       width: double.infinity,
       child: Column(
@@ -127,7 +127,7 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
                       EdgeInsets.symmetric(horizontal: 32.w, vertical: 28.w),
                   isDense: true),
               onChanged: (value) {
-                _short = value;
+                submitModels[index].shortAnswer = value;
                 setState(() {});
               },
             ),
@@ -137,6 +137,54 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
     );
   }
 
+  Widget _topicWidget(QuestionnaireTopicVoList questionModel,
+      List<AppQuestionnaireAnswerSubmits> submitModels, int index) {
+    switch (questionModel.type) {
+      case 1:
+        return QuestionnaireSingleCheck(
+            title: questionModel.topic,
+            selected: submitModels[index].choiceAnswer.first,
+            onPressed: (id) {
+              submitModels[index].choiceAnswer.first = id;
+              setState(() {});
+            },
+            answers: questionModel.questionnaireChoiceVoList);
+
+      case 2:
+        return QuestionnaireRadioCheck(
+          title: questionModel.topic,
+          selected: submitModels[index].choiceAnswer,
+          answers: questionModel.questionnaireChoiceVoList,
+          onPressed: (id) {
+            if (submitModels[index].choiceAnswer.contains(id)) {
+              submitModels[index].choiceAnswer.remove(id);
+            } else {
+              submitModels[index].choiceAnswer.add(id);
+            }
+            setState(() {});
+          },
+        );
+
+      case 3:
+        return _expandedCheck(questionModel.topic,
+            questionModel.questionnaireChoiceVoList, submitModels, index);
+      case 4:
+      return   QuestionnaireTruefalse(
+          title: questionModel.topic,
+          selected: submitModels[index].choiceAnswer.first,
+          onPressed: (id) {
+            submitModels[index].choiceAnswer.first = id;
+            setState(() {});
+          },
+        );
+      case 5:
+        return _shortAnswer(questionModel.topic, submitModels, index);
+
+      default:
+        return Container();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return BeeScaffold(
@@ -147,6 +195,13 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
         onRefresh: () async {
           _model = await ManagerFunc.questionnairefindById(widget.id);
           _onload = false;
+          _submitModels = _model.questionnaireTopicVoList
+              .map((e) => AppQuestionnaireAnswerSubmits(
+                    topicId: e.id,
+                    choiceAnswer: [-1],
+                  ))
+              .toList();
+          print(_submitModels);
           setState(() {});
         },
         child: _onload
@@ -180,34 +235,12 @@ class _QuestionnaireDetailPageState extends State<QuestionnaireDetailPage> {
                       .size(28.sp)
                       .make(),
                   130.w.heightBox,
-                  QuestionnaireSingleCheck(
+                  ...List.generate(
-                      title: 'title',
+                      _model.questionnaireTopicVoList.length,
-                      selected: _select,
+                      (index) => _topicWidget(
-                      onPressed: (id) {
+                          _model.questionnaireTopicVoList[index],
-                        _select = id;
+                          _submitModels,
-                        setState(() {});
+                          index)).sepWidget(separate: 80.w.heightBox),
-                      },
-                      answers: _model.questionnaireTopicVoList.first
-                          .questionnaireChoiceVoList),
-                  QuestionnaireRadioCheck(
-                    title: 'title',
-                    selected: _radio,
-                    answers: _model.questionnaireTopicVoList.first
-                        .questionnaireChoiceVoList,
-                    onPressed: (id) {
-                      if (_radio.contains(id)) {
-                        _radio.remove(id);
-                      } else {
-                        _radio.add(id);
-                      }
-                      setState(() {});
-                    },
-                  ),
-                  _expandedCheck(
-                      'title',
-                      _model.questionnaireTopicVoList.first
-                          .questionnaireChoiceVoList),
-                  _shortAnswer('title')
                 ],
               ),
       ),

lib/ui/manager/questionnaire/questionnaire_truefalse.dart

@@ -0,0 +1,69 @@
+import 'package:akuCommunity/widget/buttons/bee_single_check.dart';
+import 'package:flutter/material.dart';
+import 'package:velocity_x/velocity_x.dart';
+import 'package:akuCommunity/utils/headers.dart';
+
+class QuestionnaireTruefalse extends StatefulWidget {
+  final String title;
+  final int selected;
+  final Function(int id) onPressed;
+  QuestionnaireTruefalse({Key key, this.title, this.selected, this.onPressed})
+      : super(key: key);
+
+  @override
+  _QuestionnaireTruefalseState createState() => _QuestionnaireTruefalseState();
+}
+
+class _QuestionnaireTruefalseState extends State<QuestionnaireTruefalse> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          widget.title.text.black.size(32.sp).bold.make(),
+          64.w.heightBox,
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: 96.w),
+            child: Flex(
+              direction: Axis.horizontal,
+              children: [
+                Row(
+                  children: [
+                    GestureDetector(
+                      onTap: () {
+                        widget.onPressed(1);
+                      },
+                      child: BeeSingleCheck(
+                        value: 1,
+                        groupValue: widget.selected,
+                      ),
+                    ),
+                    16.w.widthBox,
+                    '正确'.text.black.size(28.sp).make(),
+                  ],
+                ).expand(flex: 1),
+                Row(
+                  children: [
+                    GestureDetector(
+                      onTap: () {
+                        widget.onPressed(0);
+                      },
+                      child: BeeSingleCheck(
+                        value: 0,
+                        groupValue: widget.selected,
+                      ),
+                    ),
+                    16.w.widthBox,
+                    '错误'.text.black.size(28.sp).make(),
+                  ],
+                ).expand(flex: 1),
+              ],
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}