外勤签到，会议管理UI调整

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/res/drawable/bg_orange_btn.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_orange_normal" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/layout/activity_add_meeting.xml

@@ -19,15 +19,21 @@
             <TextView
                 android:id="@+id/name_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议名称："
+                android:text="会议名称"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/name_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <EditText
                 android:id="@+id/name_et"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@+id/name_tag"
                 android:hint="请输入，必填"
+                android:layout_marginLeft="20dp"
                 android:inputType="text" />
         </RelativeLayout>
 
@@ -44,15 +50,21 @@
             <TextView
                 android:id="@+id/start_tag"
                 style="@style/form_relative_left_text"
-                android:text="开始时间："
+                android:text="开始时间"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/start_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/start_tv"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@id/start_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:layout_marginLeft="20dp"
                 android:hint="请选择，必填" />
         </RelativeLayout>
 
@@ -68,15 +80,21 @@
             <TextView
                 android:id="@+id/end_tag"
                 style="@style/form_relative_left_text"
-                android:text="结束时间："
+                android:text="结束时间"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/end_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/end_tv"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@id/end_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:layout_marginLeft="20dp"
                 android:hint="请选择，必填" />
         </RelativeLayout>
 
@@ -92,14 +110,20 @@
             <TextView
                 android:id="@+id/location_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议地点："
+                android:text="会议地点"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/location_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <EditText
                 android:id="@+id/location_et"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@id/location_tag"
+                android:layout_marginLeft="20dp"
                 android:hint="请输入，必填" />
         </RelativeLayout>
 
@@ -132,15 +156,21 @@
             <TextView
                 android:id="@+id/users_tag"
                 style="@style/form_relative_left_text"
-                android:text="参会人员："
+                android:text="参会人员"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@+id/users_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/users_tv"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@+id/users_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:layout_marginLeft="20dp"
                 android:hint="请选择，必填" />
         </RelativeLayout>
 
@@ -156,13 +186,14 @@
             <TextView
                 android:id="@+id/user_tag"
                 style="@style/form_relative_left_text"
-                android:text="管  理  员："
+                android:text="管  理  员"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
             <TextView
                 android:id="@+id/user_tv"
                 style="@style/add_meet_tv"
+                android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/user_tag" />
         </RelativeLayout>
 
@@ -184,7 +215,7 @@
             <TextView
                 android:id="@+id/tag_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议标签："
+                android:text="会议标签"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -193,6 +224,7 @@
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@+id/tag_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:layout_marginLeft="20dp"
                 android:hint="请选择，非必填" />
         </RelativeLayout>
 
@@ -208,7 +240,7 @@
             <TextView
                 android:id="@+id/about_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议介绍："
+                android:text="会议介绍"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -216,6 +248,7 @@
                 android:id="@+id/about_et"
                 style="@style/add_meet_tv"
                 android:layout_toRightOf="@id/about_tag"
+                android:layout_marginLeft="20dp"
                 android:hint="请输入，非必填" />
         </RelativeLayout>
 

WeiChat/src/main/res/layout/activity_meet_details.xml

@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:gravity="center_vertical"
+        android:background="@color/oa_background_orange"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -219,7 +220,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/bg_btn"
+        android:background="@drawable/bg_orange_btn"
         android:padding="10dp"
         android:text="立即签到"
         android:textColor="@color/white"

WeiChat/src/main/res/layout/activity_out_signin_ok.xml

@@ -24,6 +24,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="10dp"
                 android:drawableLeft="@drawable/outffice_com"
+                android:drawablePadding="6dp"
                 android:text="当前企业:"
                 android:textSize="@dimen/text_main" />
 
@@ -50,6 +51,7 @@
                 android:layout_marginRight="10dp"
                 android:drawableLeft="@drawable/outoffice_time"
                 android:text="签到时间:"
+                android:drawablePadding="6dp"
                 android:textSize="@dimen/text_main" />
 
             <TextView
@@ -57,7 +59,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/time_tag"
-                android:layout_toRightOf="@id/time_tag" />
+                android:layout_toRightOf="@id/time_tag"
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/addr_tag"
@@ -68,6 +71,7 @@
                 android:layout_marginTop="5dp"
                 android:drawableLeft="@drawable/outffice_addr"
                 android:text="签到地点:"
+                android:drawablePadding="6dp"
                 android:textSize="@dimen/text_main" />
 
             <TextView
@@ -76,6 +80,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@id/addr_tag"
                 android:layout_toRightOf="@+id/addr_tag"
+                android:textStyle="bold"
                 android:maxLines="2" />
         </RelativeLayout>
 

WeiChat/src/main/res/layout/fragment_outoffice.xml

@@ -120,6 +120,7 @@
             android:layout_alignTop="@id/tag_img"
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@id/tag_img"
+            android:gravity="center_vertical"
             android:textSize="@dimen/text_hine" />
 
         <ImageView
@@ -139,6 +140,7 @@
             android:layout_alignTop="@id/tag_img2"
             android:layout_below="@+id/date_tv"
             android:textColor="@color/text_main"
+            android:gravity="center_vertical"
             android:textSize="@dimen/text_main" />
 
         <TextView

WeiChat/src/main/res/layout/oa_meeting_item.xml

@@ -27,6 +27,9 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/oa_meeting_name_tv"
         android:layout_marginTop="20dp"
+        android:drawableLeft="@drawable/ic_meeting_time"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
         android:textSize="@dimen/text_hine" />
 
     <TextView
@@ -35,6 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/oa_meeting_start"
         android:layout_marginTop="5dp"
+        android:gravity="center_vertical"
         android:textSize="30sp" />
 
     <TextView
@@ -54,6 +58,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/oa_meeting_start_date"
         android:layout_toRightOf="@+id/oa_meeting_line"
+        android:gravity="center_vertical"
+        android:drawableLeft="@null"
         android:textSize="30sp" />
 
     <TextView
@@ -63,6 +69,8 @@
         android:layout_above="@id/oa_meeting_end_date"
         android:layout_alignLeft="@+id/oa_meeting_end_date"
         android:layout_marginBottom="5dp"
+        android:gravity="center_vertical"
+        android:layout_alignTop="@id/oa_meeting_start"
         android:textSize="@dimen/text_hine" />
 
     <TextView
@@ -71,7 +79,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/oa_meeting_start_date"
         android:layout_marginTop="10dp"
-        android:text="会议介绍"
+        android:text="会议地点"
+        android:drawableLeft="@drawable/ic_meeting_address"
+        android:gravity="center_vertical"
+        android:drawablePadding="5dp"
         android:textColor="@color/hintColor" />
 
     <TextView
@@ -90,6 +101,9 @@
         android:layout_below="@+id/oa_meeting_addr"
         android:layout_marginTop="10dp"
         android:text="发  起  人"
+        android:drawableLeft="@drawable/ic_metting_people"
+        android:gravity="center_vertical"
+        android:drawablePadding="5dp"
         android:textColor="@color/hintColor" />
 
     <TextView
@@ -108,6 +122,9 @@
         android:layout_below="@+id/oa_meeting_user"
         android:layout_marginTop="10dp"
         android:text="会议纪要"
+        android:drawableLeft="@drawable/ic_metting_label"
+        android:gravity="center_vertical"
+        android:drawablePadding="5dp"
         android:textColor="@color/hintColor" />
 
     <TextView

WeiChat/src/main/res/values/colors.xml

@@ -21,6 +21,8 @@
     <color name="btn_login_nomarl">#7BB4DC</color>
     <color name="btn_login_press">#B9D2E3</color>
 
+    <color name="btn_orange_normal">#DD9C57</color>
+    <color name="btn_orange_press">#E5AA69</color>
     <!--end gongpengming-->
     <color name="shadow">#AA000000</color>
     <color name="default_shadow_color">#88757575</color>
@@ -258,4 +260,5 @@
     <color name="dim_foreground_light_inverse_disabled">#80bebebe</color>
 
     <color name="replay_text_color_normal">#ffa19992</color>
+    <color name="oa_background_orange">#DC9A54</color>
 </resources>