From 2cdd335246c18b25caed5bcd5242573e3ab95813 Mon Sep 17 00:00:00 2001
From: fozei <kingstar1986@foxmail.com>
Date: Thu, 24 May 2018 10:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DForm=E4=B8=AD=E7=B1=BB?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/modules.xml                                | 10 ----------
 .../bin/david/smarttable/FormModeActivity.java   | 16 ++++++++--------
 .../java/com/bin/david/smarttable/bean/Form.java |  1 -
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8fb30a9..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/form/form.iml" filepath="$PROJECT_DIR$/form/form.iml" />
-      <module fileurl="file://$PROJECT_DIR$/smartTable.iml" filepath="$PROJECT_DIR$/smartTable.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/bin/david/smarttable/FormModeActivity.java b/app/src/main/java/com/bin/david/smarttable/FormModeActivity.java
index c9d7210..2a7b49d 100644
--- a/app/src/main/java/com/bin/david/smarttable/FormModeActivity.java
+++ b/app/src/main/java/com/bin/david/smarttable/FormModeActivity.java
@@ -55,22 +55,22 @@ public void onClick(View v) {
         editText = (EditText)findViewById(R.id.edit_query) ;
         Form[][] forms = {
                 {
-                        new Form("姓名", Paint.Align.LEFT), Form.Empty,
-                        new Form("性别", Paint.Align.LEFT), Form.Empty,
-                        new Form("出生日期", Paint.Align.LEFT),Form.Empty,
-                        new Form("民族", Paint.Align.LEFT), Form.Empty,
-                        new Form("婚否", Paint.Align.LEFT), Form.Empty,
+                        new Form("姓名", Paint.Align.LEFT), new Form(""),
+                        new Form("性别", Paint.Align.LEFT), new Form(""),
+                        new Form("出生日期", Paint.Align.LEFT),new Form(""),
+                        new Form("民族", Paint.Align.LEFT), new Form(""),
+                        new Form("婚否", Paint.Align.LEFT), new Form(""),
                         new Form(1, 4, "照片")
                 },
                 {
-                        new Form("学历", Paint.Align.LEFT), Form.Empty,
+                        new Form("学历", Paint.Align.LEFT), new Form(""),
                         new Form("专业", Paint.Align.LEFT), new Form(3, 1, ""),
                         new Form("何种语言", Paint.Align.LEFT), new Form(3, 1, "")
                 },
                 {
-                        new Form("籍贯", Paint.Align.LEFT), Form.Empty,
+                        new Form("籍贯", Paint.Align.LEFT), new Form(""),
                         new Form(2, 1, "户口所在地", Paint.Align.LEFT), new Form(3, 1, ""),
-                        Form.Empty, new Form(2, 1, "")
+                        new Form(""), new Form(2, 1, "")
                 },
                 {
                         new Form(2, 1, "现住址电话", Paint.Align.LEFT), new Form(8, 1, "")
diff --git a/app/src/main/java/com/bin/david/smarttable/bean/Form.java b/app/src/main/java/com/bin/david/smarttable/bean/Form.java
index dc37612..68ad301 100644
--- a/app/src/main/java/com/bin/david/smarttable/bean/Form.java
+++ b/app/src/main/java/com/bin/david/smarttable/bean/Form.java
@@ -13,7 +13,6 @@ public class Form implements IForm {
     private int spanWidthSize =1;
     private int spanHeightSize = 1;
     private String name;
-    public static Form  Empty = new Form("");
     private Paint.Align align;
     public Form(int spanWidthSize, int spanHeightSize, String name) {
         this.spanWidthSize = spanWidthSize;