合并赵再春的分支。

This commit is contained in:
qinjiaming_branch 2016-08-29 09:35:02 +08:00
commit a324c31647
237 changed files with 281 additions and 257 deletions

BIN
logo/1471916225_687675.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
logo/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

View File

@ -0,0 +1,3 @@
# cache for current jar dependency. DO NOT EDIT.
# format is <lastModified> <length> <SHA-1> <path>
# Encoding is UTF-8

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<include layout="@layout/header_award" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="5dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="今日中奖名单"
android:textColor="#FF0000"
android:textSize="16sp"
android:typeface="monospace" />
<View
android:layout_width="100dp"
android:layout_height="1.5dp"
android:layout_gravity="center"
android:layout_marginBottom="5dp"
android:background="#FF0000" />
<EditText
android:id="@+id/et_award_new"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:hint=""
android:lines="1" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="5dp"
android:layout_marginTop="50dp"
android:gravity="center"
android:text="昨日中奖名单"
android:textColor="#FF0000"
android:textSize="16sp"
android:typeface="monospace" />
<View
android:layout_width="100dp"
android:layout_height="1.5dp"
android:layout_gravity="center"
android:layout_marginBottom="5dp"
android:background="#FF0000" />
<EditText
android:id="@+id/et_award_old"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:hint=""
android:lines="1" />
</LinearLayout>
</ScrollView>

Some files were not shown because too many files have changed in this diff Show More