Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/res/layout/activity_oa.xml

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

@@ -408,7 +408,7 @@
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
         <activity
             android:name=".ui.erp.activity.oa.SigninActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
         <activity
             android:name=".ui.erp.activity.oa.AddMeetingActivity"
             android:label="新增会议" />
@@ -517,8 +517,9 @@
         <activity
             android:name=".ui.erp.activity.oa.AddMeetTaskActivity"
             android:label="会议任务" />
-        <activity android:name=".ui.erp.activity.oa.OAListActivity"
-            android:label="外勤签到列表"/>
+        <activity
+            android:name=".ui.erp.activity.oa.OAListActivity"
+            android:label="外勤签到列表" />
     </application>
 
 </manifest>

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

@@ -66,6 +66,14 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             String message = (String) msg.getData().get("result");
 
             switch (msg.what) {
+                case 0x16:
+                    if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
+                        if (ma_code != null)
+                            signinAble(JSON.parseObject(message).getInteger("id"));
+                    } else {
+                        ToastUtil.showToast(ct, "获取id错误");
+                    }
+                    break;
                 case whatSignin:
                     JSONObject json = JSON.parseObject(message);
                     if (json.getBoolean("success") != null && json.getBoolean("success")) {
@@ -136,6 +144,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         findViewById(R.id.tag_rl).setOnClickListener(this);
     }
 
+    private String ma_code = null;
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
@@ -150,10 +160,12 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 }
                 break;
             case R.id.bt_save:
+
                 CodeUtil.getInstance().getCode(ct, "Meetingroomapply", new CodeUtil.OnCodeLinstener() {
                     @Override
-                    public void callBack(String code) {
-                        signinAble(code);
+                    public void callBack(final String code) {
+                        ma_code = code;
+                        getIdByNet();
                     }
                 });
                 break;
@@ -192,9 +204,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         finish();
         progressDialog.dismiss();
     }
-
     //判断是否可以进行创建
-    private void signinAble(String code) {
+    private void signinAble(int id) {
         if (StringUtils.isEmpty(name_et.getText().toString())) {
             ToastUtil.showToast(this, "会议名为空或格式不正确");
             return;
@@ -234,7 +245,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 builderId.append(";employee#" + entities.get(i).getEmId());
             }
         }
-        doSignin(builder.toString(), builderId.toString(), code);
+        doSignin(builder.toString(), builderId.toString(), id);
     }
 
     public void showDialog(final TextView tv) {
@@ -248,8 +259,18 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         dialog.show();
     }
 
+    private void getIdByNet() {
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/getId.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("seq", "Meetingroomapply_SEQ");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x16, null, null, "post");
+
+    }
+
     //提交表单
-    private void doSignin(String gruop, String ids, String code) {
+    private void doSignin(String gruop, String ids, int id) {
         progressDialog.show();
         if (baseUrl == null) {
             baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
@@ -258,9 +279,10 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         final Map<String, Object> param = new HashMap<>();
         String form = "{" +
                 "\"ma_mrcode\":" + "\"" + CommonUtil.getSharedPreferences(ct, "erp_username") + "\",\n" +
-                "\"ma_code\":" + "\"" + code + "\",\n" +
+                "\"ma_code\":" + "\"" + ma_code + "\",\n" +
                 "\"ma_group\":" + "\"" + gruop + "\",\n" +
                 "\"ma_groupid\":" + "\"" + ids + "\",\n" +
+                "\"ma_id\":" + "\"" + id + "\",\n" +
                 "\"ma_isturndoc\":" + "\"" + "否" + "\",\n" +
                 "\"ma_mrname\":" + "\"" + name_et.getText().toString() + "\",\n" +
                 "\"ma_recorddate\":" + "\"" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "\",\n" +

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

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -54,7 +53,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getDataByDB();
         //初始化界面显示时间
         tv_alar.setOnClickListener(this);
         tv_ualar.setOnClickListener(this);
@@ -99,18 +97,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         }).start();
     }
 
-    //获取打卡时间从数据库
-    private void getDataByDB() {
-        ArrayList<Signin> signins = SigninDao.getInstance(ct).query();
-        for (Signin e : signins) {
-            Log.i("gongpengming", "e.getCode()=" + e.getCode() == null ? "空的" : e.getCode());
-            Log.i("gongpengming", "e.getUtime()=" + e.getUtime() == null ? "空的" : e.getUtime());
-            Log.i("gongpengming", "e.getDtime()=" + e.getDtime() == null ? "空的" : e.getDtime());
-            Log.i("gongpengming", "e.getUsigmin()=" + e.getUsigmin() == null ? "空的" : e.getUsigmin());
-            Log.i("gongpengming", "e.getDsigmin()=" + e.getDsigmin() == null ? "空的" : e.getDsigmin());
-        }
-    }
-
     //初始化提醒
     private void initArmmanager() {
         //1.获取打卡时间

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

@@ -169,6 +169,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     String baseUrl;
+
     private void updataUI() {
         if (object == null) return;
         name_tv.setText(object.getString("ma_theme"));

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

@@ -29,6 +29,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.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -45,30 +46,29 @@ public class MeetingActivity extends BaseActivity {
     private final int whatLoad = 0x11;
     private int requestCode = 0x13;
     private int basePager = 1;
-
     @ViewInject(R.id.list_business)
     private PullToRefreshListView list_business;
     @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
-
-
     private MesstingAdapter adapter;
     private List<MeetEntity> entities;//网络获取来的item总数
     private String baseUrl;
-
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             progressDialog.dismiss();
-            list_business.setRefreshing(false);
             String message = (String) msg.getData().get("result");
             switch (msg.what) {
                 case whatLoad:
                     JSONObject json = JSON.parseObject(message);
-                    if (json.containsKey("listdata")) {
+                    if (json.containsKey("listdata") && json.getJSONArray("listdata").size() > 0) {
                         List<MeetEntity> chches = JSON.parseArray(json.getJSONArray("listdata").toJSONString(), MeetEntity.class);
                         updateUI(chches);
                     }
+                    if (search_edit != null)
+                        search_edit.setText("");
+                    if (list_business.isRefreshing())
+                        list_business.onRefreshComplete();
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
                     break;
@@ -77,16 +77,17 @@ public class MeetingActivity extends BaseActivity {
             }
         }
     };
+    private EmptyLayout mEmptyLayout;
 
     private void updateUI(List<MeetEntity> listdata) {
         //更新界面
-        if (adapter == null)
+        if (adapter == null) {
             adapter = new MesstingAdapter();
+            list_business.setAdapter(adapter);
+        }
         if (entities == null)
             entities = listdata;
         else entities.addAll(listdata);
-        adapter = new MesstingAdapter();
-        list_business.getRefreshableView().setAdapter(adapter);
         adapter.setData(entities);
     }
 
@@ -95,15 +96,16 @@ public class MeetingActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meeting);
         ViewUtils.inject(this);
+        mEmptyLayout = new EmptyLayout(this, list_business.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
         baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
-        getSupportActionBar().setTitle("会议助手");
         initView();
         listener();
     }
 
     private void initView() {
-        list_business.setEmptyView(R.layout.view_empty);
-
         progressDialog.show();
         loadNetData(basePager);
     }
@@ -113,18 +115,14 @@ public class MeetingActivity extends BaseActivity {
         list_business.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                if (entities != null) entities.clear();
-////                search_edit.setText("");
-//                loadNetData(1);
-                Log.i("gongpengming", "onPullDownToRefresh");
+                if (entities != null) entities.clear();
+                loadNetData(1);
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                if (entities != null) entities.clear();
-////                search_edit.setText("");
-//                loadNetData(basePager + 1);
-                Log.i("gongpengming", "onPullUpToRefresh");
+                loadNetData(basePager + 1);
+
             }
         });
 
@@ -176,7 +174,7 @@ public class MeetingActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.add) {
+        if (item.getItemId() == R.id.add_item) {
             activity.startActivityForResult(new Intent(activity, AddMeetingActivity.class), requestCode);
         }
         return super.onOptionsItemSelected(item);
@@ -184,13 +182,14 @@ public class MeetingActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_oa_meeting, menu);
+        getMenuInflater().inflate(R.menu.menu_add_icon, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     //获取网络数据
     private void loadNetData(int pager) {
         basePager = pager;
+        Log.i("gongpengming", " basePager = pager" + pager);
         //获取网络数据
         String url = baseUrl + "mobile/common/list.action";
         String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");

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

@@ -37,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -124,11 +125,21 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             map.put(3, jsonMe.containsKey("visitPlan") ? jsonMe.getJSONArray("visitPlan").toString() : null);
             meBeans = dealingData(map);
         }
+        Calendar c = Calendar.getInstance();
+        ArrayList<OABean> chche = new ArrayList<>();
+        for (OABean b : tag == 1 ? meBeans : otherBeans) {
+            String time = b.getStartdate() == null ? b.getEnddate() : b.getStartdate();
+            if (time == null) continue;
+            c.setTimeInMillis(TimeUtils.f_str_2_long(time));
+            if (c.get(Calendar.DAY_OF_MONTH) == CalendarUtils.getCurrentDate()) {
+                chche.add(b);
+            }
+        }
         if (adapter == null) {
-            adapter = new MyListViewAdapter(tag == 1 ? meBeans : otherBeans);
+            adapter = new MyListViewAdapter(chche);
             listview.setAdapter(adapter);
         } else {
-            adapter.setBeans(tag == 1 ? meBeans : otherBeans);
+            adapter.setBeans(chche);
         }
         setTaskDay(tag == 1 ? meBeans : otherBeans);
     }
@@ -243,35 +254,29 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 intent.putExtra("net", true);
                 startActivityForResult(intent, 0x11);
                 break;
-            case R.id.ll_signin://打卡签到
+            case R.id.signin://打卡签到
                 startActivity(new Intent(activity, SigninActivity.class));
                 break;
-            case R.id.ll_outside:  //外勤签到
+            case R.id.outoffice:  //外勤签到
                 startActivity(new Intent(activity, OutofficeActivity.class));
                 break;
-            case R.id.ll_meeting://会议管理
+            case R.id.meeting://会议管理
                 startActivity(new Intent(activity, MeetingActivity.class));
                 break;
-            case R.id.ll_worklog://工作日志
+            case R.id.worklog://工作日志
                 startActivity(new Intent(activity, WorkLogsActivity.class));
                 break;
-            case R.id.ll_subject://我的行程
+            case R.id.stroke://我的行程
                 //TODO 审批先不做
                 ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
-            case R.id.attendance_ll://考勤单据
+            case R.id.erp://考勤单据
                 startActivity(new Intent(activity, ErpMenActivity.class));
                 break;
-            case R.id.borrowing_ll://借款申请
-                ToastUtil.showToast(activity, "该功能还在内测中");
-                break;
-            case R.id.repayment_ll://还款申请
+            case R.id.outoffice_task://差旅费报销
                 ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
-            case R.id.ll_://差旅费报销
-                ToastUtil.showToast(activity, "该功能还在内测中");
-                break;
-            case R.id.ll_attendance://考勤统计
+            case R.id.statistics://考勤统计
                 ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
             case R.id.my_client_log://我的下属工作日志
@@ -389,15 +394,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("item_name", "创建任务");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "创建日程");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "新增拜访计划");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "新增拜访报告");
         list.add(map);
@@ -406,19 +408,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
     //设置控件点击事件
     private void setListener() {
-        findViewById(R.id.ll_signin).setOnClickListener(this);
-        findViewById(R.id.ll_outside).setOnClickListener(this);
-        findViewById(R.id.ll_meeting).setOnClickListener(this);
-        findViewById(R.id.ll_worklog).setOnClickListener(this);
-        findViewById(R.id.ll_subject).setOnClickListener(this);
-        findViewById(R.id.attendance_ll).setOnClickListener(this);//考勤单据
-        findViewById(R.id.borrowing_ll).setOnClickListener(this);
-        findViewById(R.id.repayment_ll).setOnClickListener(this);//还款
-        findViewById(R.id.ll_).setOnClickListener(this);
-        findViewById(R.id.ll_attendance).setOnClickListener(this);
+
+        findViewById(R.id.signin).setOnClickListener(this);
+        findViewById(R.id.outoffice).setOnClickListener(this);
+        findViewById(R.id.meeting).setOnClickListener(this);
+        findViewById(R.id.worklog).setOnClickListener(this);
+        findViewById(R.id.erp).setOnClickListener(this);
+        findViewById(R.id.stroke).setOnClickListener(this);
+        findViewById(R.id.outoffice_task).setOnClickListener(this);
+        findViewById(R.id.statistics).setOnClickListener(this);
         findViewById(R.id.my_client_log).setOnClickListener(this);
         findViewById(R.id.my_log).setOnClickListener(this);
         findViewById(R.id.ok_scale).setOnClickListener(this);
+
         picker.setOnItemClickListener(new CalendarView.OnItemClickListener() {
             @Override
             public void OnItemClick(int downDate) {
@@ -464,7 +466,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
     /**
      * 点击我和我的下属的工作日志中的标识变化
-     *
      * @param isMy 是否是 我的工作日志
      */
     private void chaneTAG(boolean isMy) {
@@ -501,7 +502,22 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
 
         public MyListViewAdapter(List<OABean> beans) {
-            this.beans = beans;
+            this.beans = getBeans(beans);
+        }
+
+        private List<OABean> getBeans(List<OABean> beans) {
+            List<OABean> chche = new ArrayList<>();
+            if (beans == null) return null;
+            if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) {//crm
+                chche = beans;
+            } else {
+                //只显示拜访
+                for (OABean e : beans)
+                    if (e != null && e.getClient() != null) {
+                        chche.add(e);
+                    }
+            }
+            return chche;
         }
 
         public List<OABean> getBeans() {
@@ -509,7 +525,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
 
         public void setBeans(List<OABean> beans) {
-            this.beans = beans;
+            this.beans = getBeans(beans);
             notifyDataSetChanged();
         }
 

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

@@ -12,7 +12,6 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.SigninClickFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SigninSetFragment;
 
 public class SigninActivity extends BaseActivity {
-
     private FragmentManager manager;
     private SigninClickFragment signinFragment;
     private SigninSetFragment setFragment;

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

@@ -66,7 +66,9 @@ public class WorkLogsActivity extends BaseActivity {
                         mMessages.clear();
                         messages.clear();
                     }
-                    context_rv.setRefreshing(false);
+                    if (context_rv.isRefreshing()) {
+                        context_rv.onRefreshComplete();
+                    }
                     mMessages.addAll(JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toString(), PublicMessage.class));
                     messages.addAll(JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toString(), PublicMessage.class));
                     upDataUi();
@@ -134,6 +136,7 @@ public class WorkLogsActivity extends BaseActivity {
         Matcher m = p.matcher(text);
         return m.find();
     }
+
     private void initView() {
         bottom_view = (PMsgBottomView) findViewById(R.id.bottom_view);
         search_edit = (ClearEditText) findViewById(R.id.search_edit);

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +15,6 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -42,6 +42,7 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -60,8 +61,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     private ListView listview;
     @ViewInject(R.id.seting)
     private ImageView seting;
-    @ViewInject(R.id.top)
-    private RelativeLayout top;
     @ViewInject(R.id.title)
     private TextView title;
     @ViewInject(R.id.back)
@@ -141,14 +140,12 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         ViewUtils.inject(getmRootView());
+        setHasOptionsMenu(true);
+        ActionBar bar = ct.getSupportActionBar();
         init();
         initView();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -177,7 +174,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                     unoffice_mm.setText(getDistance((double) map.get("latitude"), (double) map.get("latitude")) + "  地点微调");
             }
         });
-
+        unoffice_mm.setVisibility(View.GONE);
     }
 
     private String getDistance(double b1, double b2) {
@@ -243,8 +240,12 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         else
             beans = adapter.getBeans();
         logsJson = JSON.parseObject(message).getJSONArray("listdata");//获取签到列表
-        for (int i = 0; i < logsJson.size(); i++) {//遍历签到列表
-            String str = TimeUtils.long2str(TimeUtils.f_str_2_long(logsJson.getJSONObject(i).getString("cl_time")), "HH:mm");
+        String[] times = new String[logsJson.size()];
+        for (int i = 0; i < logsJson.size(); i++) {
+            times[i] = TimeUtils.long2str(TimeUtils.f_str_2_long(logsJson.getJSONObject(i).getString("cl_time")), "HH:mm");
+        }
+        Arrays.sort(times);
+        for (String str : times) {//遍历签到列表
             for (int j = 0; j < beans.size(); j++) {
                 //判断是否在当前区间内
                 if (!StringUtils.isEmpty(beans.get(j).startSignin) && !StringUtils.isEmpty(beans.get(j).startSignin2)) {

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

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.erp.util;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -64,7 +63,6 @@ public class CodeUtil {
 
     private CodeUtil() {
     }
-
     public void getCode(Context context, String titleName, OnCodeLinstener linstener) {
         this.linstener = linstener;
         getCodeByNet(context, titleName);

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

@@ -2,9 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:orientation="vertical"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
+    android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
 
     <RelativeLayout
@@ -39,6 +39,6 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         style="@style/ListViewBasic"
-        android:divider="@color/item_line" />
+        android:divider="@drawable/bg_bar" />
 
 </LinearLayout>

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

@@ -4,15 +4,14 @@
     android:id="@+id/oa_rootview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#EBE9E9"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#ebe9e9"
         android:orientation="vertical">
 
         <TextView
@@ -30,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/toobar"
-            android:background="@drawable/oa_top_bg"
+            android:background="#6A6A6A"
             android:orientation="vertical"
             android:paddingTop="10dp">
 
@@ -39,233 +38,106 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <LinearLayout
-                    android:id="@+id/ll_signin"
+                <TextView
+                    android:id="@+id/signin"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_1"
                     android:gravity="center"
-                    android:orientation="vertical">
+                    android:text="打卡签到"
+                    android:textColor="@color/white" />
 
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_1" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-
-                        android:layout_marginTop="2dp"
-                        android:text="打卡签到"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_outside"
+                <TextView
+                    android:id="@+id/outoffice"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_2"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_2" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="外勤签到"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_meeting"
+                    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:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_3"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_3" />
+                    android:text="会议管理"
+                    android:textColor="@color/white" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-
-                        android:text="会议管理"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_worklog"
+                <TextView
+                    android:id="@+id/worklog"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_4"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_4" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="工作日志"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-
+                    android:text="工作日志"
+                    android:textColor="@color/white" />
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="3dp" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <LinearLayout
-                    android:id="@+id/attendance_ll"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_5" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="考勤单据"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_subject"
+                <TextView
+                    android:id="@+id/erp"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_5"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_6" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-
-                        android:layout_marginTop="2dp"
-                        android:text="我的行程"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
+                    android:text="考勤单据"
+                    android:textColor="@color/white" />
 
-                <LinearLayout
-                    android:id="@+id/borrowing_ll"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_7" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="借款申请"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/repayment_ll"
+                <TextView
+                    android:id="@+id/stroke"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_6"
                     android:gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_8" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="还款申请"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_"
+                    android:text="我的行程"
+                    android:textColor="@color/white" />
+
+                <TextView
+                    android:id="@+id/outoffice_task"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_7"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_9" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="差旅费报销"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/ll_attendance"
+                    android:text="出差报销"
+                    android:textColor="@color/white" />
+
+                <TextView
+                    android:id="@+id/statistics"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
-                    android:clickable="true"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_8"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <Button
-                        style="@style/oa_btn_style"
-                        android:background="@drawable/oa_10" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="考勤统计"
-                        android:textColor="@color/white" />
-                </LinearLayout>
+                    android:text="考勤统计"
+                    android:textColor="@color/white" />
             </LinearLayout>
 
             <View
@@ -337,7 +209,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:text="2016-07"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -409,15 +280,16 @@
 
             <TextView
                 android:id="@+id/all_task_num"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="3dp"
                 android:gravity="center"
                 android:text="工作日历:0"
                 android:textSize="@dimen/text_main" />
 
             <View
-                android:layout_width="1px"
+                android:layout_width="2px"
                 android:layout_height="match_parent"
                 android:background="@color/item_line" />
 
@@ -451,9 +323,9 @@
 
             <ImageView
                 android:id="@+id/ok_scale"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="22dp"
-                android:layout_weight="1"
+                android:layout_marginRight="8dp"
                 android:gravity="center"
                 android:src="@drawable/filter" />
         </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/oa_main"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -11,8 +12,9 @@
 
         <ImageView
             android:id="@+id/back"
-            android:layout_width="40dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:padding="10dp"
             android:src="@drawable/back" />
 
         <TextView
@@ -29,9 +31,10 @@
             android:layout_width="40dp"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:padding="5dp"
+            android:padding="8dp"
             android:src="@drawable/setting" />
     </RelativeLayout>
+
     <LinearLayout
         android:id="@+id/oa_range_addr_rl"
         android:layout_width="match_parent"
@@ -39,6 +42,7 @@
         android:layout_alignParentBottom="true"
         android:orientation="vertical"
         android:padding="5dp">
+
         <TextView
             android:id="@+id/office_addr"
             android:layout_width="match_parent"

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

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_item"
-        android:icon="@drawable/fab_add"
+        android:icon="@drawable/more"
         android:title="@string/add"
         app:showAsAction="ifRoom"/>
 

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/add"
-        android:icon="@drawable/oa_add_meet"
-        app:showAsAction="always"
-        android:title="添加"
-        android:visible="true" />
-</menu>

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

@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--String-->
     <string name="delete_item">确定要删除吗</string>
     <string name="agare"><d>重新定位</d></string>
     <string name="click_finds"><d>点击查看</d></string>
     <string name="alar_content"> 上班时间快到了，请尽快打卡 </string>
     <string name="ualar_content"> 下班时间过去了，请尽快打卡 </string>
+    <!--end String-->
 
+    <!--Color-->
     <color name="oa_main">#f4f4f5</color>
     <!--listView 中对于 contentView的settag方法参数定义 -->
     <item name="position" type="id"></item>
+    <!--end Color-->
 
+
+    <!--Style-->
     <!--共有对象-->
     <style name="oa_btn_style">
         <item name="android:layout_width">40dp</item>
@@ -95,9 +101,13 @@
             <item name="android:textSize">19dip</item>  
             <item name="android:textColor">@color/text_main</item>  
     </style>
+
     <style name="style1">  
             <item name="android:textSize">23dip</item>  
             <item name="android:textColor">@color/text_hine</item>  
             <item name="android:textStyle">italic</item>  
     </style>
+    <!--end Style-->
+
+    <dimen name="drawable_padding">5dp</dimen>
 </resources>

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

@@ -21,7 +21,6 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
@@ -36,6 +35,7 @@ import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+
 import com.handmark.pulltorefresh.library.internal.FlipLoadingLayout;
 import com.handmark.pulltorefresh.library.internal.LoadingLayout;
 import com.handmark.pulltorefresh.library.internal.RotateLoadingLayout;
@@ -798,7 +798,6 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 
 		if (doScroll) {
 			if (mShowViewWhileRefreshing) {
-
 				// Call Refresh Listener when the Scroll has finished
 				OnSmoothScrollFinishedListener listener = new OnSmoothScrollFinishedListener() {
 					@Override
@@ -1428,7 +1427,6 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 		/**
 		 * Disables Pull-to-Refresh gesture handling, but allows manually
 		 * setting the Refresh state via
-		 * {@link PullToRefreshBase#setRefreshing() setRefreshing()}.
 		 */
 		MANUAL_REFRESH_ONLY(0x4);
 
@@ -1615,7 +1613,6 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 
 		/**
 		 * When the UI is currently refreshing, caused by a call to
-		 * {@link PullToRefreshBase#setRefreshing() setRefreshing()}.
 		 */
 		MANUAL_REFRESHING(0x9),