完成所有功能设计，可用性强

lib/GamePage.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:gobang/ai/Ai.dart';
 import 'package:gobang/bridge/ChessShape.dart';
 import 'package:gobang/factory/ThemeFactory.dart';
+import 'package:gobang/factory/UserTheme.dart';
 import 'package:gobang/flyweight/Chess.dart';
 import 'package:gobang/flyweight/ChessFlyweightFactory.dart';
 import 'package:gobang/memorandum/Originator.dart';
@@ -26,10 +27,17 @@ class GamePageState extends State<GamePage> {
   ThemeFactory? _themeFactory;
   GameViewModel _viewModel = GameViewModel.getInstance();
   Originator _originator = Originator.getInstance();
+  Icon lightOn = Icon(Icons.lightbulb,color: Colors.amberAccent);
+  Icon lightOff = Icon(Icons.lightbulb_outline_rounded);
+  Icon circle = Icon(Icons.circle_outlined);
+  Icon rect = Icon(Icons.crop_square);
+  Icon? currentLight,currentShape;
 
   @override
   void initState() {
-    _themeFactory = AiThemeFactory();
+    currentLight = lightOn;
+    _themeFactory = BlueThemeFactory();
+    currentShape = circle;
     super.initState();
   }
 
@@ -59,17 +67,22 @@ class GamePageState extends State<GamePage> {
               icon: Icon(Icons.undo)),
           IconButton(
               onPressed: () {
-                TipsDialog.showByChoose(context, "提示", "是否要投降并重新开局？","是","否",(value){
-                  if(value){
-                    setState(() {
-                      ChessPainter._position = null;
-                      _originator.clean();
-                      _viewModel.reset();
-                      Ai.getInstance().init();
-                    });
-                  }
-                  Navigator.pop(context);
-                });
+                if(_viewModel.surrender()) {
+                  TipsDialog.showByChoose(
+                      context, "提示", "是否要投降并重新开局？", "是", "否", (value) {
+                    if (value) {
+                      setState(() {
+                        ChessPainter._position = null;
+                        _originator.clean();
+                        _viewModel.reset();
+                        Ai.getInstance().init();
+                      });
+                    }
+                    Navigator.pop(context);
+                  });
+                }else{
+                  TipsDialog.show(context, "提示", "现阶段不能投降");
+                }
               },
               icon: Icon(Icons.sports_handball)),
           IconButton(
@@ -87,6 +100,30 @@ class GamePageState extends State<GamePage> {
                 });
               },
               icon: Icon(Icons.restart_alt)),
+          IconButton(
+              onPressed: () {
+                setState(() {
+                  if(_themeFactory is BlackThemeFactory){
+                    currentLight = lightOn;
+                    _themeFactory = BlueThemeFactory();
+                  }else{
+                    currentLight = lightOff;
+                    _themeFactory = BlackThemeFactory();
+                  }
+                });
+              },
+              icon: currentLight!),
+          IconButton(
+              onPressed: () {
+                setState(() {
+                  if(currentShape == circle){
+                    currentShape = rect;
+                  } else {
+                    currentShape = circle;
+                  }
+                });
+              },
+              icon: currentShape!),
         ],
       ),
       body: Container(
@@ -118,7 +155,7 @@ class GamePageState extends State<GamePage> {
                     GestureDetector(
                         onTapDown: (topDownDetails) {
                           var position = topDownDetails.localPosition;
-                          Chess chess = _viewModel.play();
+                          Chess chess = _viewModel.play(currentShape == circle);
                           setState(() {
                             ChessPainter._position =
                                 Position(position.dx, position.dy, chess);

lib/factory/ThemeFactory.dart

@@ -6,16 +6,23 @@ abstract class ThemeFactory{
   Theme getTheme();
 }
 
-class UserThemeFactory extends ThemeFactory{
+class YellowThemeFactory extends ThemeFactory{
   @override
   Theme getTheme() {
     return new YellowTheme();
   }
 }
 
-class AiThemeFactory extends ThemeFactory{
+class BlueThemeFactory extends ThemeFactory{
   @override
   Theme getTheme() {
     return new BlueTheme();
   }
+}
+
+class BlackThemeFactory extends ThemeFactory{
+  @override
+  Theme getTheme() {
+    return new BlackTheme();
+  }
 }

lib/factory/UserTheme.dart

@@ -16,4 +16,11 @@ class BlueTheme extends t.Theme{
   Color getThemeColor() {
     return Colors.blue;
   }
+}
+
+class BlackTheme extends t.Theme{
+  @override
+  Color getThemeColor() {
+    return Colors.black;
+  }
 }

lib/viewModel/GameViewModel.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:gobang/bridge/ChessShape.dart';
 import 'package:gobang/flyweight/Chess.dart';
 import 'package:gobang/flyweight/ChessFlyweightFactory.dart';
@@ -18,11 +19,14 @@ class GameViewModel {
 
   UserContext _userContext = UserContext();
 
-  Chess play() {
+  Chess play(bool current) {
     _userContext.play();
     Chess chess;
     /// 设置棋子外观
     ChessShape shape = RectShape();
+    if(current){
+      shape = CircleShape();
+    }
     chess = ChessFlyweightFactory.getInstance().getChess("white");
     chess.chessShape = shape;
     return chess;
@@ -45,4 +49,8 @@ class GameViewModel {
   void reset() {
     _userContext.reset();
   }
+
+  bool surrender() {
+    return _userContext.surrender();
+  }
 }