Commit dbeb8ce2 authored by jianglx's avatar jianglx

Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

parents 0d7703b4 941a638e
......@@ -8,33 +8,101 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:background="@color/gray_FFB74B"
android:layout_height="@dimen/size_50"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
<TextView
android:id="@+id/tv_calendar_inday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_alignParentRight="true"
android:src="@drawable/common_icon_close_white" />
android:text="17-12-05" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_calendar_inweek"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="周一" />
<TextView
android:id="@+id/tv_calendar_intime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text="12:00" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center">
<TextView
android:id="@+id/tv_calendar_night"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="366"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:text="晚"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_calendar_outday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="17-12-05" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_calendar_outweek"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="周一" />
<TextView
android:id="@+id/tv_calendar_outtime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text="12:00" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<include layout="@layout/common_line" />
<com.rv.plugin.calendar.CalendarView2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment