1、个人资料导航栏菜单调整

2、OA主页面UI调整
3、OA主页面添加下拉刷新
4、外勤签到图标替换
5、CRM主页面添加下拉刷新

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -8,6 +8,7 @@ import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +16,7 @@ import android.os.IBinder;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -22,6 +24,8 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -49,6 +53,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.AddTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -118,6 +123,13 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     private String userId;
     private String userName;
     private String phone;
+    private PopupWindow mMoreWindow;
+    private View mMoreMenuView;
+    private TextView mRemarkNameTv;
+    private TextView mRemoveBlackTv;
+    private TextView mAddBlackTv;
+    private TextView mCancelAttentionTv;
+    private TextView mDeleteAllTv;
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @SuppressLint("NewApi")
@@ -175,12 +187,12 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             if (mFriend.getStatus() != Friend.STATUS_BLACKLIST && mFriend.getStatus() == Friend.STATUS_ATTENTION
                     && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             } else {
-                getMenuInflater().inflate(R.menu.menu_basic_info, menu);
+                getMenuInflater().inflate(R.menu.menu_basic_info, menu);/*
                 if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
                     menu.findItem(R.id.add_blacklist).setVisible(false);
                 } else {
                     menu.findItem(R.id.remove_blacklist).setVisible(false);
-                }
+                }*/
             }
         }
         return super.onPrepareOptionsMenu(menu);
@@ -193,23 +205,16 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             } else {
                 getMenuInflater().inflate(R.menu.menu_basic_info, menu);
-                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                /*if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
                     menu.findItem(R.id.add_blacklist).setVisible(false);
                 } else {
                     menu.findItem(R.id.remove_blacklist).setVisible(false);
-                }
+                }*/
             }
         }
         return super.onCreateOptionsMenu(menu);
     }
 
-    @Override
-    public void onBackPressed() {
-        Intent intent = new Intent();
-        setResult(0x20, intent);
-        super.onBackPressed();
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
@@ -224,18 +229,10 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             return super.onOptionsItemSelected(item);
         }
-        CharSequence[] items = new CharSequence[5];
-        items[0] = getString(R.string.set_remark_name);// 设置备注名
-        if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-            items[1] = getString(R.string.remove_blacklist);
-        } else {
-            items[1] = getString(R.string.add_blacklist);
-        }
-        items[3] = getString(R.string.cancel_attention);
-        items[4] = getString(R.string.delete_all);
+
         int itemId = item.getItemId();
         switch (itemId) {
-            case R.id.set_remark_name:// 设置备注名
+            /*case R.id.set_remark_name:// 设置备注名
                 showRemarkDialog(mFriend);
                 break;
             case R.id.remove_blacklist:// 加入黑名单，或者移除黑名单
@@ -249,14 +246,42 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 break;
             case R.id.delete_all:// 设置备注名
                 showDeleteAllDialog(mFriend);
-                break;
+                break;*/
+            case R.id.basic_info_more:
 
+                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                    mAddBlackTv.setVisibility(View.GONE);
+                    mRemoveBlackTv.setVisibility(View.VISIBLE);
+                } else {
+                    mAddBlackTv.setVisibility(View.VISIBLE);
+                    mRemoveBlackTv.setVisibility(View.GONE);
+                }
+
+                mMoreWindow.showAtLocation(BasicInfoActivity.this.findViewById(R.id.basic_info_ll), Gravity.BOTTOM, 0, 0);
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+                break;
             default:
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    private void closeMorePopupWindow() {
+        if (mMoreWindow != null) {
+            mMoreWindow.dismiss();
+//            mMoreWindow = null;
+            DisplayUtil.backgroundAlpha(mContext, 1f);
+
+        }
+
+    }
+    @Override
+    public void onBackPressed() {
+        Intent intent = new Intent();
+        setResult(0x20, intent);
+        super.onBackPressed();
+    }
+
     /**
      * 懒得判断操作的用户到底属于好友、企业、还是公司，直接发广播，让所有的名片盒页面都更新
      */
@@ -458,6 +483,58 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 sub_tv.setText(StringUtils.isEmpty(depart) ? "" : depart + (StringUtils.isEmpty(position) ? "" : position));
             }
         }
+        mMoreMenuView = View.inflate(getApplicationContext(), R.layout.layout_menu_person_info, null);
+        mRemarkNameTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_set_remark_name);
+        mRemoveBlackTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_remove_blacklist);
+        mAddBlackTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_add_blacklist);
+        mCancelAttentionTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_cancel_attention);
+        mDeleteAllTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_delete_all);
+
+        mRemarkNameTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showRemarkDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mRemoveBlackTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showBlacklistDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mAddBlackTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showBlacklistDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mCancelAttentionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCancelAttentionDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mDeleteAllTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDeleteAllDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMorePopupWindow();
+            }
+        });
+
     }
 
     public void phoneAction(final String phone) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -8,6 +8,7 @@ import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +16,7 @@ import android.os.IBinder;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -22,6 +24,8 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -50,6 +54,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.AddTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -122,6 +127,9 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
     private String userId;
     private String userName;
 
+    private PopupWindow mMoreWindow;
+    private View mMoreMenuView;
+    private TextView mRemarkNameTv, mRemoveBlackTv, mAddBlackTv, mCancelAttentionTv, mDeleteAllTv;
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @SuppressLint("NewApi")
     @Override
@@ -199,11 +207,11 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                     && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             } else {
                 getMenuInflater().inflate(R.menu.menu_basic_info, menu);
-                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                /*if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
                     menu.findItem(R.id.add_blacklist).setVisible(false);
                 } else {
                     menu.findItem(R.id.remove_blacklist).setVisible(false);
-                }
+                }*/
             }
         }
         return super.onPrepareOptionsMenu(menu);
@@ -216,24 +224,28 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                     && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             } else {
                 getMenuInflater().inflate(R.menu.menu_basic_info, menu);
-                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                /*if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
                     menu.findItem(R.id.add_blacklist).setVisible(false);
                 } else {
                     menu.findItem(R.id.remove_blacklist).setVisible(false);
-                }
+                }*/
             }
         }
         return super.onCreateOptionsMenu(menu);
     }
 
-    @Override
+    /*@Override
     public void onBackPressed() {
         super.onBackPressed();
         finish();
-    }
+    }*/
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
         if (mFriend == null) {
             return super.onOptionsItemSelected(item);
         }
@@ -242,19 +254,10 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                 && mFriend.getStatus() == Friend.STATUS_FRIEND) {
             return super.onOptionsItemSelected(item);
         }
-        CharSequence[] items = new CharSequence[4];
-        items[0] = getString(R.string.set_remark_name);// 设置备注名
-        if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-            items[1] = getString(R.string.remove_blacklist);
-        } else {
-            items[1] = getString(R.string.add_blacklist);
-        }
 
-        items[2] = getString(R.string.cancel_attention);
-        items[3] = getString(R.string.delete_all);
         int itemId = item.getItemId();
         switch (itemId) {
-            case R.id.set_remark_name:// 设置备注名
+            /*case R.id.set_remark_name:// 设置备注名
                 showRemarkDialog(mFriend);
                 break;
             case R.id.remove_blacklist:// 加入黑名单，或者移除黑名单
@@ -268,13 +271,34 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                 break;
             case R.id.delete_all:// 设置备注名
                 showDeleteAllDialog(mFriend);
+                break;*/
+            case R.id.basic_info_more:
+
+                if (mFriend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
+                    mAddBlackTv.setVisibility(View.GONE);
+                    mRemoveBlackTv.setVisibility(View.VISIBLE);
+                } else {
+                    mAddBlackTv.setVisibility(View.VISIBLE);
+                    mRemoveBlackTv.setVisibility(View.GONE);
+                }
+
+                mMoreWindow.showAtLocation(CardInfoActivity.this.findViewById(R.id.basic_info_ll), Gravity.BOTTOM, 0, 0);
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
                 break;
             default:
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
+    private void closeMorePopupWindow() {
+        if (mMoreWindow != null) {
+            mMoreWindow.dismiss();
+//            mMoreWindow = null;
+            DisplayUtil.backgroundAlpha(mContext, 1f);
+
+        }
 
+    }
     /**
      * 懒得判断操作的用户到底属于好友、企业、还是公司，直接发广播，让所有的名片盒页面都更新
      */
@@ -468,6 +492,58 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
             }
         });
 
+        mMoreMenuView = View.inflate(getApplicationContext(), R.layout.layout_menu_person_info, null);
+        mRemarkNameTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_set_remark_name);
+        mRemoveBlackTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_remove_blacklist);
+        mAddBlackTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_add_blacklist);
+        mCancelAttentionTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_cancel_attention);
+        mDeleteAllTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_delete_all);
+
+        mRemarkNameTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showRemarkDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mRemoveBlackTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showBlacklistDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mAddBlackTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showBlacklistDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mCancelAttentionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCancelAttentionDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mDeleteAllTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDeleteAllDialog(mFriend);
+                closeMorePopupWindow();
+            }
+        });
+        mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMorePopupWindow();
+            }
+        });
+
     }
 
     public void phoneAction(final String phone) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -20,6 +20,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
+import android.widget.ScrollView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
@@ -35,6 +36,8 @@ import com.github.mikephil.charting.data.BarDataSet;
 import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.utils.LargeValueFormatter;
 import com.github.mikephil.charting.utils.ValueFormatter;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -48,6 +51,7 @@ import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.math.BigDecimal;
@@ -188,8 +192,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private JSONArray subs;
     private String date;
     private JSONArray custs;
-
-
+    @ViewInject(R.id.client_ptrsv)
+    private PullToRefreshScrollView mPullToRefreshScrollView;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -215,6 +219,25 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ib_index_condition.setOnClickListener(this);
         ll_data_more.setOnClickListener(this);
         ll_data_empty.setOnClickListener(this);
+
+        mPullToRefreshScrollView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        mPullToRefreshScrollView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ScrollView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
+                if (CommonUtil.isNetWorkConnected(ClientActivity.this)){
+                    mHttpCount = 0;
+                    initData();
+                }else {
+                    ViewUtil.ToastMessage(ClientActivity.this,"网络未连接",Style.holoRedLight,2000);
+                    mPullToRefreshScrollView.onRefreshComplete(1000);
+                }
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ScrollView> refreshView) {
+
+            }
+        });
     }
 
     private void initData() {
@@ -560,16 +583,18 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         }
     }
 
-
+    private int mHttpCount = 0;
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
+                    mHttpCount++;
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     break;
                 case INIT_PersonalRank://排行
+                    mHttpCount++;
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage PersonalRank:" + msg.getData().getString("result"));
                     JSONObject root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
@@ -750,6 +775,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
                     break;
                 case INIT_SalesKit://销售
+                    mHttpCount++;
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage SalesKit:" + msg.getData().getString("result"));
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
@@ -781,6 +807,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
                     break;
                 case INIT_Targets://指标
+                    mHttpCount++;
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage Targets:" + msg.getData().getString("result"));
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
@@ -867,6 +894,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
                     break;
                 case INIT_InactionCusts:
+                    mHttpCount++;
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage InactionCusts:" + msg.getData().getString("result"));
                     String message = msg.getData().getString("result");
@@ -901,8 +929,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
+                    if (mPullToRefreshScrollView.isRefreshing()){
+                        mPullToRefreshScrollView.onRefreshComplete();
+                    }
                     break;
                 case 6:
+                    mHttpCount++;
                     JSONArray array = JSON.parseObject(msg.getData().getString("result")).getJSONArray("datas");
                     if (array != null) {
                         if (array.size() > 0) {
@@ -916,7 +948,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         }
                     }
                     break;
-
+            }
+            if (mHttpCount > 4){
+                if (mPullToRefreshScrollView.isRefreshing()){
+                    ViewUtil.ToastMessage(ClientActivity.this,"刷新成功", Style.holoGreenLight,2000);
+                    mPullToRefreshScrollView.onRefreshComplete();
+                }
             }
         }
     };

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -10,9 +10,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -30,6 +32,8 @@ 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.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -46,6 +50,7 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
@@ -53,6 +58,7 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -103,8 +109,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.ok_scale)
     private ImageView ok_scale;
 
-    @ViewInject(R.id.oa_main_sv)
-    private ScrollView mScrollView;
     @ViewInject(R.id.oa_more_menu_ll)
     private LinearLayout mMoreMenuLl;
     @ViewInject(R.id.more_menu_tv)
@@ -115,7 +119,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private ImageView mMoreMenuIv;
     @ViewInject(R.id.oa_more_cancel_ll)
     private LinearLayout mCancleMoreMenuLl;
-
+    @ViewInject(R.id.oamain_ptrsv)
+    private PullToRefreshScrollView mPullToRefreshScrollView;
     private Animation mAnimation;
 
     private int mMenuFlag = 0;
@@ -167,6 +172,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         }
                     }
                     loadSuccess();
+                    if (mPullToRefreshScrollView.isRefreshing()) {
+                        ViewUtil.ToastMessage(OAActivity.this, "刷新成功", Style.holoGreenLight, 2000);
+                        mPullToRefreshScrollView.onRefreshComplete();
+                    }
                     break;
                 case 0x12:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
@@ -175,9 +184,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         chaneTAG(true);
                     }
                     break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    if (mPullToRefreshScrollView.isRefreshing()) {
+                        loadSuccess();
+                        mPullToRefreshScrollView.onRefreshComplete();
+                    }
+                    break;
             }
         }
     };
+    private boolean scrollable = true;
+    private float downY;
+    private float moveY;
 
     private Set<Integer> getDay(JSONArray array) {
         JSONObject object = null;
@@ -324,18 +343,46 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
             @Override
             public void onPageSelected(int position) {
-                posItem = position;
-                curDate = date[position];
-                Calendar c = Calendar.getInstance();
-                c.setTime(curDate);
-                setDateTag(curDate);
-                loadNetData(TimeUtils.ym_format.format(curDate));
+                if (CommonUtil.isNetWorkConnected(getApplication())) {
+                    posItem = position;
+                    curDate = date[position];
+                    Calendar c = Calendar.getInstance();
+                    c.setTime(curDate);
+                    setDateTag(curDate);
+                    loadNetData(TimeUtils.ym_format.format(curDate));
+                }
+
             }
 
             @Override
             public void onPageScrollStateChanged(int state) {
             }
         });
+
+        mPullToRefreshScrollView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        mPullToRefreshScrollView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ScrollView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
+//                meInt.clear();
+//                otherInt.clear();
+//                meArray = new JSONArray();
+//                otherArray = new JSONArray();
+                if (CommonUtil.isNetWorkConnected(getApplicationContext())) {
+                    loadNetData(TimeUtils.ym_format.format(curDate));
+                } else {
+                    ViewUtil.ToastMessage(OAActivity.this, "网络未连接", Style.holoRedLight, 2000);
+                    if (mPullToRefreshScrollView.isRefreshing()) {
+//                        loadSuccess();
+                        mPullToRefreshScrollView.onRefreshComplete(1000);
+                    }
+                }
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ScrollView> refreshView) {
+
+            }
+        });
     }
 
     private void initView() {
@@ -347,7 +394,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         emptyLayout.setEmptyViewRes(R.layout.oa_empty_list);
 
         listenerMap = new HashMap<>();
-        curDate = new Date();
+        curDate = new Date(System.currentTimeMillis());
         meInt = new HashSet<>();
         otherInt = new HashSet<>();
         String title = "";
@@ -649,10 +696,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     mAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_rotate_button);
                     mMoreMenuLl.setVisibility(View.VISIBLE);
                     mMoreMenuTv.setText("收起");
+                    scrollable = false;
                 } else {
                     mAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_rotate_button2);
                     mMoreMenuLl.setVisibility(View.GONE);
                     mMoreMenuTv.setText("更多");
+                    scrollable = true;
                 }
                 mMoreMenuIv.startAnimation(mAnimation);
                 mMenuFlag++;
@@ -662,6 +711,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 mMoreMenuIv.startAnimation(mAnimation);
                 mMoreMenuTv.setText("更多");
                 mMoreMenuLl.setVisibility(View.GONE);
+                scrollable = true;
                 mMenuFlag++;
                 break;
             case R.id.stroke://我的行程
@@ -735,6 +785,33 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         listenerMap.put(key, listener);
     }
 
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (scrollable){
+            return super.dispatchTouchEvent(ev);
+        }else {
+            int action = ev.getAction();
+            switch (action){
+                case MotionEvent.ACTION_DOWN:
+                    downY = ev.getRawY();
+                    break;
+                case MotionEvent.ACTION_UP:
+                    if (Math.abs(moveY - downY) > 0){
+                        return true;
+                    }
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    moveY = ev.getRawY();
+                    if (Math.abs(moveY - downY) > 0){
+                        return true;
+                    }
+                    break;
+            }
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
     public interface OnTaskChangeListener {
         void onChange(Set<Integer> in);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -95,10 +95,10 @@ public class OutSigninOKActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            if (StringUtils.isEmpty(text_edit.getText().toString())) {
+            /*if (StringUtils.isEmpty(text_edit.getText().toString())) {
                 Crouton.makeText(ct, "请填写备注");
                 return true;
-            }
+            }*/
             if (!StringUtils.isEmpty(path) && new File(path).isFile())
                 uploadFile(path);
             else

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -512,7 +512,7 @@ public class MessageFragment extends EasyFragment {
             if (convertView == null) {
                 convertView = createConvertView(position);
             }
-            if (rl_b2b != null && rl_b2b.getVisibility() == View.VISIBLE) {//商务显示
+           /* if (rl_b2b != null && rl_b2b.getVisibility() == View.VISIBLE) {//商务显示
                 if (position % 2 == 0) {
                     convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
                 } else {
@@ -524,7 +524,7 @@ public class MessageFragment extends EasyFragment {
                 } else {
                     convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
                 }
-            }
+            }*/
 
             ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
             TextView num_tv = ViewHolder.get(convertView, R.id.num_tv);

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

@@ -2,6 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_main"
+    android:id="@+id/basic_info_ll"
     android:orientation="vertical">
 
     <RelativeLayout

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

@@ -1,405 +1,422 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rootScroll"
+<com.handmark.pulltorefresh.library.PullToRefreshScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#EBE9E9">
+    android:background="#EBE9E9"
+    android:fillViewport="true">
 
     <LinearLayout
-        android:id="@+id/oamain_head_menu_ll"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
+        android:layout_height="match_parent"
         android:orientation="vertical">
-        <!--头布局-->
+
         <LinearLayout
-            android:id="@+id/oa_rl_choose"
+            android:id="@+id/oamain_head_menu_ll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/toobar"
-            android:background="#6A6A6A"
-            android:orientation="vertical"
-            android:paddingTop="10dp">
-
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical">
+            <!--头布局-->
             <LinearLayout
+                android:id="@+id/oa_rl_choose"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="10dp"
-                android:orientation="horizontal">
+                android:layout_below="@+id/toobar"
+                android:background="#6A6A6A"
+                android:orientation="vertical"
+                android:paddingTop="10dp">
 
-                <TextView
-                    android:id="@+id/signin"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_1"
-                    android:gravity="center"
-                    android:text="打卡签到"
-                    android:textColor="@color/white" />
-
-                <TextView
-                    android:id="@+id/outoffice"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_2"
-                    android:gravity="center"
-                    android:text="外勤签到"
-                    android:textColor="@color/white" />
-
-                <TextView
-                    android:id="@+id/worklog"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_4"
-                    android:gravity="center"
-                    android:text="工作日报"
-                    android:textColor="@color/white" />
                 <LinearLayout
-                    android:id="@+id/oamain_more_menu_ll"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginTop="2dp"
-                    android:orientation="vertical">
-                    <ImageView
-                        android:id="@+id/oamain_more_menu_iv"
-                        android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    android:paddingBottom="10dp">
+
+                    <TextView
+                        android:id="@+id/signin"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_1"
                         android:gravity="center"
-                        android:src="@drawable/ic_oa_more"/>
+                        android:text="打卡签到"
+                        android:textColor="@color/white" />
+
                     <TextView
-                        android:id="@+id/more_menu_tv"
-                        android:layout_width="match_parent"
+                        android:id="@+id/outoffice"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_2"
                         android:gravity="center"
-                        android:layout_marginTop="5dp"
-                        android:text="更多"
+                        android:text="外勤签到"
                         android:textColor="@color/white" />
-                </LinearLayout>
 
-            </LinearLayout>
+                    <TextView
+                        android:id="@+id/worklog"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_4"
+                        android:gravity="center"
+                        android:text="工作日报"
+                        android:textColor="@color/white" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="10dp"
-                android:orientation="horizontal">
+                    <LinearLayout
+                        android:id="@+id/oamain_more_menu_ll"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/oamain_more_menu_iv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:src="@drawable/ic_oa_more" />
+
+                        <TextView
+                            android:id="@+id/more_menu_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:gravity="center"
+                            android:text="更多"
+                            android:textColor="@color/white" />
+                    </LinearLayout>
 
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/stroke"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_6"
-                    android:gravity="center"
-                    android:text="我的行程"
-                    android:textColor="@color/white" />
-
-                <TextView
-                    android:id="@+id/meeting"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_3"
-                    android:gravity="center"
-                    android:text="会议管理"
-                    android:textColor="@color/white" />
-
-                <TextView
-                    android:id="@+id/erp"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_5"
-                    android:gravity="center"
-                    android:text="考勤单据"
-                    android:textColor="@color/white" />
-
-                <TextView
-                    android:id="@+id/outtask"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:drawablePadding="@dimen/drawable_padding"
-                    android:drawableTop="@drawable/oa_chuchai"
-                    android:gravity="center"
-                    android:text="出差申请"
-                    android:textColor="@color/white" />
+                    android:orientation="horizontal"
+                    android:paddingBottom="10dp">
 
-            </LinearLayout>
 
-        </LinearLayout>
+                    <TextView
+                        android:id="@+id/stroke"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_6"
+                        android:gravity="center"
+                        android:text="我的行程"
+                        android:textColor="@color/white" />
 
-    </LinearLayout>
-    <!--end 头布局-->
-    <!--标签布局-->
-    <ScrollView
-        android:id="@+id/oa_main_sv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/oamain_head_menu_ll">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/meeting"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_3"
+                        android:gravity="center"
+                        android:text="会议管理"
+                        android:textColor="@color/white" />
 
-                <TextView
-                    android:id="@+id/subord_log"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="下属工作日历"
-                    android:textSize="16dp" />
+                    <TextView
+                        android:id="@+id/erp"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_5"
+                        android:gravity="center"
+                        android:text="考勤单据"
+                        android:textColor="@color/white" />
 
-                <View
-                    android:layout_width="2px"
-                    android:layout_height="match_parent"
-                    android:layout_margin="5dp"
-                    android:background="@color/default_shadow_color" />
+                    <TextView
+                        android:id="@+id/outtask"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_chuchai"
+                        android:gravity="center"
+                        android:text="出差申请"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/my_log"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="我的工作日历"
-                    android:textCursorDrawable="@color/yellow_home"
-                    android:textSize="16dp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp">
+        </LinearLayout>
+        <!--end 头布局-->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-                <View
-                    android:id="@+id/subord_log_tag"
-                    android:layout_width="0dp"
-                    android:layout_height="4px"
-                    android:layout_marginRight="20dp"
-                    android:layout_weight="1"
-                    android:background="@color/darkorange" />
+            <!--标签布局-->
 
-                <View
-                    android:id="@+id/my_log_tag"
-                    android:layout_width="0dp"
-                    android:layout_height="4px"
-                    android:layout_marginLeft="20dp"
-                    android:layout_weight="1"
-                    android:background="@null" />
-            </LinearLayout>
-            <!--end 标签布局-->
-
-            <!--年月日布局-->
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center">
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/yeas_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/day_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+                    <TextView
+                        android:id="@+id/subord_log"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="下属工作日历"
+                        android:textSize="16dp" />
+
+                    <View
+                        android:layout_width="2px"
+                        android:layout_height="match_parent"
+                        android:layout_margin="5dp"
+                        android:background="@color/default_shadow_color" />
 
-                <TextView
-                    android:id="@+id/week_tv"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/my_log"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="我的工作日历"
+                        android:textCursorDrawable="@color/yellow_home"
+                        android:textSize="16dp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
-            </LinearLayout>
+                    android:orientation="horizontal"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp">
+
+                    <View
+                        android:id="@+id/subord_log_tag"
+                        android:layout_width="0dp"
+                        android:layout_height="4px"
+                        android:layout_marginRight="20dp"
+                        android:layout_weight="1"
+                        android:background="@color/darkorange" />
+
+                    <View
+                        android:id="@+id/my_log_tag"
+                        android:layout_width="0dp"
+                        android:layout_height="4px"
+                        android:layout_marginLeft="20dp"
+                        android:layout_weight="1"
+                        android:background="@null" />
+                </LinearLayout>
+                <!--end 标签布局-->
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:background="@color/item_line" />
+                <!--年月日布局-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="35dp"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center">
 
-            <android.support.v4.view.ViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="230dp" />
+                    <TextView
+                        android:id="@+id/yeas_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:background="@color/item_line" />
-            <!--end 年月日布局-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/day_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
-                <TextView
-                    android:id="@+id/all_task_num"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="3dp"
-                    android:gravity="center"
-                    android:text="工作日历:0"
-                    android:textSize="@dimen/text_main" />
-
-                <TextView
-                    android:id="@+id/ok_task_num"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="已完成:0"
-                    android:textSize="@dimen/text_main" />
+                    <TextView
+                        android:id="@+id/week_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
+                </LinearLayout>
 
                 <View
-                    android:layout_width="2px"
-                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="2px"
                     android:background="@color/item_line" />
 
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/viewPager"
+                    android:layout_width="match_parent"
+                    android:layout_height="230dp" />
+
                 <View
-                    android:layout_width="1px"
-                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
                     android:background="@color/item_line" />
-
-                <TextView
-                    android:id="@+id/uok_task_num"
-                    android:layout_width="0dp"
+                <!--end 年月日布局-->
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="未完成:0"
-                    android:textSize="@dimen/text_main" />
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/all_task_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:gravity="center"
+                        android:text="工作日历:0"
+                        android:textSize="@dimen/text_hine" />
+
+                    <View
+                        android:layout_width="1px"
+                        android:layout_height="match_parent"
+                        android:background="#f17e21" />
+
+                    <TextView
+                        android:id="@+id/ok_task_num"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="已完成:0"
+                        android:textSize="@dimen/text_hine" />
+
+                    <View
+                        android:layout_width="1px"
+                        android:layout_height="match_parent"
+                        android:background="#f17e21" />
+
+                    <TextView
+                        android:id="@+id/uok_task_num"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="未完成:0"
+                        android:textSize="@dimen/text_hine" />
+
+                    <View
+                        android:layout_width="1px"
+                        android:layout_height="match_parent"
+                        android:background="@color/item_line" />
+
+                    <ImageView
+                        android:id="@+id/ok_scale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="22dp"
+                        android:layout_marginRight="8dp"
+                        android:gravity="center"
+                        android:src="@drawable/filter" />
+                </LinearLayout>
 
                 <View
-                    android:layout_width="1px"
-                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="2px"
                     android:background="@color/item_line" />
 
-                <ImageView
-                    android:id="@+id/ok_scale"
-                    android:layout_width="wrap_content"
-                    android:layout_height="22dp"
-                    android:layout_marginRight="8dp"
-                    android:gravity="center"
-                    android:src="@drawable/filter" />
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/oa_listview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
+                    android:divider="@color/item_line"
+                    android:dividerHeight="2px"
+                    android:focusableInTouchMode="false" />
             </LinearLayout>
 
-            <View
+            <LinearLayout
+                android:id="@+id/oa_more_menu_ll"
                 android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:background="@color/item_line" />
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:visibility="gone">
 
-            <com.xzjmyk.pm.activity.view.MyListView
-                android:id="@+id/oa_listview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="30dp"
-                android:divider="@color/item_line"
-                android:dividerHeight="2px"
-                android:focusableInTouchMode="false" />
-        </LinearLayout>
-    </ScrollView>
-    <LinearLayout
-        android:id="@+id/oa_more_menu_ll"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/oamain_head_menu_ll"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="10dp"
-            android:background="#6A6A6A"
-            android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#6A6A6A"
+                    android:orientation="horizontal"
+                    android:paddingBottom="10dp">
 
-            <TextView
-                android:id="@+id/oamain_overtime_apply_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
-                android:drawableTop="@drawable/oa_jiaban"
-                android:gravity="center"
-                android:text="加班申请"
-                android:visibility="gone"
-                android:textColor="@color/white" />
-
-            <TextView
-                android:id="@+id/oamain_special_attendance_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
-                android:drawableTop="@drawable/oa_8"
-                android:gravity="center"
-                android:text="查询统计"
-                android:textColor="@color/white" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:textColor="@color/white" />
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:textColor="@color/white" />
-            
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/oa_more_cancel_ll"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:background="#30000000">
+                    <TextView
+                        android:id="@+id/oamain_overtime_apply_tv"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_jiaban"
+                        android:gravity="center"
+                        android:text="加班申请"
+                        android:textColor="@color/white"
+                        android:visibility="gone" />
 
-        </LinearLayout>
+                    <TextView
+                        android:id="@+id/oamain_special_attendance_tv"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:drawablePadding="@dimen/drawable_padding"
+                        android:drawableTop="@drawable/oa_8"
+                        android:gravity="center"
+                        android:text="查询统计"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:gravity="center" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/oa_more_cancel_ll"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#40000000"
+                    android:orientation="horizontal">
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </FrameLayout>
     </LinearLayout>
 
-</RelativeLayout>
+
+</com.handmark.pulltorefresh.library.PullToRefreshScrollView>

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

@@ -26,7 +26,7 @@
                 android:drawableLeft="@drawable/outffice_com"
                 android:drawablePadding="6dp"
                 android:text="当前企业:"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/com_tv"
@@ -36,7 +36,7 @@
                 android:layout_toRightOf="@+id/com_tag"
                 android:ellipsize="end"
                 android:lines="1"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -54,7 +54,7 @@
                 android:drawableLeft="@drawable/outoffice_time"
                 android:drawablePadding="6dp"
                 android:text="签到时间:"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/time_tv"
@@ -62,7 +62,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/time_tag"
                 android:layout_toRightOf="@id/time_tag"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/addr_tag"
@@ -74,7 +75,7 @@
                 android:drawableLeft="@drawable/outffice_addr"
                 android:drawablePadding="6dp"
                 android:text="签到地点:"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/addr_tv"
@@ -83,7 +84,8 @@
                 android:layout_alignTop="@id/addr_tag"
                 android:layout_toRightOf="@+id/addr_tag"
                 android:maxLines="2"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:textSize="@dimen/text_hine"/>
         </RelativeLayout>
 
         <View
@@ -105,10 +107,10 @@
                 android:layout_height="wrap_content"
                 android:background="@null"
                 android:gravity="top"
-                android:hint="请填写备注(不超过60个字)"
+                android:hint="请填写备注(必填)"
                 android:inputType="textMultiLine"
                 android:minLines="6"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <RelativeLayout
                 android:layout_width="match_parent"

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

@@ -3,7 +3,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:background="#ebe9e9"
     android:orientation="vertical" >
 
     <RelativeLayout

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

@@ -57,7 +57,7 @@
             android:layout_alignLeft="@id/location"
             android:layout_below="@id/location"
             android:layout_marginTop="5dp"
-            android:src="@drawable/addr" />
+            android:src="@drawable/ic_outoffice_addr" />
 
 
         <TextView
@@ -76,7 +76,7 @@
             android:layout_alignLeft="@id/addr_img"
             android:layout_below="@id/addr"
             android:layout_marginTop="5dp"
-            android:src="@drawable/icon_answer" />
+            android:src="@drawable/ic_outoffice_msg" />
 
         <TextView
             android:id="@+id/remark"

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

@@ -0,0 +1,65 @@
+<?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="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <TextView
+        android:id="@+id/basic_info_set_remark_name"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="@string/set_remark_name"
+        android:textColor="@color/black"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/basic_info_remove_blacklist"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="@string/remove_blacklist"
+        android:textColor="@color/black"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/basic_info_add_blacklist"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:text="@string/add_blacklist"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/basic_info_cancel_attention"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:text="@string/cancel_attention"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid"/>
+    <TextView
+        android:id="@+id/basic_info_delete_all"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="@string/delete_all"
+        android:textColor="@color/red"
+        android:textSize="15sp"/>
+
+</LinearLayout>

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

@@ -2,13 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#ebe9e9"
     android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/schedule_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color1"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -89,11 +90,18 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
+
     <RelativeLayout
         android:id="@+id/task_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color2"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -173,11 +181,18 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
+
     <RelativeLayout
         android:id="@+id/notice_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color1"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -257,11 +272,18 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
+
     <RelativeLayout
         android:id="@+id/_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color2"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -341,12 +363,18 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
 
     <RelativeLayout
         android:id="@+id/rl_b2b_business"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color1"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -425,4 +453,10 @@
         </RelativeLayout>
 
     </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
 </LinearLayout>

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

@@ -5,6 +5,7 @@
     android:descendantFocusability="blocksDescendants"
     android:minHeight="@dimen/item_height"
     android:paddingLeft="15dp"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:paddingRight="15dp">
     <!--android:background="@color/item_color1"-->
     <FrameLayout

WeiChat/src/main/res/menu/menu_basic_info.xml

@@ -1,8 +1,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.xzjmyk.pm.activity.MainActivity">
 
     <item
+        android:id="@+id/basic_info_more"
+        android:icon="@drawable/ic_dot_more"
+        android:title="更多"
+        app:showAsAction="ifRoom"/>
+    <!--<item
         android:id="@+id/set_remark_name"
         android:title="@string/set_remark_name" />
     <item
@@ -11,14 +17,14 @@
     <item
         android:id="@+id/add_blacklist"
         android:title="@string/add_blacklist" />
-    <!--<item-->
-        <!--android:id="@+id/set_more_attention"-->
-        <!--android:title="@string/more_attention" />-->
+    &lt;!&ndash;<item&ndash;&gt;
+        &lt;!&ndash;android:id="@+id/set_more_attention"&ndash;&gt;
+        &lt;!&ndash;android:title="@string/more_attention" />&ndash;&gt;
     <item
         android:id="@+id/cancel_attention"
         android:title="@string/cancel_attention" />
     <item
         android:id="@+id/delete_all"
-        android:title="@string/delete_all" />
+        android:title="@string/delete_all" />-->
 
 </menu>

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

@@ -296,4 +296,5 @@
 
     <color name="me_menu_item_normal">#FAF9F9</color>
     <color name="me_menu_item_press">#DFDEDE</color>
+    <color name="bg_underlying">#ebe9e9</color>
 </resources>

pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java

@@ -20,26 +20,42 @@ import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.widget.ScrollView;
 
 public class PullToRefreshScrollView extends PullToRefreshBase<ScrollView> {
+	private boolean scrollable = true;
+	private float downY;
+	private int mTouchSlop;
 
 	public PullToRefreshScrollView(Context context) {
 		super(context);
+		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 	}
 
 	public PullToRefreshScrollView(Context context, AttributeSet attrs) {
 		super(context, attrs);
+		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 	}
 
 	public PullToRefreshScrollView(Context context, Mode mode) {
 		super(context, mode);
+		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 	}
 
 	public PullToRefreshScrollView(Context context, Mode mode, AnimationStyle style) {
 		super(context, mode, style);
+		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 	}
+	/*public boolean isScrollable() {
+		return scrollable;
+	}
+
+	public void setScrollable(boolean scrollable) {
+		this.scrollable = scrollable;
+	}*/
 
 	@Override
 	public final Orientation getPullToRefreshScrollDirection() {
@@ -105,5 +121,26 @@ public class PullToRefreshScrollView extends PullToRefreshBase<ScrollView> {
 			}
 			return scrollRange;
 		}
+
+		@Override
+		public boolean onInterceptTouchEvent(MotionEvent ev) {
+			if (scrollable){
+				return super.onInterceptTouchEvent(ev);
+			}else {
+				int action = ev.getAction();
+				switch (action){
+					case MotionEvent.ACTION_DOWN:
+						downY = ev.getRawY();
+						break;
+					case MotionEvent.ACTION_MOVE:
+						float moveY = ev.getRawY();
+						if (Math.abs(moveY - downY) > mTouchSlop){
+							return true;
+						}
+						break;
+				}
+			}
+			return super.onInterceptTouchEvent(ev);
+		}
 	}
 }