修改冲突

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -144,6 +144,7 @@
         <activity android:name=".ui.erp.activity.WorkExtraActivity" />
         <activity android:name=".ui.erp.activity.TravelActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
+        <activity android:name=".ui.erp.activity.oa.SelectAlarmTimeActivity"/>
         <activity android:name=".ui.message.SelectActivity" />
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -26,9 +26,9 @@ public class WorkDailyAdapter extends BaseAdapter {
         this.mContext = mContext;
     }
 
-    public List<WorkDailyBean> getmWorkDailyBeanList() {
-        return mWorkDailyBeanList;
-    }
+//    public List<WorkDailyBean> getmWorkDailyBeanList() {
+//        return mWorkDailyBeanList;
+//    }
 
     public void setmWorkDailyBeanList(List<WorkDailyBean> mWorkDailyBeans) {
         this.mWorkDailyBeanList = mWorkDailyBeans;
@@ -65,11 +65,11 @@ public class WorkDailyAdapter extends BaseAdapter {
         }
 
     //时间返回为空时显示今日时间
-        if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
+      /*  if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
             viewHolder.WorkDailyDate.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        }else{
+        }else{*/
             viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
-        }
+       // }
         //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
         if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
             viewHolder.WorkDailyStatus.setTextColor(Color.GREEN);

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/CompanyContactsActivity.java

@@ -1157,7 +1157,7 @@ public class CompanyContactsActivity extends BaseActivity {
                     }
                     item.iv_enter.setVisibility(View.GONE);
                 } else {
-                    convertView.setBackgroundColor(Color.parseColor("#FFFFFF"));
+                    convertView.setBackgroundColor(Color.parseColor("#f3f3f3"));
                 }
             }
             return convertView;

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

@@ -39,6 +39,7 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -64,6 +65,8 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
     private String mSubsurl;
     private TextView mPreTv;
     private TextView mNextTv;
+    private List<Object> mReadSubs;
+
     private  Handler hander = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -107,6 +110,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         mPreTv = (TextView) findViewById(R.id.web_previous_tv);
         mNextTv = (TextView) findViewById(R.id.web_next_tv);
 
+        mReadSubs = new ArrayList<>();
         isStartApp = false;
         pb = (ProgressBar) findViewById(R.id.pb);
         pb.setMax(100);
@@ -234,26 +238,51 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                 mPosition++;
                 break;
         }
-        getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTITLE_());
-        if (mPosition == 0){
-            mPreTv.setVisibility(View.GONE);
-            mNextTv.setVisibility(View.VISIBLE);
-        }else if (mPosition == mSubscriptionMessages.size() - 1){
-            mPreTv.setVisibility(View.VISIBLE);
-            mNextTv.setVisibility(View.GONE);
-        }else {
-            mPreTv.setVisibility(View.VISIBLE);
-            mNextTv.setVisibility(View.VISIBLE);
+        if (mSubscriptionMessages != null){
+            mReadSubs.add(mPosition);
+            getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTITLE_());
+            if (mPosition == 0){
+                mPreTv.setVisibility(View.GONE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }else if (mPosition == mSubscriptionMessages.size() - 1){
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.GONE);
+            }else {
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }
+            url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
+                    + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
+                    + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
+                    + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
+            Map<String,String> headers=new HashMap<>();
+            headers.put("client-name","uasClient");
+            webView.getRefreshableView().loadUrl(url,headers);
         }
-        url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
-                + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
-                + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
-                + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
-        Map<String,String> headers=new HashMap<>();
-        headers.put("client-name","uasClient");
-        webView.getRefreshableView().loadUrl(url,headers);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (!mReadSubs.isEmpty()){
+            List<Integer> singleElement = (List)CommonUtil.getSingleElement(mReadSubs);
+            ArrayList<Integer> readIntegers = new ArrayList<>();
+            readIntegers.addAll(singleElement);
+            Intent intent = new Intent();
+            intent.putIntegerArrayListExtra("readsubs", readIntegers);
+            setResult(22, intent);
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
 
     public class WebChromeClient extends android.webkit.WebChromeClient {
         @Override
@@ -304,6 +333,14 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onBackPressed() {
+        if (!mReadSubs.isEmpty()){
+            List<Integer> singleElement = (List)CommonUtil.getSingleElement(mReadSubs);
+            ArrayList<Integer> readIntegers = new ArrayList<>();
+            readIntegers.addAll(singleElement);
+            Intent intent = new Intent();
+            intent.putIntegerArrayListExtra("readsubs", readIntegers);
+            setResult(22, intent);
+        }
         if (isStartApp) {
             Intent intent = new Intent(WebViewCommActivity.this, MainActivity.class);
             startActivity(intent);

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/DailydetailsActivity.java

@@ -36,7 +36,8 @@ public class DailydetailsActivity extends BaseActivity {
     private String plan;
     private String experience;
     private String status;
-    private MyListView work_tasklv;
+    private MyListView complete_tasklv;
+    private MyListView uncomplete_tasklv;
     private MyListView approval_flowlv;
     private LinearLayout plan_ll;
     private LinearLayout experience_ll;
@@ -47,7 +48,6 @@ public class DailydetailsActivity extends BaseActivity {
     private EmptyLayout mEmptyLayput_approvalflow;
     private EmptyLayout mEmptyLayput_Task;
     private TextView no_task;
-    private RelativeLayout task_rl;
 
 
     @Override
@@ -68,10 +68,10 @@ public class DailydetailsActivity extends BaseActivity {
         wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
         plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
         experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
-        work_tasklv = (MyListView) findViewById(R.id.work_daily_detail_task_lv);
+        complete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_completedtask_lv);
+        uncomplete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_uncompletedtask_lv);
         approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
         no_task = (TextView) findViewById(R.id.work_daily_detail_no_task);
-        task_rl = (RelativeLayout) findViewById(R.id.work_daily_detail_task_rl);
 
         //加载审批流的适配器
         mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
@@ -93,7 +93,7 @@ public class DailydetailsActivity extends BaseActivity {
 //        }
 
         //加载我的任务的适配器
-        mEmptyLayput_Task = new EmptyLayout(this, work_tasklv);
+        mEmptyLayput_Task = new EmptyLayout(this, complete_tasklv);
         mEmptyLayput_Task.setShowEmptyButton(false);
         mEmptyLayput_Task.setShowErrorButton(false);
         mEmptyLayput_Task.setShowLoadingButton(false);
@@ -108,7 +108,7 @@ public class DailydetailsActivity extends BaseActivity {
             mWorkTaskBeanList.add(workTaskBean);
         }
             mDailyDetailsWorkTaskAdapter.setmWorkTaskBeanList(mWorkTaskBeanList);
-            work_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
+            complete_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
 //        }
 
         //获取、处理、赋值从日报列表界面点击跳转传来的数据
@@ -116,7 +116,6 @@ public class DailydetailsActivity extends BaseActivity {
         date = intent.getStringExtra("Date");
         summary = intent.getStringExtra("Content");
         status = intent.getStringExtra("Status");
-
         if (!TextUtils.isEmpty(intent.getStringExtra("Plan"))) {
             plan = intent.getStringExtra("Plan");
         } else {

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.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -54,6 +59,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;
@@ -104,8 +110,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)
@@ -116,7 +120,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;
@@ -168,6 +173,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");//获取到数据
@@ -177,6 +186,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     }
                     break;
                 default:
+                    if (mPullToRefreshScrollView.isRefreshing()) {
+                        loadSuccess();
+                        mPullToRefreshScrollView.onRefreshComplete();
+                    }
                     try {
                         if (!StringUtils.isEmpty(message) && StringUtils.isInclude(message, "会话已断开")) {
                             returnLogin();
@@ -196,6 +209,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             }
         }
     };
+    private boolean scrollable = true;
+    private float downY;
+    private float moveY;
 
     private Set<Integer> getDay(JSONArray array) {
         JSONObject object = null;
@@ -342,18 +358,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() {
@@ -365,7 +409,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 = "";
@@ -679,10 +723,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++;
@@ -692,6 +738,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://我的行程
@@ -765,6 +812,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/erp/activity/oa/WorkDailyAddActivity.java

@@ -14,6 +14,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
 
@@ -36,10 +37,10 @@ import java.util.Map;
  */
 public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchListener {
 
-    private FormEditText add_summary;
-    private FormEditText add_plan;
-    private FormEditText add_experience;
-    private Button add_submit;
+    private EditText add_summary;
+    private EditText add_plan;
+    private EditText add_experience;
+    private ImageView add_submit;
     private ImageView share_experience;
     private boolean imOk = false;
     private boolean erpOk = false;
@@ -108,10 +109,10 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        setContentView(R.layout.activity_add_work_daily);
        getSupportActionBar().setTitle("工作日报");
 
-       add_summary = (FormEditText) findViewById(R.id.add_work_daily_summary_et);
-       add_plan = (FormEditText) findViewById(R.id.add_work_daily_plan_et);
-       add_experience = (FormEditText) findViewById(R.id.add_work_daily_experience_et);
-       add_submit = (Button) findViewById(R.id.add_work_daily_submitted_btn);
+       add_summary = (EditText) findViewById(R.id.add_work_daily_summary_et);
+       add_plan = (EditText) findViewById(R.id.add_work_daily_plan_et);
+       add_experience = (EditText) findViewById(R.id.add_work_daily_experience_et);
+       add_submit = (ImageView) findViewById(R.id.add_work_daily_submit_iv);
        share_experience = (ImageView) findViewById(R.id.add_work_daily_sharing_experience_im);
 /*
 

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

@@ -9,6 +9,7 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
@@ -21,6 +22,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -36,7 +38,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Created by FANGlh on 2016/11/1.
  */
@@ -59,7 +60,8 @@ public class WorkDailyShowActivity extends BaseActivity {
     public void initView() {
         setContentView(R.layout.activity_work_daily);
         getSupportActionBar().setTitle("日报记录");
-        mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
+        mSearchEt = (ClearEditText) findViewById(R.
+                id.work_daily_search_edit);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
 
         mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
@@ -91,13 +93,18 @@ public class WorkDailyShowActivity extends BaseActivity {
 
                 List<WorkDailyBean> chche = new ArrayList<>();
 
-                if (mWorkDailyList == null || mWorkDailyList.size() <= 0) return;
-                for (WorkDailyBean wd : mWorkDailyList) {
-                    boolean b = getResult(wd.getWD_DATE() + wd.getWD_COMMENT() + wd.getSTATUS(), strChche.trim());
-                    if (b) {
-                        chche.add(wd);
+                if (mWorkDailyList == null || mWorkDailyList.size() <= 0) {
+                    mEmptyLayout.showEmpty();
+                    return;
+                }else{
+                    for (WorkDailyBean wd : mWorkDailyList) {
+                        boolean b = getResult(wd.getWD_DATE() + wd.getWD_COMMENT() + wd.getSTATUS(), strChche.trim());
+                        if (b) {
+                            chche.add(wd);
+                        }
                     }
                 }
+
                 mWorkDailyAdapter.setmWorkDailyBeanList(chche);
                 mWorkDailyAdapter.notifyDataSetChanged();
             }
@@ -171,11 +178,9 @@ public class WorkDailyShowActivity extends BaseActivity {
                         if (mCurrentPage == 1 && dailydataArray == null && mWorkDailyList.isEmpty()) {
                             mEmptyLayout.showEmpty();
                         } else {
-                            for (int i = 0; i < dailydataArray.length(); i++) {
-                                JSONObject currentObject = dailydataArray.getJSONObject(i);
-                                WorkDailyBean workDailyBean = JSON.parseObject(currentObject.toString(), WorkDailyBean.class);
-                                mWorkDailyList.add(workDailyBean);
-                            }
+                          //  Log.i("aaaaa",dailydataArray.toString());
+                            mWorkDailyList=JSON.parseArray(dailydataArray.toString(),WorkDailyBean.class);
+                            mWorkDailyAdapter.setmWorkDailyBeanList(mWorkDailyList);
                             mWorkDailyAdapter.notifyDataSetChanged();
                         }
                     } catch (JSONException e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -51,6 +51,7 @@ 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.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -103,7 +104,6 @@ public class AutoCreateChatFragment extends EasyFragment {
         setHasOptionsMenu(true);
         getActivity().registerReceiver(mUpdateReceiver,
                 MucgroupUpdateUtil.getUpdateActionFilter());
-
     }
 
     @Override
@@ -149,7 +149,7 @@ public class AutoCreateChatFragment extends EasyFragment {
         mPullToRefreshListView.setAdapter(mAdapter);
 
         View emptyView = LayoutInflater.from(getActivity()).inflate(
-                R.layout.layout_list_empty_view, null);
+                R.layout.view_empty, null);
         mPullToRefreshListView.setEmptyView(emptyView);
 
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -36,6 +36,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -73,6 +74,7 @@ public class GroupChatFragment extends EasyFragment {
 
     public GroupChatFragment() {
         mMucRooms = new ArrayList<MucRoom>();
+
         mAdapter = new MucRoomAdapter();
     }
 
@@ -82,7 +84,6 @@ public class GroupChatFragment extends EasyFragment {
         setHasOptionsMenu(true);
         getActivity().registerReceiver(mUpdateReceiver,
                 MucgroupUpdateUtil.getUpdateActionFilter());
-
     }
 
     @Override
@@ -134,7 +135,7 @@ public class GroupChatFragment extends EasyFragment {
     private void initView() {
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         View emptyView = LayoutInflater.from(getActivity()).inflate(
-                R.layout.layout_list_empty_view, null);
+                R.layout.view_empty, null);
         mPullToRefreshListView.setEmptyView(emptyView);
 
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
@@ -306,6 +307,7 @@ public class GroupChatFragment extends EasyFragment {
                             }
                         }
                     }
+
                     mAdapter.notifyDataSetChanged();
                 }
                 if (!b) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -427,6 +427,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
         } else {
             String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
+            Log.i("bbb",masterlist);
             List<Master> mList = JSON.parseArray(masterlist, Master.class);
             if (CommonUtil.isDialogShowing(mDialog)) {
                 return;

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/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -72,7 +72,8 @@ public class SubscriptionActivity extends BaseActivity {
             R.drawable.uu_dy_image1, R.drawable.uu_dy_image2, R.drawable.uu_dy_image3, R.drawable.uu_dy_image4, R.drawable.uu_dy_image5, R.drawable.uu_dy_image6, R.drawable.uu_dy_image7
 
     };
-
+    private int mClickPos;
+    private final static int REQUEST_SUBS_DETAIL = 101;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -330,6 +331,26 @@ public class SubscriptionActivity extends BaseActivity {
         ViewUtil.httpSendRequest(this, url, param, handler, headers, LOAD_NET, null, null, "get");
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_SUBS_DETAIL && resultCode == 22 && data != null){
+            ArrayList<Integer> readSubs = data.getIntegerArrayListExtra("readsubs");
+            SortSubsrciprion sortSubsrciprion = sortSubsrciprions.get(mClickPos);
+            sortSubsrciprions.remove(mClickPos);
+            ArrayList<SubscriptionMessage> subscriptionMessages = sortSubsrciprion.beans;
+            for (int i = 0; i < readSubs.size(); i++) {
+                subscriptionMessages.get(readSubs.get(i)).setSTATUS_(1);
+                SubscriptionDao.getInstance().UpdateStatus(subscriptionMessages.get(readSubs.get(i)).getID_() + "", true);
+            }
+            sortSubsrciprions.add(mClickPos, sortSubsrciprion);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    private ArrayList<SubscriptionMessage> mSubscriptionMessages = new ArrayList<>();
+    private ListAdapter listAdapter = null;
+
     //外层list
     class SubscriptionAdapter extends BaseAdapter {
         List<SortSubsrciprion> sortSubsrciprions;
@@ -343,8 +364,6 @@ public class SubscriptionActivity extends BaseActivity {
             notifyDataSetChanged();
         }
 
-        private ListAdapter listAdapter = null;
-
         @Override
         public int getCount() {
             return ListUtils.isEmpty(sortSubsrciprions) ? 0 : sortSubsrciprions.size();
@@ -374,7 +393,8 @@ public class SubscriptionActivity extends BaseActivity {
                 viewholder = (Viewholder) contextView.getTag();
             }
             viewholder.tvTime.setText(sortSubsrciprions.get(position).time);
-            listAdapter = new ListAdapter(sortSubsrciprions.get(position).beans, position);
+            mSubscriptionMessages = sortSubsrciprions.get(position).beans;
+            listAdapter = new ListAdapter(mSubscriptionMessages, position);
             viewholder.listview.setAdapter(listAdapter);
             return contextView;
         }
@@ -482,6 +502,7 @@ public class SubscriptionActivity extends BaseActivity {
             contextView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
+                    mClickPos = position;
                     SubscriptionMessage bean = sortSubsrciprions.get(position).beans.get(i);
                     String url = baseUrl + "common/charts/mobileCharts.action";
                     Log.i("weburl: ", url);
@@ -501,7 +522,7 @@ public class SubscriptionActivity extends BaseActivity {
                     intent_web.putExtra("subsact", "subsDetail");
                     intent_web.putExtra("position", i);
                     intent_web.putExtra("subsdata", beans);
-                    ct.startActivity(intent_web);
+                    SubscriptionActivity.this.startActivityForResult(intent_web,REQUEST_SUBS_DETAIL);
 
                     if (bean.getSTATUS_() == 0) {//当点击未读消息
                         SubscriptionDao.getInstance().UpdateStatus(bean.getID_() + "", true);

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

@@ -8,13 +8,13 @@
         android:width="0.5dp"
         android:color="@android:color/black" />
     <!-- 圆角 -->
-    <corners android:radius="9dp" />
+    <corners android:radius="15dp" />
     <!-- 边距 -->
     <padding
-        android:bottom="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:top="10dp" />
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp" />
     <!-- 渐变 -->
     <!--<gradient-->
     <!--android:angle="270"-->

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+
+    <item android:drawable="@color/me_menu_item_normal"/>
+</selector>

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

@@ -54,7 +54,7 @@
                     android:id="@+id/hv_head_view"
                     android:layout_width="fill_parent"
                     android:layout_height="40dip"
-                    android:background="#F2F2F2"
+                    android:background="#ffffff"
                     android:fadingEdge="none"
                     android:scrollbars="none">
 
@@ -104,6 +104,8 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="5"
+                        android:divider="#dfdede"
+                        android:dividerHeight="0.5dp"
                         android:scrollbars="none" />
                 </LinearLayout>
             </LinearLayout>

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

@@ -23,70 +23,69 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/gainsboro" />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:layout_marginTop="8dp"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="18sp"
+                    android:textSize="16sp"
                     android:text="工作总结"
                     android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="8dp"
                     />
-                <com.andreabaccega.widget.FormEditText
+                <EditText
                     android:id="@+id/add_work_daily_summary_et"
-                    style="@style/form_relative_right_text"
+                    style="@style/form_relative_right_text2"
                     android:hint="请输入今日工作总结(必填)"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginTop="1dp"
-                    android:gravity="top"
-                    android:minHeight="120dp"
-                    android:padding="5dp"
-                    android:maxHeight="1000dp"
-
                     />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/gainsboro" />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="18sp"
+                    android:textSize="16sp"
                     android:text="工作计划"
                     android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"/>
-                <com.andreabaccega.widget.FormEditText
+                    android:layout_marginTop="8dp"/>
+                <EditText
                     android:id="@+id/add_work_daily_plan_et"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
-                    android:hint="请输入明日工作计划(非必填)"
-                    android:layout_marginTop="1dp"
-                    android:minHeight="120dp"
-                    android:padding="5dp"
-                    android:maxHeight="1000dp"/>
+                    style="@style/form_relative_right_text2"
+                    android:hint="请输入明日工作计划(非必填)"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/gainsboro" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+
                     >
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="工作心得"
                         android:paddingLeft="20dp"
-                        android:layout_marginTop="1dp"
-                        android:textSize="18sp"
+                        android:textSize="16sp"
+                        android:layout_marginTop="8dp"
                         />
                     <ImageButton
                         android:id="@+id/add_work_daily_sharing_experience_im"
@@ -94,37 +93,37 @@
                         android:layout_height="30dp"
                         android:src="@drawable/icon_app_share"
                         android:layout_alignParentRight="true"
-                        android:layout_marginTop="1dp"
+                        android:layout_marginTop="0dp"
                         android:layout_marginRight="20dp"
-                        android:background="#7191F7"
+                        android:background="@color/lightskyblue"
                         android:visibility="visible"
                         />
                 </RelativeLayout>
-                <com.andreabaccega.widget.FormEditText
+                <EditText
                     android:id="@+id/add_work_daily_experience_et"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
+                    style="@style/form_relative_right_text2"
                     android:hint="点击分享按钮可将工作心得分享到工作圈(非必填)"
-                    android:minHeight="120dp"
-                    android:maxHeight="1000dp"
-                    android:layout_marginTop="1dp"
-                    android:padding="5dp" />
+                    />
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/ly_bottom_submit"
-                style="@style/form_linear_customer">
 
-                <Button
-                    android:id="@+id/add_work_daily_submitted_btn"
-                    style="@style/from_button_base_bule"
-                    android:layout_marginTop="10dp"
-                    android:textSize="20sp"
-                    android:text="提    交" />
-            </LinearLayout>
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+    <LinearLayout
+        android:id="@+id/ly_bottom_submit"
+        style="@style/form_linear_customer">
+
+        <ImageView
+            android:id="@+id/add_work_daily_submit_iv"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/submit3"
+            android:layout_marginTop="10dp"
+            android:textSize="20sp"
+            android:text="提    交"/>
+    </LinearLayout>
 
 </LinearLayout>

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
@@ -24,7 +25,7 @@
                 android:drawableTop="@drawable/add_friend"
                 android:gravity="center"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/push_task_tv"
@@ -36,7 +37,7 @@
                 android:gravity="center"
                 android:text="发任务"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
         </LinearLayout>
 
 
@@ -47,7 +48,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="250dp">
+                android:layout_height="220dp">
 
                 <ImageView
                     android:id="@+id/max_img"
@@ -77,8 +78,8 @@
                         android:layout_below="@id/avatar_img"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_hine" />
 
                     <TextView
                         android:id="@+id/sub_tv"
@@ -87,8 +88,8 @@
                         android:layout_below="@id/name_tv"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_hine" />
 
 
                 </RelativeLayout>
@@ -101,7 +102,7 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
+                android:layout_height="45dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp">
 
@@ -129,7 +130,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_alignTop="@id/phone_tag"
+                    android:layout_centerVertical="true"
                     android:src="@drawable/info_phone" />
             </RelativeLayout>
 
@@ -141,7 +142,7 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
+                android:layout_height="45dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp">
 
@@ -150,7 +151,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="邮箱"
+                    android:text="Email"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -169,7 +170,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_alignTop="@id/email_tag"
+                    android:layout_centerVertical="true"
                     android:src="@drawable/email" />
             </RelativeLayout>
 

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

@@ -79,5 +79,5 @@
             style="@style/crm_business_btn"
             android:text="商机跟进" />
     </LinearLayout>
-    </RelativeLayout>
+</RelativeLayout>
 

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

@@ -30,6 +30,7 @@
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
+            android:paddingBottom="0dp"
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
@@ -38,7 +39,8 @@
     </RelativeLayout>
     <View
         style="@style/app_line_horizontal_05p"
-        android:layout_width="match_parent"></View>
+        android:layout_width="match_parent"
+        android:visibility="gone"></View>
     <LinearLayout
         android:id="@+id/ll_top_state"
         android:layout_width="match_parent"
@@ -98,6 +100,7 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         android:headerDividersEnabled="false"
+        android:dividerHeight ="10dp"
         style="@style/ListViewBasic">
     </com.handmark.pulltorefresh.library.PullToRefreshListView>
 

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

@@ -32,41 +32,50 @@
                 android:drawableRight="@drawable/oa_next"
                 android:text="2016-07-01" />
 
-            <ImageView
-                android:id="@+id/head_img"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
                 android:layout_alignParentBottom="true"
-                android:layout_margin="10dp"
-                android:scaleType="fitXY" />
+                android:background="#60000000">
+                <ImageView
+                    android:id="@+id/head_img"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:scaleType="fitXY" />
 
-            <TextView
-                android:id="@+id/name_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/head_img"
-                android:layout_toRightOf="@id/head_img"
-                android:textColor="@color/text_main" />
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/head_img"
+                    android:layout_toRightOf="@id/head_img"
+                    android:textSize="12dp"
+                    android:textColor="@color/white" />
 
-            <TextView
-                android:id="@+id/num_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@id/name_tv"
-                android:layout_below="@id/name_tv"
-                android:layout_marginTop="5dp"
-                android:textColor="@color/text_hine"
-                android:visibility="gone" />
+                <TextView
+                    android:id="@+id/num_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/name_tv"
+                    android:layout_below="@id/name_tv"
+                    android:layout_marginTop="5dp"
+                    android:textSize="12dp"
+                    android:textColor="@color/white"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/prot_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/num_tv"
+                    android:layout_below="@id/num_tv"
+                    android:layout_marginTop="5dp"
+                    android:textSize="12dp"
+                    android:text="name"
+                    android:textColor="@color/white" />
+            </RelativeLayout>
 
-            <TextView
-                android:id="@+id/prot_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@id/num_tv"
-                android:layout_below="@id/num_tv"
-                android:layout_marginTop="5dp"
-                android:text="name"
-                android:textColor="@color/text_hine" />
         </RelativeLayout>
     </FrameLayout>
 

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

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:layout_marginLeft="20dp"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity">
 
     <RelativeLayout
@@ -21,8 +22,8 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/isImage"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp" />
@@ -48,8 +49,8 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/allow_chance_location"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp" />
@@ -83,7 +84,8 @@
             android:drawableRight="@drawable/oa_next"
             android:gravity="center_vertical"
             android:text="500米"
-            android:textColor="@color/text_main" />
+            android:textColor="@color/text_main"
+            android:layout_marginRight="20dp"/>
     </RelativeLayout>
 
     <View

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

@@ -13,17 +13,17 @@
         android:background="@drawable/bg_bar"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
         android:paddingTop="5dp">
 
         <com.xzjmyk.pm.activity.view.ClearEditText
             android:id="@+id/work_daily_search_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
@@ -31,6 +31,7 @@
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
+
     </RelativeLayout>
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView

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

@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none">
@@ -59,8 +59,6 @@
                         android:layout_height="wrap_content"
                         android:text="待审批"
                         android:layout_alignParentRight="true"
-                        android:layout_marginRight="20dp"
-                        android:textColor="@color/red"
                         android:layout_marginTop="5dp"
                         android:layout_marginBottom="0dp"
                         android:textSize="@dimen/text_hine"/>
@@ -77,7 +75,6 @@
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作总结"
-                    android:paddingLeft="5dp"
                     android:textColor="#575757"
                     android:layout_marginTop="5dp"
                     />
@@ -104,7 +101,7 @@
                     android:textSize="18sp"
                     android:text="工作计划"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="5dp"
                     android:textColor="#575757"
                     />
                 <TextView
@@ -131,7 +128,7 @@
                         android:layout_height="wrap_content"
                         android:text="工作心得"
                         android:paddingLeft="5dp"
-                        android:layout_marginTop="1dp"
+                        android:layout_marginTop="5dp"
                         android:textSize="18sp"
                         android:textColor="#575757"
                         />
@@ -158,9 +155,9 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="工作任务"
+                    android:text="已完成任务"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="5dp"
                     android:textSize="18sp"
                     android:textColor="#575757"
                     android:visibility="visible"
@@ -172,46 +169,37 @@
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
                     android:textColor="#575757"
-                    android:padding="0dp"
+                    android:padding="8dp"
                     android:visibility="visible"
                     />
 
-                <RelativeLayout
-                    android:id="@+id/work_daily_detail_task_rl"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible"
-                    >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="标  题"
-                        android:textColor="@color/text_hine"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="15sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="发起人"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="20dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="15sp"/>
-                </RelativeLayout>
-
 
                 <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_task_lv"
+                    android:id="@+id/work_daily_detail_completedtask_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#f6f5f5"
                     android:visibility="visible">
                 </com.xzjmyk.pm.activity.view.MyListView>
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="未完成任务"
+                        android:paddingLeft="5dp"
+                        android:layout_marginTop="5dp"
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        android:visibility="visible"
+                        />
 
+                    <com.xzjmyk.pm.activity.view.MyListView
+                        android:id="@+id/work_daily_detail_uncompletedtask_lv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#f6f5f5"
+                        android:visibility="visible">
+                    </com.xzjmyk.pm.activity.view.MyListView>
 
                 <View
                     android:layout_width="match_parent"

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

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    >
 
     <View
         android:layout_width="match_parent"
@@ -30,30 +31,37 @@
         android:layout_height="40dp"
         android:layout_below="@id/tag_tv"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp" />
-
+        android:layout_marginTop="10dp"
+        android:adjustViewBounds="true"
+        />
+<LinearLayout
+    android:id="@+id/em_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_alignTop="@id/header_img"
+    android:layout_marginLeft="10dp"
+    android:layout_toRightOf="@id/header_img"
+    android:gravity="center_vertical">
     <TextView
         android:id="@+id/name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/header_img"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="3dp"
-        android:layout_toRightOf="@id/header_img"
-        android:text="aaa"
+        android:text="陈虎"
+        android:layout_marginBottom="2dp"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="15sp" />
 
     <TextView
         android:id="@+id/sub_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name_tv"
-        android:layout_below="@id/name_tv"
-        android:layout_marginTop="2dp"
-        android:text="aaa"
+        android:text="优软产品规划部>部长"
         android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
+        android:layout_marginTop="2dp"
+        android:textSize="12sp" />
+</LinearLayout>
+
 
     <TextView
         android:id="@+id/time_tv"
@@ -66,8 +74,8 @@
 
     <ImageView
         android:id="@+id/phone_img"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
         android:layout_alignParentRight="true"
         android:layout_alignRight="@id/time_tv"
         android:layout_alignTop="@id/header_img"

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

@@ -1,7 +1,7 @@
 <ScrollView 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:background="#ebe9e9">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -10,7 +10,8 @@
 
         <RelativeLayout
             android:id="@+id/info_rl"
-            style="@style/IMTbleLine_UP_">
+            style="@style/IMTbleLine_UP_"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <ImageView
                 android:id="@+id/avatar_img"
@@ -58,7 +59,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -192,11 +193,14 @@
         <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/my_friend_rl"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/tv_zone"
@@ -224,7 +228,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -238,12 +242,15 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
         <!--公司-->
         <!--账套-->
         <RelativeLayout
             android:id="@+id/rl_company_change"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/company_text"
@@ -271,17 +278,20 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </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_master_change"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/master_text"
@@ -309,7 +319,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -317,11 +327,14 @@
         <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/app_scan_code_rl"
             style="@style/IMTbleLine_UP_Me"
+            android:background="#faf9f9"
             android:visibility="gone">
 
             <TextView
@@ -360,7 +373,7 @@
 
         <RelativeLayout
             android:id="@+id/app_drafts_rl"
-
+            android:background="#faf9f9"
             style="@style/IMTbleLine_UP_Me"
             android:visibility="gone">
 
@@ -404,6 +417,7 @@
             android:id="@+id/my_b2b_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
+            android:background="#faf9f9"
             android:visibility="gone">
 
             <TextView
@@ -442,7 +456,8 @@
         <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp">
+            android:layout_marginTop="7dp"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -460,7 +475,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -468,6 +483,8 @@
         <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/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/fragment_outoffice.xml

@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_main">
+    android:background="#EBE9E9">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -97,7 +97,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/tv"
-            android:background="@color/white"
+            android:background="#faf9f9"
             android:padding="10dp">
 
             <com.baidu.mapapi.map.MapView
@@ -124,7 +124,7 @@
                 android:layout_marginLeft="5dp"
                 android:layout_toRightOf="@id/tag_img"
                 android:gravity="center_vertical"
-                android:textSize="@dimen/text_hine" />
+                android:textSize="@dimen/text_min" />
 
             <ImageView
                 android:id="@+id/tag_img2"
@@ -144,7 +144,7 @@
                 android:layout_below="@+id/date_tv"
                 android:gravity="center_vertical"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_min" />
 
             <TextView
                 android:id="@+id/addr_tv"
@@ -155,7 +155,7 @@
                 android:layout_marginTop="5dp"
                 android:maxLines="3"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
+                android:textSize="@dimen/text_min" />
 
             <TextView
                 android:id="@+id/do_trim"
@@ -166,8 +166,8 @@
                 android:layout_marginTop="10dp"
                 android:maxLines="1"
                 android:text="地点微调"
-                android:textColor="@color/green"
-                android:textSize="@dimen/text_hine" />
+                android:textColor="#f17e21"
+                android:textSize="@dimen/text_min" />
         </RelativeLayout>
 
         <View

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

@@ -20,7 +20,6 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"

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

@@ -5,43 +5,27 @@
     android:background="@color/item_color2"
     android:orientation="vertical"
     >
-<RelativeLayout
-    android:layout_width="wrap_content"
+<LinearLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="5dp"
-    android:visibility="gone">
-
-    <ImageView
-        android:id="@+id/avatar_img"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:background="@drawable/avatar_normal"
-        android:contentDescription="@string/app_name"
-        android:layout_marginLeft="10dp" />
-
-    <TextView
-        android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/avatar_img"
-        android:text="方龙海"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:orientation="vertical"
+    >
 
-</RelativeLayout>
 
     <View
         android:layout_width="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_height="1dp"
-        android:background="#FBFAFA"
-        android:layout_marginTop="2dp"/>
+        android:background="@color/gainsboro"
+        android:layout_marginTop="2dp"
+        android:visibility="gone"/>
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         >
 
         <TextView
@@ -52,9 +36,9 @@
             android:text="2016-11-02"
             android:textColor="#000000"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
-            android:textSize="@dimen/text_main" />
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/item_activity_workdaily_status"
@@ -64,9 +48,9 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:textColor="@color/red"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
-            android:textSize="@dimen/text_hine"/>
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:textSize="15sp"/>
     </RelativeLayout>
 
     <View
@@ -74,7 +58,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_height="1dp"
-        android:background="#FBFAFA"
+        android:background="@color/lightgray"
         android:layout_marginTop="2dp"/>
     <TextView
         android:layout_width="wrap_content"
@@ -83,7 +67,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="0dp"
-        android:textSize="@dimen/text_main"
+        android:textSize="16sp"
         android:textColor="#575757"
         />
     <TextView
@@ -97,14 +81,14 @@
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:paddingBottom="5dp"
-        android:textSize="@dimen/text_hine"
+        android:textSize="14sp"
         android:textColor="#575757"
         />
-
+</LinearLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:background="#EBE9E9"
-        android:layout_marginTop="2dp"/>
+        android:layout_height="10dp"
+        android:background="@color/gainsboro"
+        />
 
 </LinearLayout>

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

@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
     <LinearLayout
         android:descendantFocusability="blocksDescendants"
         android:layout_height="wrap_content"
         style="@style/crm_ll_card"
-        android:id="@+id/business_detail_ll">
+        android:id="@+id/business_detail_ll"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp">
 
         <LinearLayout style="@style/crm_ll_sale_item">
 
             <TextView
                 android:text="商机编号"
                 android:minWidth="90dp"
+                android:layout_marginTop="5dp"
+
                 style="@style/TextView_Basic" />
             <TextView
                 android:id="@+id/tv_crm_business_num"
                 android:text="XXXXXXX"
-                style="@style/TextView_Basic" />
+                style="@style/TextView_Basic"
+                android:layout_marginTop="5dp"/>
         </LinearLayout>
 
         <LinearLayout style="@style/crm_ll_sale_item">
@@ -83,7 +89,8 @@
 
         <RelativeLayout
             style="@style/crm_ll_sale_item"
-            android:layout_gravity="right">
+            android:layout_gravity="right"
+            >
 
             <TextView
                 android:minWidth="90dp"
@@ -117,9 +124,10 @@
         android:id="@+id/iv_business_qiang"
         android:layout_width="100dp"
         android:layout_height="30dp"
+        android:layout_marginRight="20dp"
         android:layout_alignParentRight="true"
         android:src="@drawable/ic_qiang"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="10dp"
         android:layout_alignBottom="@id/business_detail_ll"/>
 </RelativeLayout>
 

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

@@ -34,7 +34,7 @@
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             android:text="10:45"
             android:textColor="@color/text_main"
             android:textSize="20dp" />
@@ -56,7 +56,8 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/location"
             android:layout_below="@id/location"
-            android:src="@drawable/addr" />
+            android:layout_marginTop="5dp"
+            android:src="@drawable/ic_outoffice_addr" />
 
 
         <TextView
@@ -75,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/item_staff_tree.xml

@@ -70,6 +70,7 @@
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@id/add_friend"
         android:padding="5dp"
+        android:layout_marginRight="5dp"
         android:src="@drawable/info_phone" />
 
 </RelativeLayout>

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/layout/select_list_item.xml

@@ -12,7 +12,8 @@
         android:button="@null"
         android:checked="false"
         android:drawableLeft="@drawable/oa_rb_button_bg"
-        android:padding="10dp" />
+        android:padding="10dp"
+        android:visibility="visible"/>
 
 
     <TextView
@@ -20,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
+        android:padding="10dp"
         android:layout_toRightOf="@+id/select_scb"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />

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

@@ -293,4 +293,8 @@
     <color name="button_invalid">#C0C0C0</color>
     <color name="button_focus">#2475FB</color>
     <color name="text_normal">#808A87</color>
+
+    <color name="me_menu_item_normal">#FAF9F9</color>
+    <color name="me_menu_item_press">#DFDEDE</color>
+    <color name="bg_underlying">#ebe9e9</color>
 </resources>

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

@@ -331,18 +331,32 @@
     <style name="form_relative_right_text1">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginRight">10dp</item>
-        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">top</item>
         <item name="android:minHeight">20dp</item>
         <item name="android:padding">5dp</item>
         <item name="android:width">160dp</item>
-        <item name="android:layout_marginTop">1dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
         <item name="android:textColorHint">@color/white</item>
         <item name="android:textSize">15sp</item>
     </style>
 
+    <!-- 添加日报总结、计划、心得内容显示样式-->
+    <style name="form_relative_right_text2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">top</item>
+        <item name="android:minHeight">120dp</item>
+        <item name="android:maxHeight">800dp</item>
+        <item name="android:textColorHint">#969595</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:paddingTop">1dp</item>
+        <item name="android:background">@null</item>
+
+    </style>
+
     <!--按钮样式-->
     <style name="button_style_one">
         <item name="android:layout_width">match_parent</item>
@@ -733,10 +747,10 @@
     <!--crm business-->
     <style name="crm_business_btn">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:padding">6dp</item>
-        <item name="android:layout_margin">10dp</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_margin">5dp</item>
         <item name="android:background">@drawable/shape_btn_bussine</item>
     </style>
 

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);
+		}
 	}
 }