Merge remote-tracking branch 'origin/developer_master' into developer_master

WeiChat/src/main/java/com/sk/weichat/ui/calendar/views/DatePicker.java

@@ -100,7 +100,6 @@ public class DatePicker extends LinearLayout {
         tvYear.setText("2015");
         tvYear.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
         tvYear.setTextColor(mTManager.colorTitle());
-
         // 月份显示
         tvMonth = new TextView(context);
         tvMonth.setText("六月");

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

@@ -89,6 +89,8 @@ public class ErpMenActivity extends BaseActivity {
                 DetailItemAdapter.ListItem item=(DetailItemAdapter.ListItem) view.getTag();
                 String tag=item.menu_name.getText().toString();
                 int falg = 0;
+
+
                 if("销售订单".equals(tag)){
                     falg = 0;
                 }
@@ -226,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

@@ -30,6 +30,7 @@ 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.view.EmptyLayout;
+import com.sk.weichat.util.ToastUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -68,9 +69,7 @@ public class NewsTwoActivity extends BaseActivity {
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-
         getSupportActionBar().setTitle("新闻");
-
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
 
             @Override

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

@@ -1,6 +1,15 @@
 package com.sk.weichat.ui.erp.activity;
 
-import java.util.ArrayList;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Button;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -11,17 +20,7 @@ import com.sk.weichat.ui.erp.fragment.QueryGridFragment;
 import com.sk.weichat.ui.erp.model.ImageInfo;
 import com.sk.weichat.ui.erp.view.NScrollerGridView;
 
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
+import java.util.ArrayList;
 
 public class QueryActivity extends BaseActivity {
 
@@ -56,6 +55,7 @@ public class QueryActivity extends BaseActivity {
 		 fragmentManager=activity.getSupportFragmentManager();
 		 fragmentTransaction=fragmentManager.beginTransaction();
 		 QueryGridFragment queryGridFragment=new QueryGridFragment();
+
 		 fragmentTransaction.replace(R.id.fm_content, queryGridFragment);
 		 fragmentTransaction.commit();
 	}

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/java/com/sk/weichat/ui/erp/activity/TaskActivity.java

@@ -1,19 +1,34 @@
 package com.sk.weichat.ui.erp.activity;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
@@ -31,28 +46,12 @@ 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.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @注释：任务书
@@ -161,6 +160,7 @@ public class TaskActivity extends BaseActivity {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的任务");
 
+
         String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_TASK);

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/QueryGridFragment.java

@@ -1,25 +1,5 @@
 package com.sk.weichat.ui.erp.fragment;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.sk.weichat.R;
-import com.sk.weichat.ui.erp.activity.SaleSelectActivity;
-import com.sk.weichat.ui.erp.model.ImageInfo;
-import com.sk.weichat.ui.erp.model.Querys;
-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.CustomProgressDialog;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,13 +12,33 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
+
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.sk.weichat.R;
+import com.sk.weichat.ui.erp.activity.SaleSelectActivity;
+import com.sk.weichat.ui.erp.model.ImageInfo;
+import com.sk.weichat.ui.erp.model.Querys;
+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.CustomProgressDialog;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author LiuJie
@@ -61,6 +61,11 @@ public class QueryGridFragment extends Fragment implements OnClickListener {
     private CustomProgressDialog progressDialog;
     private Context ct;
 
+    private int[] imgID={
+            R.drawable.query1,R.drawable.query2,R.drawable.query3,R.drawable.query4,R.drawable.query5,R.drawable.query6,
+            R.drawable.query7,R.drawable.query8,R.drawable.query9,R.drawable.query10,R.drawable.query11,R.drawable.query12,
+            R.drawable.query13
+    };
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -127,15 +132,15 @@ public class QueryGridFragment extends Fragment implements OnClickListener {
                                     int position, long id) {
                 if (!StringUtils.isEmpty(Constants.getAppBaseUrl(ct))) {
                     if (data.get(position).getCaller() != null) {
-						Intent it_scale = new Intent(ct,
-								SaleSelectActivity.class);
-						it_scale.putExtra("caller", data.get(position)
-								.getCaller());
-						System.out.println("title+:"
-								+ data.get(position).getImageMsg());
-						it_scale.putExtra("title", data.get(position)
-								.getImageMsg());
-						ct.startActivity(it_scale);
+                        Intent it_scale = new Intent(ct,
+                                SaleSelectActivity.class);
+                        it_scale.putExtra("caller", data.get(position)
+                                .getCaller());
+                        System.out.println("title+:"
+                                + data.get(position).getImageMsg());
+                        it_scale.putExtra("title", data.get(position)
+                                .getImageMsg());
+                        ct.startActivity(it_scale);
                     }
                 } else {
                     //ViewUtil.ShowBasicNoTitle(ct);
@@ -281,16 +286,18 @@ public class QueryGridFragment extends Fragment implements OnClickListener {
 //				iGriditems.badge.show();
             }
             /** @注释：logo */
-            iGriditems.gird_image.setImageResource(data.get(position).imageId);
+            //TODO 图片数据
+            if (position<imgID.length)
+            iGriditems.gird_image.setImageResource(imgID[position]);
+            else
+                iGriditems.gird_image.setImageResource(data.get(position).imageId);
             iGriditems.gird_rl
                     .setBackgroundResource(R.drawable.ry_setting_selector);
             iGriditems.gird_rl.getBackground().setAlpha(250);
             /** @注释：title */
             iGriditems.gird_msg.setText(data.get(position).imageMsg);
-
             return convertView;
         }
-
         public final class Griditems {
             //BadgeView badge;
             TextView gird_msg_count;

WeiChat/src/main/java/com/sk/weichat/ui/groupchat/SelectContactsActivity.java

@@ -298,7 +298,7 @@ public class SelectContactsActivity extends BaseActivity {
         // final EditText roomSubjectEdit = (EditText)
         // rootView.findViewById(R.id.room_subject_edit);
         final ClearEditText roomDescEdit = (ClearEditText) rootView.findViewById(R.id.room_desc_edit);
-        final ImageView sure_btn = (ImageView) rootView.findViewById(R.id.sure_btn);
+        final Button sure_btn = (Button) rootView.findViewById(R.id.sure_btn);
 
         ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomNameEdit, 8);// 设置EditText的字数限制
         ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomDescEdit, 20);

WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -208,7 +208,7 @@ public class MessageFragment extends EasyFragment {
         mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
-
+                Log.i("gongpengming", "进入刷新页面");
                 //TODO 刷新信息
                 refreshUI();
             }
@@ -289,6 +289,7 @@ public class MessageFragment extends EasyFragment {
                 boolean success = Result.defaultParser(mActivity, result, false);
                 Log.i("MessageFragment", "更新好友列表数据：" + JSON.toJSONString(result));
                 if (success) {
+
                     FriendDao.getInstance().addAttentionUsers(mHandler, MyApplication.getInstance().mLoginUser.getUserId(), result.getData(),
                             new OnCompleteListener() {
                                 @Override
@@ -497,7 +498,7 @@ public class MessageFragment extends EasyFragment {
                 } else if (friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)) {
                     avatar_img.setImageResource(R.drawable.home_image_03_u);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_NEWS)) {
-                        avatar_img.setImageResource(R.drawable.iconfont_bokexinwen);
+                    avatar_img.setImageResource(R.drawable.iconfont_bokexinwen);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_NOTICE)) {
                     avatar_img.setImageResource(R.drawable.iconfont_tongzhi);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_GONGGAO)) {
@@ -730,23 +731,23 @@ public class MessageFragment extends EasyFragment {
                     String result = msg.getData().getString("result");
                     NoticeEntity newsEntity = JSON.parseObject(result, NoticeEntity.class);
                     int size = newsEntity.getData().size();
-                    String em_id=CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
+                    String em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
                     int count = 0;
                     for (int i = 0; i < size; i++) {
                         if (!ObjectUtils.isEquals(newsEntity.getData().get(i).getSTATUS(), null)) {
                             if (((int) newsEntity.getData().get(i).getSTATUS()) != -1) {
-                                if ((!StringUtils.isEmpty(em_id)&&newsEntity.getData().get(i).getNO_RECIPIENTID()!=null)){
+                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                     if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
                                         count++;
                                     }
                                 }
                             }
                         } else {
-                            if ((!StringUtils.isEmpty(em_id)&&newsEntity.getData().get(i).getNO_RECIPIENTID()!=null)){
+                            if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                 if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
                                     count++;
                                 }
-                            }else{
+                            } else {
                                 count++;
                             }
                         }
@@ -773,22 +774,22 @@ public class MessageFragment extends EasyFragment {
                     newsEntity = JSON.parseObject(result, NoticeEntity.class);
                     size = newsEntity.getData().size();
                     count = 0;
-                    em_id=CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
+                    em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
                     for (int i = 0; i < size; i++) {
                         if (!ObjectUtils.isEquals(newsEntity.getData().get(i).getSTATUS(), null)) {
                             if (((int) newsEntity.getData().get(i).getSTATUS()) != -1) {
-                                if ((!StringUtils.isEmpty(em_id)&&newsEntity.getData().get(i).getNO_RECIPIENTID()!=null)){
+                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                     if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
                                         count++;
                                     }
                                 }
                             }
                         } else {
-                            if ((!StringUtils.isEmpty(em_id)&&newsEntity.getData().get(i).getNO_RECIPIENTID()!=null)){
+                            if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                 if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
                                     count++;
                                 }
-                            }else{
+                            } else {
                                 count++;
                             }
                         }

WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserListActivity.java

@@ -3,6 +3,7 @@ package com.sk.weichat.ui.nearby;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -30,120 +31,148 @@ import java.util.HashMap;
 import java.util.List;
 
 public class UserListActivity extends BaseActivity {
-	private PullToRefreshListView mPullToRefreshListView;
-
-	private List<User> mUsers;
-	private UserAdapter mAdapter;
-
-	private int mPageIndex = 0;
-
-	private String mKeyWord;// 关键字(keyword)
-	private int mSex;// 城市Id(cityId)
-	private int mMinAge;// 行业Id(industryId)
-	private int mMaxAge;// 职能Id(fnId)
-	private int mShowTime;// 日期(days)
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getSupportActionBar().setTitle(R.string.search);
-		if (getIntent() != null) {
-			mKeyWord = getIntent().getStringExtra("key_word");
-			mSex = getIntent().getIntExtra("sex", 0);
-			mMinAge = getIntent().getIntExtra("min_age", 0);
-			mMaxAge = getIntent().getIntExtra("max_age", 0);
-			mShowTime = getIntent().getIntExtra("show_time", 0);
-		}
-		mUsers = new ArrayList<User>();
-		mAdapter = new UserAdapter(mUsers, this);
-		setContentView(R.layout.layout_pullrefresh_list);
-		initView();
-	}
-
-	private void initView() {
-		mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
-
-		View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);
-		mPullToRefreshListView.setEmptyView(emptyView);
-
-		mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
-		mPullToRefreshListView.setShowIndicator(false);
-
-		mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
-			@Override
-			public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-				requestData(true);
-			}
-
-			@Override
-			public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-				requestData(false);
-			}
-		});
-
-		mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				Intent intent = new Intent(mContext, BasicInfoActivity.class);
-				intent.putExtra(AppConstant.EXTRA_USER_ID, mUsers.get((int) id).getUserId());
-				startActivity(intent);
-			}
-		});
-
-		requestData(true);
-	}
-
-	private void requestData(final boolean isPullDwonToRefersh) {
-		if (isPullDwonToRefersh) {
-			mPageIndex = 0;
-		}
-
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("pageIndex", String.valueOf(mPageIndex));
-		params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		if (!TextUtils.isEmpty(mKeyWord)) {
-			params.put("nickname", mKeyWord);
-		}
-		if (mSex != 0) {
-			params.put("sex", String.valueOf(mSex));
-		}
-
-		if (mMinAge != 0) {
-			params.put("minAge", String.valueOf(mMinAge));
-		}
-
-		if (mMaxAge != 0) {
-			params.put("maxAge", String.valueOf(mMaxAge));
-		}
-
-		params.put("active", String.valueOf(mShowTime));
-
-		StringJsonArrayRequest<User> request = new StringJsonArrayRequest<User>(mConfig.USER_NEAR, new ErrorListener() {
-			@Override
-			public void onErrorResponse(VolleyError arg0) {
-				ToastUtil.showErrorNet(mContext);
-				mPullToRefreshListView.onRefreshComplete();
-			}
-		}, new StringJsonArrayRequest.Listener<User>() {
-			@Override
-			public void onResponse(ArrayResult<User> result) {
-				boolean success = Result.defaultParser(mContext, result, true);
-				if (success) {
-					mPageIndex++;
-
-					if (isPullDwonToRefersh) {
-						mUsers.clear();
-					}
-					List<User> datas = result.getData();
-					if (datas != null && datas.size() > 0) {
-						mUsers.addAll(datas);
-					}
-					mAdapter.notifyDataSetChanged();
-				}
-				mPullToRefreshListView.onRefreshComplete();
-			}
-		}, User.class, params);
-		addDefaultRequest(request);
-	}
+    private PullToRefreshListView mPullToRefreshListView;
+
+    private List<User> mUsers;
+    private UserAdapter mAdapter;
+
+    private int mPageIndex = 0;
+
+    private String mKeyWord;// 关键字(keyword)
+    private int mSex;// 城市Id(cityId)
+    private int mMinAge;// 行业Id(industryId)
+    private int mMaxAge;// 职能Id(fnId)
+    private int mShowTime;// 日期(days)
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSupportActionBar().setTitle(R.string.search);
+        if (getIntent() != null) {
+            mKeyWord = getIntent().getStringExtra("key_word");
+            mSex = getIntent().getIntExtra("sex", -1);
+            mMinAge = getIntent().getIntExtra("min_age", 0);
+            mMaxAge = getIntent().getIntExtra("max_age", 0);
+            mShowTime = getIntent().getIntExtra("show_time", 0);
+        }
+        Log.i("gongpengmign", "sex=" + mSex);
+        mUsers = new ArrayList<User>();
+        mAdapter = new UserAdapter(mUsers, this);
+        setContentView(R.layout.layout_pullrefresh_list);
+        initView();
+    }
+
+    private void initView() {
+        mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
+
+        View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);
+        mPullToRefreshListView.setEmptyView(emptyView);
+
+        mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
+        mPullToRefreshListView.setShowIndicator(false);
+
+        mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                requestData(true);
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                requestData(false);
+            }
+        });
+
+        mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(mContext, BasicInfoActivity.class);
+                intent.putExtra(AppConstant.EXTRA_USER_ID, mUsers.get((int) id).getUserId());
+                startActivity(intent);
+            }
+        });
+
+        requestData(true);
+    }
+
+    private void requestData(final boolean isPullDwonToRefersh) {
+        if (isPullDwonToRefersh) {
+            mPageIndex = 0;
+        }
+
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("pageIndex", String.valueOf(mPageIndex));
+        params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        if (!TextUtils.isEmpty(mKeyWord)) {
+            params.put("nickname", mKeyWord);
+        }
+        if (mSex !=-1) {
+            params.put("sex", String.valueOf(mSex));
+        }
+
+        if (mMinAge != 0) {
+            params.put("minAge", String.valueOf(mMinAge));
+        }
+
+        if (mMaxAge != 0) {
+            params.put("maxAge", String.valueOf(mMaxAge));
+        }
+
+        params.put("active", String.valueOf(mShowTime));
+
+        StringJsonArrayRequest<User> request = new StringJsonArrayRequest<User>(mConfig.USER_NEAR, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(mContext);
+                mPullToRefreshListView.onRefreshComplete();
+            }
+        }, new StringJsonArrayRequest.Listener<User>() {
+            @Override
+            public void onResponse(ArrayResult<User> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    mPageIndex++;
+
+                    if (isPullDwonToRefersh) {
+                        mUsers.clear();
+                    }
+                    List<User> datas = result.getData();
+                    Log.i("gongpengming","datas.size="+datas.size()+""+result.toString());
+                    if (datas != null && datas.size() > 0) {
+//                        addDatas(datas, mSex);
+                        mUsers.addAll(datas);
+                    }
+                    mAdapter.notifyDataSetChanged();
+                }
+                mPullToRefreshListView.onRefreshComplete();
+            }
+        }, User.class, params);
+        addDefaultRequest(request);
+    }
+
+    private void addDatas(List<User> datas, int mSex) {
+        switch (mSex) {
+            case 0:
+                for (int i = 0; i < datas.size(); i++) {
+                    if (datas.get(i).getSex() != 0) {
+                        Log.i("gongpengming","错了"+datas.get(i).getNickName()+"=="+datas.size());
+                        datas.remove(i);
+                        i--;
+                    }
+                }
+                break;
+            case 1:
+                for (int i = 0; i < datas.size(); i++) {
+
+                    if (datas.get(i).getSex() != 1)
+                        datas.remove(i);
+                }
+                break;
+            default:
+                break;
+
+        }
+        mUsers.addAll(datas);
+    }
 }

WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java

@@ -19,144 +19,143 @@ import com.sk.weichat.ui.tool.SelectDateActivity;
 
 /**
  * 搜索职位筛选界面
- * 
+ *
  * @author Dean Tao
- * 
  */
 public class UserSearchActivity extends ActionBackActivity implements View.OnClickListener {
 
-	private int mSex;
-	private int mMinAge;
-	private int mMaxAge;
-	private int mShowTime;
+    private int mSex;
+    private int mMinAge;
+    private int mMaxAge;
+    private int mShowTime;
 
-	private EditText mKeyWordEdit;
-	private TextView mSexTv;
-	private EditText mMinAgeEdit;
-	private EditText mMaxAgeEdit;
-	private TextView mShowTimeTv;
+    private EditText mKeyWordEdit;
+    private TextView mSexTv;
+    private EditText mMinAgeEdit;
+    private EditText mMaxAgeEdit;
+    private TextView mShowTimeTv;
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getSupportActionBar().setTitle(R.string.search);
-		setContentView(R.layout.activity_user_search);
-		initView();
-	}
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSupportActionBar().setTitle(R.string.search);
+        setContentView(R.layout.activity_user_search);
+        initView();
+    }
+    private void initView() {
+        mKeyWordEdit = (EditText) findViewById(R.id.keyword_edit);
+        mSexTv = (TextView) findViewById(R.id.sex_tv);
+        mMinAgeEdit = (EditText) findViewById(R.id.min_age_edit);
+        mMaxAgeEdit = (EditText) findViewById(R.id.max_age_edit);
+        mShowTimeTv = (TextView) findViewById(R.id.show_time_tv);
 
-	private void initView() {
-		mKeyWordEdit = (EditText) findViewById(R.id.keyword_edit);
-		mSexTv = (TextView) findViewById(R.id.sex_tv);
-		mMinAgeEdit = (EditText) findViewById(R.id.min_age_edit);
-		mMaxAgeEdit = (EditText) findViewById(R.id.max_age_edit);
-		mShowTimeTv = (TextView) findViewById(R.id.show_time_tv);
+        findViewById(R.id.sex_rl).setOnClickListener(this);
+        findViewById(R.id.show_time_rl).setOnClickListener(this);
+        findViewById(R.id.search_btn).setOnClickListener(this);
+        reset();
+    }
 
-		findViewById(R.id.sex_rl).setOnClickListener(this);
-		findViewById(R.id.show_time_rl).setOnClickListener(this);
-		findViewById(R.id.search_btn).setOnClickListener(this);
-		reset();
-	}
+    private void reset() {
+        mSex = 0;
+        mMinAge = 0;
+        mMaxAge = 200;
+        mShowTime = 0;
+        mKeyWordEdit.setText(null);
+        mSexTv.setText(R.string.all);
+        mMinAgeEdit.setText(String.valueOf(mMinAge));
+        mMaxAgeEdit.setText(String.valueOf(mMaxAge));
+        mShowTimeTv.setText(R.string.all_date);
+    }
 
-	private void reset() {
-		mSex = 0;
-		mMinAge = 0;
-		mMaxAge = 200;
-		mShowTime = 0;
-		mKeyWordEdit.setText(null);
-		mSexTv.setText(R.string.all);
-		mMinAgeEdit.setText(String.valueOf(mMinAge));
-		mMaxAgeEdit.setText(String.valueOf(mMaxAge));
-		mShowTimeTv.setText(R.string.all_date);
-	}
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_user_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.menu_user_search, menu);
-		return super.onCreateOptionsMenu(menu);
-	}
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.reset) {
+            reset();
+        }
+        return super.onOptionsItemSelected(item);
+    }
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.reset) {
-			reset();
-		}
-		return super.onOptionsItemSelected(item);
-	}
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.sex_rl:// 点击性别
+                showSelectSexDialog();
+                break;
+            case R.id.show_time_rl:
+                startActivityForResult(new Intent(mContext, SelectDateActivity.class), 1);
+                break;
+            case R.id.search_btn: {
+                if (!StringUtils.isEmpty(mMinAgeEdit.getText().toString()) &&
+                        !StringUtils.isEmpty(mMaxAgeEdit.getText().toString())) {
+                    mMinAge = Integer.parseInt(mMinAgeEdit.getText().toString());
+                    mMaxAge = Integer.parseInt(mMaxAgeEdit.getText().toString());
+                } else {
+                    mMinAge = 0;
+                    mMaxAge = 200;
+                }
+                if (mMinAge > mMaxAge) {
+                    Toast.makeText(getApplicationContext(), "您输入的年龄范围不合法!", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                Intent intent = new Intent(mContext, UserListActivity.class);
+                intent.putExtra("key_word", mKeyWordEdit.getText().toString());
 
-	@Override
-	public void onClick(View v) {
-		switch (v.getId()) {
-		case R.id.sex_rl:// 点击性别
-			showSelectSexDialog();
-			break;
-		case R.id.show_time_rl:
-			startActivityForResult(new Intent(mContext, SelectDateActivity.class), 1);
-			break;
-		case R.id.search_btn: {
-			if (!StringUtils.isEmpty(mMinAgeEdit.getText().toString())&&
-					!StringUtils.isEmpty(mMaxAgeEdit.getText().toString())){
-				mMinAge=Integer.parseInt(mMinAgeEdit.getText().toString());
-				mMaxAge=Integer.parseInt(mMaxAgeEdit.getText().toString());
-			}else{
-				mMinAge=0;
-				mMaxAge=200;
-			}
-			if(mMinAge>mMaxAge){
-				Toast.makeText(getApplicationContext(), "您输入的年龄范围不合法!",0).show();
-				return;
-			}
-			Intent intent = new Intent(mContext, UserListActivity.class);
-			intent.putExtra("key_word", mKeyWordEdit.getText().toString());
-			intent.putExtra("sex", mSex);
-			intent.putExtra("min_age", mMinAge);
-			intent.putExtra("max_age", mMaxAge);
-			intent.putExtra("show_time", mShowTime);
-			startActivity(intent);
-		}
-			break;
-		}
-	}
+                intent.putExtra("sex", mSex);
+                intent.putExtra("min_age", mMinAge);
+                intent.putExtra("max_age", mMaxAge);
+                intent.putExtra("show_time", mShowTime);
+                startActivity(intent);
+            }
+            break;
+        }
+    }
 
-	private void showSelectSexDialog() {
-		// 1是男，0是女，2是全部
-		String[] sexs = new String[] { getString(R.string.all), getString(R.string.sex_man), getString(R.string.sex_woman) };
-		int checkItem = 0;
-		if (mSex == 2) {
-			checkItem = 0;
-		} else if (mSex == 1) {
-			mSex = 1;
-		} else if (mSex == 0) {
-			mSex = 2;
-		}
-		new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
-				.setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (which == 0) {
-							mSex = 2;
-							mSexTv.setText(R.string.all);
-						} else if (which == 1) {
-							mSex = 1;
-							mSexTv.setText(R.string.sex_man);
-						} else {
-							mSex = 0;
-							mSexTv.setText(R.string.sex_woman);
-						}
-						dialog.dismiss();
-					}
-				}).setCancelable(true).create().show();
-	}
+    private void showSelectSexDialog() {
+        // 1是男，0是女，2是全部
+        String[] sexs = new String[]{getString(R.string.all), getString(R.string.sex_man), getString(R.string.sex_woman)};
+        int checkItem = 0;
+        if (mSex == 2) {
+            checkItem = 0;
+        } else if (mSex == 1) {
+            mSex = 1;
+        } else if (mSex == 0) {
+            mSex = 2;
+        }
+        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+                .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            mSex = 2;
+                            mSexTv.setText(R.string.all);
+                        } else if (which == 1) {
+                            mSex = 1;
+                            mSexTv.setText(R.string.sex_man);
+                        } else {
+                            mSex = 0;
+                            mSexTv.setText(R.string.sex_woman);
+                        }
+                        dialog.dismiss();
+                    }
+                }).setCancelable(true).create().show();
+    }
 
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == 1) {// 日期选择
-			if (resultCode == RESULT_OK && data != null) {
-				int id = data.getIntExtra(SelectConstantActivity.EXTRA_CONSTANT_ID, 0);
-				String name = data.getStringExtra(SelectConstantActivity.EXTRA_CONSTANT_NAME);
-				mShowTime = id;
-				mShowTimeTv.setText(name);
-			}
-		}
-	}
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1) {// 日期选择
+            if (resultCode == RESULT_OK && data != null) {
+                int id = data.getIntExtra(SelectConstantActivity.EXTRA_CONSTANT_ID, 0);
+                String name = data.getStringExtra(SelectConstantActivity.EXTRA_CONSTANT_NAME);
+                mShowTime = id;
+                mShowTimeTv.setText(name);
+            }
+        }
+    }
 }

WeiChat/src/main/java/com/sk/weichat/volley/Result.java

@@ -45,6 +45,7 @@ public class Result {
 		if (result.resultCode == CODE_SUCCESS) {// 成功
 			return true;
 		} else if (result.resultCode == CODE_NO_TOKEN) {// 缺少参数Token
+
 			LoginHelper.broadcastConflict(context);
 			if (showToast)
 				showResultToast(context, result);
@@ -55,8 +56,10 @@ public class Result {
 				showResultToast(context, result);
 			return false;
 		} else {
-			if (showToast)
-				showResultToast(context, result);
+			if (showToast){
+				//TODO 返回错误
+								showResultToast(context, result);
+			}
 			return false;
 		}
 	}

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/drawable/select_weixin_list_item.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/lightgray" android:state_pressed="true"/>
-    <item android:drawable="@color/white" android:state_selected="true"/>
-    <item android:drawable="@color/white"/>
+    <item android:drawable="@color/item_color2" android:state_pressed="true"/>
+    <item android:drawable="@color/item_color1" android:state_selected="true"/>
+    <item android:drawable="@color/item_color1"/>
 </selector>

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

@@ -15,20 +15,19 @@
         android:textColor="#ffffff" />
     <ImageView
         android:id="@+id/iv_gird_image"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
         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"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/iv_gird_image"
+        android:layout_marginTop="@dimen/line_big"
         android:layout_centerHorizontal="true"
-        android:paddingBottom="20dp"
-        android:textColor="@color/black"
-        android:textSize="15sp" />
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
 </RelativeLayout>

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

@@ -1,31 +1,25 @@
- <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <GridView
+        android:id="@+id/gv_home_display"
         android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-        <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/yellow_home" />
-        <GridView
-            android:id="@+id/gv_home_display"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="0dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="0dp"
-            android:background="@drawable/shape_grid_detail"
-            android:horizontalSpacing="0.5dp"
-            android:numColumns="3"
-            android:scrollbars="none"
-            android:verticalSpacing="0.5dp" >
-        </GridView>
-        <RelativeLayout
-            android:id="@+id/view_empty"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:visibility="gone" >
-            <include layout="@layout/view_empty" />
-        </RelativeLayout>
-    </LinearLayout>
+        android:layout_height="wrap_content"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:scrollbars="none"
+        android:verticalSpacing="0.5dp"/>
+
+    <RelativeLayout
+        android:id="@+id/view_empty"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:visibility="gone">
+        <include layout="@layout/view_empty" />
+    </RelativeLayout>
+</LinearLayout>

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

@@ -2,17 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
     android:orientation="vertical" >
      <com.handmark.pulltorefresh.library.PullToRefreshListView
       android:id="@+id/list_news"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="#EFEFEF"
       android:divider="@null"
-      android:dividerHeight="10dp"
       android:listSelector="#00000000"
       android:fadingEdge="none"
-      android:padding="5dp"
       android:scrollbars="none" >
   </com.handmark.pulltorefresh.library.PullToRefreshListView>
 </LinearLayout>

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

@@ -7,12 +7,11 @@
         android:id="@+id/list_notice"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#EFEFEF"
+        android:background="@drawable/bg_main"
         android:divider="@null"
-        android:dividerHeight="10dp"
+
         android:fadingEdge="none"
         android:listSelector="#00000000"
-        android:padding="5dp"
         android:scrollbars="none">
     </com.handmark.pulltorefresh.library.PullToRefreshListView>
 </LinearLayout>

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

@@ -1,21 +1,21 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/normal_bg"
-    android:orientation="vertical" >
+    android:background="@color/bg_main"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical" >
+                android:orientation="vertical">
 
                 <ImageView
                     android:id="@+id/avatar_img"
@@ -32,8 +32,8 @@
                     android:src="@drawable/avatar_normal" />
 
                 <RelativeLayout
-                    style="@style/IMTbleLine_UP"
-                    android:layout_marginTop="20dp" >
+                    style="@style/IMTbleLine"
+                    android:layout_marginTop="20dp">
 
                     <TextView
                         android:id="@+id/name_text"
@@ -54,10 +54,13 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/item_line"/>
                 <RelativeLayout
                     android:id="@+id/sex_rl"
-                    style="@style/IMTbleLine_UP" >
+                    style="@style/IMTbleLine">
 
                     <TextView
                         android:id="@+id/sex_text"
@@ -78,10 +81,13 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/item_line"/>
                 <RelativeLayout
                     android:id="@+id/birthday_rl"
-                    style="@style/IMTbleLine_UP" >
+                    style="@style/IMTbleLine">
 
                     <TextView
                         android:id="@+id/birthday_text"
@@ -102,10 +108,13 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/item_line"/>
                 <RelativeLayout
                     android:id="@+id/city_rl"
-                    style="@style/IMTbleLine_UP" >
+                    style="@style/IMTbleLine">
 
                     <TextView
                         android:id="@+id/city_text"
@@ -126,10 +135,13 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/item_line"/>
                 <RelativeLayout
                     android:id="@+id/tel_rl"
-                    style="@style/IMTbleLine_UP" >
+                    style="@style/IMTbleLine">
 
                     <TextView
                         android:id="@+id/tel_text"
@@ -153,25 +165,27 @@
 
                 <Button
                     android:id="@+id/next_step_btn"
-                    style="@style/IMButton"
                     android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="9dp"
-                    android:layout_marginRight="9dp"
+                    android:layout_height="50dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginRight="40dp"
                     android:layout_marginTop="9dp"
-                    android:gravity="center" />
+                    android:background="@drawable/bg_btn"
+                    android:gravity="center"
+                    android:textColor="@color/white" />
 
                 <Button
                     android:id="@+id/look_location_btn"
-                    style="@style/IMButton.Green"
                     android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="9dp"
-                    android:layout_marginLeft="9dp"
-                    android:layout_marginRight="9dp"
-                    android:layout_marginTop="9dp"
+                    android:layout_height="50dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginRight="40dp"
+                    android:background="@drawable/bg_btn"
                     android:gravity="center"
-                    android:text="@string/look_friend_location" />
+                    android:text="@string/look_friend_location"
+                    android:textColor="@color/white" />
             </LinearLayout>
         </ScrollView>
 

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

@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/normal_bg"
+    android:background="@color/bg_main"
     android:orientation="vertical" >
 
     <ScrollView
@@ -28,7 +28,7 @@
                 android:src="@drawable/avatar_normal" />
 
             <RelativeLayout
-                style="@style/IMTbleLine_UP"
+                style="@style/IMTbleLine"
                 android:layout_marginTop="20dp" >
 
                 <TextView
@@ -53,10 +53,13 @@
                     android:contentDescription="@string/app_name"
                     android:visibility="invisible" />
             </RelativeLayout>
-
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/sex_select_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine" >
 
                 <TextView
                     android:id="@+id/sex_text"
@@ -76,10 +79,13 @@
                     style="@style/IMTbleLine_ArrowImg"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/birthday_select_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine" >
 
                 <TextView
                     android:id="@+id/birthday_text"
@@ -99,10 +105,13 @@
                     style="@style/IMTbleLine_ArrowImg"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/city_select_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine" >
 
                 <TextView
                     android:id="@+id/city_text"
@@ -125,15 +134,18 @@
 
             <Button
                 android:id="@+id/next_step_btn"
-                style="@style/IMButton.Orange"
+              android:background="@drawable/bg_btn"
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
-                android:layout_marginLeft="9dp"
-                android:layout_marginRight="9dp"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
                 android:layout_marginTop="9dp"
                 android:gravity="center"
-                android:text="@string/sure" />
+                android:textSize="@dimen/text_main"
+                android:text="确    定"
+                android:textColor="@color/white"
+                />
         </LinearLayout>
     </ScrollView>
 

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

@@ -3,12 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="@drawable/bg_main"
     tools:context="com.sk.weichat.ui.erp.activity.CommonFragmentActivity">
 
     <FrameLayout
         android:id="@+id/fl_content"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"></FrameLayout>
+        android:layout_height="fill_parent" />
 </RelativeLayout>

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

@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@drawable/bg_main"
     android:orientation="vertical">
 
     <ImageView
@@ -16,7 +16,7 @@
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
         android:layout_marginTop="9dp"
-        android:background="@color/wirtehine"
+        android:background="@color/item_color2"
         android:drawableLeft="@drawable/login_user_name"
         android:hint="@string/please_input_phone_number"
         android:inputType="phone" />
@@ -26,15 +26,21 @@
         style="@style/IMLineEditPass"
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
-        android:background="@color/wirtehine"
+        android:background="@color/item_color2"
         android:drawableLeft="@drawable/loginpw"
         android:hint="@string/please_input_password" />
 
     <Button
         android:id="@+id/login_btn"
-        style="@style/IMButton.Orange"
+        android:layout_height="50dp"
+    android:background="@drawable/bg_btn"
         android:layout_width="match_parent"
-        android:layout_margin="15dp" />
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_marginTop="10dp"
+        android:textColor="@color/white"
+        android:text="登  录"
+      />
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
     android:orientation="vertical">
 
     <ScrollView
@@ -12,14 +13,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp">
+            >
 
 
             <!--公司-->
             <RelativeLayout
                 android:id="@+id/rl_uas_website"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="9dp">
+                style="@style/IMTbleLine"
+             >
 
                 <TextView
                     android:id="@+id/uas_website_text"
@@ -41,18 +42,23 @@
 
                 <ImageView
                     android:id="@+id/uas_website_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:alpha="0.26"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <!--设置关闭推送-->
             <RelativeLayout
                 android:id="@+id/close_push_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="9dp">
+                style="@style/IMTbleLine"
+                 >
 
                 <TextView
                     android:id="@+id/push_setting_text"
@@ -73,10 +79,13 @@
                     android:layout_marginRight="20dp" />
             </RelativeLayout>
             <!--清除缓存-->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="9dp">
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/cache_text"
@@ -97,17 +106,21 @@
 
                 <ImageView
                     android:id="@+id/cache_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:alpha="0.26"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/use_help_rl"
-                style="@style/IMTbleLine_UP">
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -119,14 +132,18 @@
                     android:textSize="14sp" />
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:alpha="0.26"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/about_us_rl"
                 style="@style/IMTbleLine">
@@ -141,8 +158,9 @@
                     android:textSize="14sp" />
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:alpha="0.26"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
@@ -151,11 +169,14 @@
 
             <Button
                 android:id="@+id/exit_btn"
-                style="@style/IMButton.Green"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+                android:background="@drawable/bg_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
                 android:layout_marginTop="9dp"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
+                android:textColor="@color/white"
                 android:text="@string/exit_current_account" />
         </LinearLayout>
     </ScrollView>

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

@@ -25,18 +25,42 @@
                 android:text="称    昵"
                 android:textSize="18sp" />
             <!--style="@style/IMTbleLine_TextValue"-->
-
-            <com.sk.weichat.view.ClearEditText
-                android:id="@+id/keyword_edit"
+            <RelativeLayout
                 android:layout_width="250dp"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/keyword_arrow_img"
                 android:layout_toRightOf="@+id/keyword_text"
-                android:background="@color/item_color2"
+                android:background="@drawable/bg_bar"
                 android:drawablePadding="5dp"
-                android:hint="输入名称"
-                android:inputType="text" />
+                android:orientation="horizontal">
+
+                <com.sk.weichat.view.ClearEditText
+                    android:id="@+id/keyword_edit"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/search_input"
+                    android:drawableLeft="@drawable/search"
+                    android:drawableRight="@drawable/search_clear"
+                    android:hint="@string/search"
+                    android:textColor="@color/dark_grey"
+                    android:textColorHint="@color/grey"
+                    android:textSize="15sp" />
+            </RelativeLayout>
+
+
+            <!--<com.sk.weichat.view.ClearEditText-->
+            <!--android:id="@+id/keyword_edit"-->
+            <!--android:layout_width="250dp"-->
+            <!--android:layout_height="40dp"-->
+            <!--android:layout_centerVertical="true"-->
+            <!--android:layout_toLeftOf="@+id/keyword_arrow_img"-->
+            <!--android:layout_toRightOf="@+id/keyword_text"-->
+            <!--android:background="@color/item_color2"-->
+            <!--android:drawablePadding="5dp"-->
+            <!--android:hint="输入名称"-->
+            <!--android:inputType="text" />-->
 
             <ImageView
                 android:id="@+id/keyword_arrow_img"
@@ -60,7 +84,7 @@
                 android:text="性    别"
                 android:textSize="18sp" />
 
-                <TextView
+            <TextView
                 android:id="@+id/sex_tv"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/sex_arrow_img"
@@ -165,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/chat_from_item_card.xml

@@ -74,14 +74,7 @@
                     android:layout_centerVertical="true"
                     android:orientation="vertical"
                      android:layout_toRightOf="@id/chat_from_head" >
-                   <TextView
-                        android:id="@+id/person_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="@string/person_card_title"
-                        android:textColor="#880000ff"
-                        android:textSize="@dimen/SmallerTextSize" />
+
                     <TextView
                         android:layout_gravity="center_horizontal"
                         android:id="@+id/person_name"
@@ -89,15 +82,17 @@
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:text="filename"
-                        android:textSize="@dimen/SmallerTextSize" />
+
+                        android:textSize="@dimen/text_main" />
                     <TextView
                         android:layout_gravity="center_horizontal"
                         android:id="@+id/person_sex"
+                        android:layout_marginTop="@dimen/line_min"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:text="filename"
-                        android:textSize="@dimen/SmallerTextSize" />
+                        android:textSize="@dimen/text_hine" />
                 </LinearLayout>
             </RelativeLayout>
 

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

@@ -132,14 +132,20 @@
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>
 
-    <ImageView
+    <Button
         android:id="@+id/sure_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_below="@+id/num"
-        android:layout_margin="@dimen/line_big"
-        android:clickable="true"
-        android:src="@drawable/login_ok" />
-
+        android:background="@drawable/bg_btn"
+        android:layout_width="fill_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/num"
+        android:layout_marginBottom="9dp"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_marginTop="9dp"
+        android:gravity="center"
+        android:textSize="@dimen/text_main"
+        android:text="确    定"
+        android:textColor="@color/white"
+        />
 
 </RelativeLayout>

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/fragment_friend.xml

@@ -14,7 +14,7 @@
         ptr:ptrAnimationStyle="flip"
         ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
         ptr:ptrDrawableStart="@drawable/default_ptr_flip"
-        ptr:ptrHeaderTextColor="@color/black"
+        ptr:ptrHeaderTextColor="@color/refresh"
         ptr:ptrMode="both"
         ptr:ptrOverScroll="false"
         ptr:ptrScrollingWhileRefreshingEnabled="true"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@drawable/bg_main"
     android:layout_height="match_parent"
     android:orientation="vertical" >
        <FrameLayout

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

@@ -2,15 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
-     <ListView
-         android:id="@+id/lv_tool"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:layout_marginTop="15dp"
-         android:divider="#F5F5F5"
-         android:dividerHeight="10dp"
-         android:listSelector="#FFFFFF" >
-     </ListView>
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@+id/lv_tool"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
 
 </LinearLayout>

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_card_notice.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="@dimen/item_me_height"
     android:orientation="vertical">
 
     <!--<TextView-->
@@ -16,7 +16,7 @@
     <RelativeLayout
         android:layout_marginTop="@dimen/line_big"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:paddingLeft="27dp"
         android:paddingRight="27dp">
 
@@ -25,6 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="作者:张超"
+            android:textSize="@dimen/text_main"
             android:textColor="@color/text_main" />
 
         <ImageView
@@ -36,10 +37,13 @@
 
         <TextView
             android:id="@+id/tv_theme"
+            android:textSize="@dimen/text_hine"
+            android:layout_marginTop="@dimen/line_big"
+            android:layout_marginLeft="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:layout_below="@+id/tv_author"
-            android:singleLine="true"
             android:text="新闻正文"
             android:textColor="@color/text_hine" />
 
@@ -53,15 +57,4 @@
             android:textColor="@color/text_hine" />
     </RelativeLayout>
 
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
-
-
-    </LinearLayout>
-
-
 </LinearLayout>

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

@@ -2,14 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/item_color1"
     android:orientation="vertical" >
 
     <TextView
         android:id="@+id/tv_menu_name"
         style="@style/text_black_16"
         android:layout_width="fill_parent"
-        android:layout_height="50dp"
-        android:background="@drawable/select_weixin_list_item"
+        android:layout_height="@dimen/item_height"
+
         android:drawablePadding="10dp"
         android:drawableRight="@drawable/go"
         android:gravity="center_vertical"
@@ -17,10 +18,9 @@
         android:paddingRight="16dp"
         android:text="菜单"
          />
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/wheat" />
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/item_line"/>
 
 </LinearLayout>

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

@@ -1,5 +1,4 @@
 <LinearLayout 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:id="@+id/root_view"

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

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@drawable/bg_main"
     android:layout_height="match_parent">
      <com.handmark.pulltorefresh.library.PullToRefreshListView
          android:id="@+id/listview_schedult"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
-         android:background="#EFEFEF"
-         android:divider="@null" 
-         android:dividerHeight="10dp"
+         android:divider="@null"
          android:listSelector="#00000000"
-         android:padding="5dp"
          android:scrollbars="none" >
      </com.handmark.pulltorefresh.library.PullToRefreshListView>
 </RelativeLayout>

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

@@ -9,9 +9,7 @@
         android:id="@+id/listview_schedult"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-         android:background="@drawable/bg_main"
         android:divider="@null"
-        android:dividerHeight="10dp"
         android:listSelector="#00000000"
         android:fadingEdge="none"
         android:scrollbars="none" >

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">@drawable/BackBar</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/antionbaritemcolor</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">@drawable/BackBar</item>
+        <item name="backgroundStacked">@color/antionbaritemcolor</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/antionbaritemcolor</item>
     </style>
 </resources>

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

@@ -6,11 +6,13 @@
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#BCBBC0</color>
     <color name="antionbarcolor">#646464</color>
+    <color name="antionbaritemcolor">#a3b2cf</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
     <color name="text_hine">#575757</color>
     <color name="bar_color">#e6e6e6</color>
     <color name="bg_main">@color/white</color>
+    <color name="refresh">@color/black</color>
     <!--end gongpengming-->
 
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 allprojects {

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