-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #572 from SSsugar/master
- Loading branch information
Showing
6 changed files
with
263 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
19 changes: 19 additions & 0 deletions
19
app/src/main/res/layout/net1314080903130spiner_item_layout.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
34 changes: 34 additions & 0 deletions
34
app/src/main/res/layout/net1314080903130task_progress_dialog.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |