From 0ce46170b92baf610e2ed5e0e999d238c6b7bde3 Mon Sep 17 00:00:00 2001
From: SSsugar <809769287@qq.com>
Date: Fri, 29 Apr 2016 12:35:20 +0800
Subject: [PATCH 1/2] #90 #373 lab4

---
 .../res/layout/net1314080903130capture.xml    | 29 ++++++++++++++++
 .../res/layout/net1314080903130loading.xml    | 27 +++++++++++++++
 .../net1314080903130spiner_item_layout.xml    | 19 +++++++++++
 .../net1314080903130task_progress_dialog.xml  | 34 +++++++++++++++++++
 .../main/res/layout/net1314080903130title.xml | 29 ++++++++++++++++
 5 files changed, 138 insertions(+)
 create mode 100644 app/src/main/res/layout/net1314080903130capture.xml
 create mode 100644 app/src/main/res/layout/net1314080903130loading.xml
 create mode 100644 app/src/main/res/layout/net1314080903130spiner_item_layout.xml
 create mode 100644 app/src/main/res/layout/net1314080903130task_progress_dialog.xml
 create mode 100644 app/src/main/res/layout/net1314080903130title.xml

diff --git a/app/src/main/res/layout/net1314080903130capture.xml b/app/src/main/res/layout/net1314080903130capture.xml
new file mode 100644
index 00000000..4670a7ce
--- /dev/null
+++ b/app/src/main/res/layout/net1314080903130capture.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <SurfaceView
+            android:id="@+id/preview_view"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center" />
+
+        <com.app.zxing.view.ViewfinderView
+            android:id="@+id/viewfinder_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <include
+            android:id="@+id/include1"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            layout="@layout/net1314080903130title" />
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/net1314080903130loading.xml b/app/src/main/res/layout/net1314080903130loading.xml
new file mode 100644
index 00000000..8c6d9d9f
--- /dev/null
+++ b/app/src/main/res/layout/net1314080903130loading.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_gray"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/et_device_number"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="15dip"
+        android:textColor="@color/black"
+        />
+    
+    <Button
+        android:id="@+id/btn_submit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="15dip"
+        android:gravity="center"
+        android:text="添加"
+        android:textColor="@color/white" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/net1314080903130spiner_item_layout.xml b/app/src/main/res/layout/net1314080903130spiner_item_layout.xml
new file mode 100644
index 00000000..297ac170
--- /dev/null
+++ b/app/src/main/res/layout/net1314080903130spiner_item_layout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="40dp">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_marginLeft="7dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:textSize="17sp"
+        />
+    <!-- 
+    android:layout_marginLeft="20dp"
+     -->
+</LinearLayout>
diff --git a/app/src/main/res/layout/net1314080903130task_progress_dialog.xml b/app/src/main/res/layout/net1314080903130task_progress_dialog.xml
new file mode 100644
index 00000000..174eba15
--- /dev/null
+++ b/app/src/main/res/layout/net1314080903130task_progress_dialog.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@null"
+              android:layout_gravity="center"
+        >
+    <RelativeLayout
+            android:layout_width="160dp"
+            android:layout_height="110dp"
+            android:padding="8dp"
+            android:background="@null"
+            >
+        <ProgressBar
+                style="@android:style/Widget.ProgressBar.Large"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:background="@null"
+                />
+        <TextView android:id="@+id/task_progress_dialog_message"
+                  android:text="正在加载..."
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:textSize="16dp"
+                  android:layout_alignParentBottom="true"
+                  android:layout_centerHorizontal="true"
+                  android:textColor="#fff"
+                  android:background="@null"
+                />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/net1314080903130title.xml b/app/src/main/res/layout/net1314080903130title.xml
new file mode 100644
index 00000000..b3ed895d
--- /dev/null
+++ b/app/src/main/res/layout/net1314080903130title.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/mmtitle_bg_alpha" >
+
+    <Button
+        android:id="@+id/button_back"
+        android:layout_width="75.0dip"
+        android:text="返回"
+        android:background="@drawable/mm_title_back_btn"
+        android:textColor="@android:color/white"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="2dip" />
+
+    <TextView
+        android:id="@+id/textview_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/button_back"
+        android:layout_alignBottom="@+id/button_back"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_vertical"
+        android:text="条形码扫描"
+        android:textColor="@android:color/white"
+        android:textSize="18sp" />
+
+</RelativeLayout>
\ No newline at end of file

From 9bf2f6d9a15fc03ccf51002237dcb1554ee6449d Mon Sep 17 00:00:00 2001
From: SSsugar <809769287@qq.com>
Date: Fri, 29 Apr 2016 20:41:12 +0800
Subject: [PATCH 2/2] #90 #373  lab4

---
 .../res/layout/activity_net1314080903130.xml  | 138 ++++++++++++++++--
 1 file changed, 125 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_net1314080903130.xml b/app/src/main/res/layout/activity_net1314080903130.xml
index 4b477d27..ea1fe4d6 100644
--- a/app/src/main/res/layout/activity_net1314080903130.xml
+++ b/app/src/main/res/layout/activity_net1314080903130.xml
@@ -1,14 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".Net1314080903130Activity">
-
-    <ImageView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:src="@drawable/net1314080903130"/>
-</RelativeLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/title" />
+
+    <Button
+        android:id="@+id/newGameBtn"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_gravity="center_horizontal"
+        android:onClick="newGame"
+        android:text="New Game" />
+
+    <TableLayout
+        android:id="@+id/tableLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <Button
+                android:id="@+id/topLeft"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="2"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="3"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <Button
+                android:id="@+id/button2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="2"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="3"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <Button
+                android:id="@+id/button5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="1"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="2"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+
+            <Button
+                android:id="@+id/button7"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_column="3"
+                android:width="100dp"
+                android:height="100dp"
+                android:text="O" />
+        </TableRow>
+    </TableLayout>
+</LinearLayout>
+