修改ui

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/ErpMenActivity.java

@@ -228,7 +228,7 @@ public class ErpMenActivity extends BaseActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            ListItem item;
+            ListItem item=null;
             if (convertView==null) {
                 convertView =inflater.inflate(R.layout.item_weixin_listview, parent,false);
                 item=new ListItem();

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java

@@ -57,7 +57,6 @@ public class NewsTwoActivity extends BaseActivity {
     }
 
     public void initView() {
-        ToastUtil.showToast(this,"进入新闻页面");
         setContentView(R.layout.act_news_list);
         ct = this;
         ViewUtils.inject(this);

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/SaleDetailActivity.java

@@ -161,7 +161,6 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		initView();
 		initData();
 	}
-
 	public void initView() {
 		setContentView(R.layout.act_sale_detail_list);
 		TAG = "SaleDetailActivity";
@@ -290,9 +289,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 				view.setLayoutParams(v);
 				view.setBackgroundColor(getResources().getColor(
 						R.color.lightgray));
-				ly_panel_data.addView(view);
-				
-				ly_panel_data.setBackgroundResource(R.drawable.shape_linear_detail);
+//				ly_panel_data.addView(view);
 			}
 		}
 	}
@@ -410,7 +407,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 					}
 
 					values[i] = mView;
-					// mView.setText(data.get(items.get(i).getField()));
+//					 mView.setText(data.get(items.get(i).getField()));
 					mView.setLayoutParams(mp);
 					rLayout.addView(mView);
 
@@ -420,7 +417,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 					line.setLayoutParams(v);
 					line.setBackgroundColor(getResources().getColor(
 							R.color.lightgray));
-					ly.addView(line);
+//					ly.addView(line);
 					ly.addView(rLayout);
 //					ly.setBackground(ct.getResources().getDrawable(
 //							R.drawable.shape_linear_detail));

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/SaleSelectActivity.java

@@ -4,64 +4,32 @@
 package com.sk.weichat.ui.erp.activity;
 
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-import com.github.clans.fab.FloatingActionButton;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.sk.weichat.R;
-import com.sk.weichat.ui.base.BaseActivity;
-import com.sk.weichat.ui.erp.net.HttpClient;
-import com.sk.weichat.ui.erp.net.ViewUtil;
-import com.sk.weichat.ui.erp.util.CommonUtil;
-import com.sk.weichat.ui.erp.util.Constants;
-import com.sk.weichat.ui.erp.util.FlexJsonUtil;
-import com.sk.weichat.ui.erp.util.StringUtils;
-import com.sk.weichat.ui.erp.view.EmptyLayout;
-
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Parcelable;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.BaseAdapter;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.Filter;
@@ -69,13 +37,37 @@ import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
-import android.widget.SimpleAdapter;
 import android.widget.RelativeLayout.LayoutParams;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.github.clans.fab.FloatingActionButton;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
+import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.sk.weichat.R;
+import com.sk.weichat.ui.base.BaseActivity;
+import com.sk.weichat.ui.erp.net.HttpClient;
+import com.sk.weichat.ui.erp.net.ViewUtil;
+import com.sk.weichat.ui.erp.util.CommonUtil;
+import com.sk.weichat.ui.erp.util.Constants;
+import com.sk.weichat.ui.erp.util.FlexJsonUtil;
+import com.sk.weichat.ui.erp.util.StringUtils;
+import com.sk.weichat.ui.erp.view.EmptyLayout;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author LiuJie
  *
@@ -376,7 +368,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 //		reConditionBox.setOnCheckedChangeListener(new CheckedChangeEvent());
 	
 		  final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-	        fab.hide(false);
+	        fab.hide(true);
 	        new Handler().postDelayed(new Runnable() {
 	            @Override
 	            public void run() {
@@ -394,7 +386,6 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 	                	it_detail = new Intent(SaleSelectActivity.this,
 								LeaveActivity.class);
 					}
-
 					if ("出差单查询".equals(getSupportActionBar().getTitle())) {
 						it_detail = new Intent(SaleSelectActivity.this,
 								TravelActivity.class);
@@ -643,6 +634,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 				LinearLayout ly = (LinearLayout) convertView
 						.findViewById(R.id.ly_sale_view);
 				int showIndex = 0;
+
 				if (!data.isEmpty()) {
 					/** @注释：第一列， 多增加序列号文本 */
 					for (int i = 0; i < cList.size(); i++) {
@@ -718,14 +710,14 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 						rLayout.setLayoutParams(l);
 						ly.addView(rLayout);
 
-						View line = new View(ct);
-						LayoutParams v = new LayoutParams(
-								LayoutParams.MATCH_PARENT, CommonUtil.dip2px(
-										ct, 1));
-						line.setLayoutParams(v);
-						line.setBackgroundColor(getResources().getColor(
-								R.color.lightgray));
-						ly.addView(line);
+//						View line = new View(ct);
+//						LayoutParams v = new LayoutParams(
+//								LayoutParams.MATCH_PARENT, CommonUtil.dip2px(
+//										ct, 1));
+//						line.setLayoutParams(v);
+//						line.setBackgroundColor(getResources().getColor(
+//								R.color.lightgray));
+//						ly.addView(line);
 
 						ly.setBackgroundDrawable(ct.getResources().getDrawable(
 								R.drawable.shape_linear_detail));
@@ -735,7 +727,11 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 			} else {
 				tViews = (TextView[][]) convertView.getTag();
 			}
-
+			if (position%2==0){
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color1));
+			}else{
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color2));
+			}
 			for (int j = 0; j < cList.size(); j++) {
 				map = (HashMap<String, Object>) cList.get(j);
 				// if ((Integer)map.get("width")==0)continue;

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:drawable="@drawable/bg_btn_nopass" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_btn_pass" android:state_pressed="false"/>
+    <item android:drawable="@drawable/bg_btn_pass"  />
+</selector>

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

@@ -20,7 +20,6 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="20dp"
-        android:paddingBottom="10dp"
         android:src="#BFBFBF" />
     <TextView
         android:id="@+id/tv_gird_msg"

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

@@ -2,64 +2,67 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
     <com.sk.weichat.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/ic_top"
         android:fillViewport="true"
-        android:scrollbars="none" >
+        android:scrollbars="none">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#e2e2e2"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/tv_panel_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@color/item_line"
+                android:gravity="center_vertical"
+                android:paddingLeft="20dp"
                 android:text="单据信息"
-                android:textColor="@color/gray"
-                android:textSize="16sp"
+                android:textColor="@color/white"
+                android:textSize="20sp"
                 android:visibility="gone" />
+
             <LinearLayout
                 android:id="@+id/ly_panel_data"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:background="#ffffff"
-                android:orientation="vertical" >
-            </LinearLayout>
+                android:background="@color/item_color1"
+                android:orientation="vertical"/>
+
             <TextView
                 android:id="@+id/tv_detail_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@color/item_line"
+                android:gravity="center_vertical"
+                android:paddingLeft="20dp"
                 android:text="明细信息"
-                android:textColor="@color/gray"
-                android:textSize="16sp"
+                android:textColor="@color/white"
+                android:textSize="20sp"
                 android:visibility="gone" />
+
             <com.sk.weichat.ui.erp.view.ListViewInScroller
                 android:id="@+id/lv_detail_data"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="80dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:background="#ffffff"
-                android:dividerHeight="10dp" >
-            </com.sk.weichat.ui.erp.view.ListViewInScroller>
+                android:background="@color/item_color2"
+                android:dividerHeight="10dp"/>
         </LinearLayout>
+        <!--android:layout_marginBottom="80dp"-->
+
     </com.sk.weichat.ui.erp.view.CustomerScrollView>
+
     <include
+        layout="@layout/act_bottom_item_detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/act_bottom_item_detail" />
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>

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

@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
     android:orientation="vertical" >
     <RelativeLayout
         android:id="@+id/top"
@@ -60,16 +61,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/top"
-        android:background="#e2e2e2"
+        android:background="@drawable/bg_main"
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
-        android:dividerHeight="10dp"
         android:fadingEdge="none"
-        android:padding="5dp"
         android:scrollbars="none" >
      </com.handmark.pulltorefresh.library.PullToRefreshListView>
      <com.github.clans.fab.FloatingActionButton
         android:id="@+id/fab"
+         android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dp"

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

@@ -171,7 +171,7 @@
                     android:layout_marginLeft="40dp"
                     android:layout_marginRight="40dp"
                     android:layout_marginTop="9dp"
-                    android:background="@drawable/btn_bg"
+                    android:background="@drawable/bg_btn"
                     android:gravity="center"
                     android:textColor="@color/white" />
 
@@ -182,7 +182,7 @@
                     android:layout_marginBottom="10dp"
                     android:layout_marginLeft="40dp"
                     android:layout_marginRight="40dp"
-                    android:background="@drawable/btn_bg"
+                    android:background="@drawable/bg_btn"
                     android:gravity="center"
                     android:text="@string/look_friend_location"
                     android:textColor="@color/white" />

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

@@ -134,7 +134,7 @@
 
             <Button
                 android:id="@+id/next_step_btn"
-              android:background="@drawable/btn_bg"
+              android:background="@drawable/bg_btn"
                 android:layout_width="fill_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"

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

@@ -33,7 +33,7 @@
     <Button
         android:id="@+id/login_btn"
         android:layout_height="50dp"
-    android:background="@drawable/btn_bg"
+    android:background="@drawable/bg_btn"
         android:layout_width="match_parent"
         android:layout_marginLeft="40dp"
         android:layout_marginRight="40dp"

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

@@ -26,19 +26,19 @@
 
         <Button
             android:id="@+id/ok_btn"
-            android:layout_width="wrap_content"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="#ef7f46"
+            android:background="@drawable/bg_btn"
             android:focusable="true"
             android:gravity="center"
             android:minHeight="40dp"
             android:minWidth="75.0dip"
             android:padding="5dp"
             android:text="@string/add_chat_ok_btn"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/NormalTextSize" />
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_hine" />
 
         <com.sk.weichat.view.HorizontalListView xmlns:widget="http://schemas.android.com/apk/res-auto"
             android:id="@+id/horizontal_list_view"

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

@@ -169,7 +169,7 @@
 
             <Button
                 android:id="@+id/exit_btn"
-                android:background="@drawable/btn_bg"
+                android:background="@drawable/bg_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"

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

@@ -189,13 +189,18 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ImageView
+            <Button
                 android:id="@+id/search_btn"
-                android:layout_width="300dp"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
                 android:layout_centerHorizontal="true"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="@dimen/line_big"
-                android:src="@drawable/search_btn" />
+                android:background="@drawable/bg_btn"
+                android:text="搜    索"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
         </RelativeLayout>
     </LinearLayout>
 

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

@@ -134,7 +134,7 @@
 
     <Button
         android:id="@+id/sure_btn"
-        android:background="@drawable/btn_bg"
+        android:background="@drawable/bg_btn"
         android:layout_width="fill_parent"
         android:layout_height="50dp"
         android:layout_below="@id/num"

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

@@ -7,7 +7,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#f2f2f2"
+        android:background="@drawable/bg_main"
         android:fillViewport="true" >
         <LinearLayout
             android:layout_width="match_parent"
@@ -39,6 +39,7 @@
                 </RelativeLayout>
                 <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
+                    android:background="@color/item_color1"
                     android:id="@+id/ry_extra_encode"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -80,6 +81,7 @@
                 <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
                     android:id="@+id/ry_extra_type"
+                    android:background="@color/item_color2"
                     style="@style/form_relative_customer" >
                     <ImageView
                         android:id="@+id/iv_extra_type"
@@ -99,6 +101,7 @@
                 </RelativeLayout>
                 <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
+                    android:background="@color/item_color1"
                     android:id="@+id/ry_leader_no"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -119,6 +122,7 @@
                 </RelativeLayout>
                 <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
+                    android:background="@color/item_color2"
                     android:id="@+id/ry_leader_name"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -139,6 +143,7 @@
                 </RelativeLayout>
                  <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
+                    android:background="@color/item_color1"
                     android:id="@+id/ry_traffic"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -161,6 +166,7 @@
                 </RelativeLayout>
                  <ImageView style="@style/app_comm_list_line_gray" />
                  <RelativeLayout
+                     android:background="@color/item_color2"
                     android:id="@+id/ry_stay"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -182,6 +188,7 @@
                 </RelativeLayout>
                  <ImageView style="@style/app_comm_list_line_gray" />
                  <RelativeLayout
+                     android:background="@color/item_color1"
                     android:id="@+id/ry_relations"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -226,6 +233,7 @@
                 android:id="@+id/ly_bottom_display"
                 style="@style/form_linear_customer" >
                 <RelativeLayout
+                    android:background="@color/item_color1"
                     android:id="@+id/ry_extra_startdate"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -246,6 +254,7 @@
                 </RelativeLayout>
                 <ImageView style="@style/app_comm_list_line_gray" />
                  <RelativeLayout
+                     android:background="@color/item_color2"
                     android:id="@+id/ry_extra_endtime"
                     style="@style/form_relative_customer" >
                     <ImageView
@@ -270,6 +279,9 @@
                 style="@style/form_linear_customer" >
                 <Button
                     android:id="@+id/bt_save"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginRight="40dp"
+                    android:background="@drawable/bg_btn"
                     style="@style/from_button_base_white"
                     android:text="保存" >
                 </Button>

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

@@ -1,258 +1,313 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:whatever="http://schemas.android.com/apk/res-auto"
+    xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <com.sk.weichat.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#f2f2f2"
-        android:fillViewport="true" >
+        android:fillViewport="true">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/ly_head_display"
-                style="@style/form_linear_customer" >
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_main"
+                android:orientation="vertical">
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_man"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <ImageView
                         android:id="@+id/iv_set_image"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_find_green" />
+
                     <TextView
                         android:id="@+id/tv_leave_man"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_image"
                         android:layout_toRightOf="@+id/iv_set_image"
                         android:text="请假人：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_man"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
-                   <RelativeLayout
+
+                <RelativeLayout
                     android:id="@+id/ry_leave_mankind"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <ImageView
                         android:id="@+id/iv_set_imagemankind"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_class_bule" />
+
                     <TextView
                         android:id="@+id/tv_leave_mankind"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_imagemankind"
                         android:layout_toRightOf="@+id/iv_set_imagemankind"
                         android:text="人员类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_mankind"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_type"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_set_imag"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_selection_bule" />
+
                     <TextView
                         android:id="@+id/tv_leave_type"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_imag"
                         android:layout_toRightOf="@+id/iv_set_imag"
                         android:text="请假类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_type"
                         style="@style/form_relative_right_text"
                         android:focusableInTouchMode="false"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_category"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <ImageView
                         android:id="@+id/iv_set_ima"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_class_bule" />
+
                     <TextView
                         android:id="@+id/tv_leave_category"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_ima"
                         android:layout_toRightOf="@+id/iv_set_ima"
                         android:text="假期类别：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_category"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_set_website"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <ImageView
                         android:id="@+id/iv_leave_days"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_date_bule" />
+
                     <TextView
                         android:id="@+id/tv_iv_leave_days"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_leave_days"
                         android:layout_toRightOf="@+id/iv_leave_days"
                         android:text="请假天数：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_days"
                         style="@style/form_relative_right_text"
-                        whatever:testType="regexp"
-						whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
-						whatever:testErrorString="@string/error_only_numeric_digits_allowed" />
+                        whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
+                        whatever:testErrorString="@string/error_only_numeric_digits_allowed"
+                        whatever:testType="regexp" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_hours"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <ImageView
                         android:id="@+id/iv_set_mail"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_time_bule" />
+
                     <TextView
                         android:id="@+id/tv_leave_hours"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_mail"
                         android:layout_toRightOf="@+id/iv_set_mail"
                         android:text="请假时数：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_hours"
                         style="@style/form_relative_right_text"
-                        whatever:testType="regexp"
-						whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
-						whatever:testErrorString="@string/error_only_numeric_digits_allowed"/>
+                        whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
+                        whatever:testErrorString="@string/error_only_numeric_digits_allowed"
+                        whatever:testType="regexp" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_reason"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <ImageView
                         android:id="@+id/iv_set_i"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_write_green" />
+
                     <TextView
                         android:id="@+id/tv_leave_reason"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_i"
                         android:layout_toRightOf="@+id/iv_set_i"
                         android:text="请假原因：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_reason"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_display"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
                     android:id="@+id/ry_set_startTime"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer">
+
                     <ImageView
                         android:id="@+id/iv_set_"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/iconfont_time" />
+
                     <TextView
                         android:id="@+id/tv_set_"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_"
                         android:layout_toRightOf="@+id/iv_set_"
                         android:text="开始时间：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/tv_start_time"
                         style="@style/form_relative_right_text"
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_set_endTime"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer">
+
                     <ImageView
                         android:id="@+id/iv_date"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/iconfont_time" />
+
                     <TextView
                         android:id="@+id/tv_date_gh"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_date"
                         android:layout_toRightOf="@+id/iv_date"
                         android:text="结束时间：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/tv_end_time"
                         style="@style/form_relative_right_text"
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_save"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <Button
                     android:id="@+id/bt_save"
                     style="@style/from_button_base_white"
-                    android:text="保存" >
-                </Button>
+                    android:text="保存"></Button>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_handler"
                 style="@style/form_linear_customer"
                 android:orientation="horizontal"
-                android:visibility="gone" >
+                android:visibility="gone">
+
                 <Button
                     android:id="@+id/bt_add"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="新增" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_commit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_uncommit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="反提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_update"
                     style="@style/from_button_base_white"

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

@@ -18,6 +18,9 @@
         android:paddingRight="16dp"
         android:text="菜单"
          />
-
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/item_line"/>
 
 </LinearLayout>

WeiChat/src/main/res/values-v14/styles.xml

@@ -21,22 +21,22 @@
 
     <style name="IMActionBar" parent="@style/Widget.AppCompat.ActionBar">
         <item name="android:icon">@drawable/action_bar_divider</item>
-        <item name="android:background">@drawable/actionbar_bg</item>
+        <item name="android:background">>@style/MyActionBar</item>
         <item name="android:titleTextStyle">@style/IMActionBar.TitleTextStyle</item>
         <item name="android:subtitleTextStyle">@style/IMActionBar.SubTitleTextStyle</item>
         <item name="android:indeterminateProgressStyle">@style/ActionBarCustomProgressBar</item>
-        <item name="android:backgroundStacked">@color/green</item>
+        <item name="android:backgroundStacked">@color/antionbarcolor</item>
         <item name="android:backgroundSplit">@color/red</item>
         <item name="titleTextStyle">@style/IMActionBar.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/IMActionBar.SubTitleTextStyle</item>
         <item name="icon">@drawable/action_bar_divider</item>
-        <item name="background">@drawable/actionbar_bg</item>
-        <item name="backgroundStacked">@color/green</item>
+        <item name="background">@style/MyActionBar</item>
+        <item name="backgroundStacked">@color/antionbarcolor</item>
         <item name="backgroundSplit">@color/red</item>
         <item name="indeterminateProgressStyle">@style/ActionBarCustomProgressBar</item>
     </style>
 
     <style name="MyActionBar" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@color/green</item>
+        <item name="android:background">@color/antionbarcolor</item>
     </style>
 </resources>

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

@@ -267,14 +267,13 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
-
+    <!--<item name="android:layout_marginLeft">5dp</item>-->
+    <!--<item name="android:layout_marginRight">5dp</item>-->
+    <!--<item name="android:layout_marginTop">20dp</item>-->
+    <!--<item name="android:layout_marginBottom">15dp</item>-->
     <style name="form_linear_customer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">5dp</item>
-        <item name="android:layout_marginRight">5dp</item>
-        <item name="android:layout_marginTop">20dp</item>
-        <item name="android:layout_marginBottom">15dp</item>
         <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:orientation">vertical</item>
     </style>
@@ -348,7 +347,7 @@
     <!-- form表单  请假单，特殊考勤等单据 -->
     <style name="form_relative_customer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:clickable">true</item>
     </style>

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Apr 14 16:53:21 CST 2016
+#Fri Apr 15 08:33:20 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME