end of 2016-08-19

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

@@ -41,9 +41,6 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -78,7 +75,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private ImageButton ib_customer_vistor;
     @ViewInject(R.id.ib_waller)
     private ImageButton ib_waller;
-
     @ViewInject(R.id.tv_rank_sale_left)
     private TextView tv_rank_sale_left;
     @ViewInject(R.id.tv_rank_sale_right)
@@ -125,10 +121,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private TextView tv_em_planrirun;
     @ViewInject(R.id.tv_em_rirun)
     private TextView tv_em_rirun;
-
     @ViewInject(R.id.tv_cu_count)
     private TextView tv_cu_count;
-    
     @ViewInject(R.id.ib_ranking_condition)
     private ImageButton  ib_ranking_condition;
     @ViewInject(R.id.ib_sale_condition)
@@ -247,7 +241,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         getMenuInflater().inflate(R.menu.menu_crm, menu);
         return true;
     }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {

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

@@ -1,5 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -122,9 +124,20 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
+    private void showExitDialog() {
+        new AlertDialog.Builder(mContext).setTitle("会议管理").setMessage("确定要结束会议吗?").setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        doNetSubmit(ENDMEET);
+                    }
+                }).create().show();
+    }
+
     private void initView() {
         sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
         tag_tv.setText(entity.getMa_tag() == null ? "" : entity.getMa_tag());
+        getPoinfo();
 //        getPoinfo();
         findViewById(R.id.meet_save).setOnClickListener(this);
         findViewById(R.id.num_tag).setOnClickListener(this);
@@ -147,7 +160,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         String str;
         long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
         oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_end_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
+        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
         if (System.currentTimeMillis() < startLongTime) {
             str = "会议未开始";
         } else if (System.currentTimeMillis() < endLongTime) {
@@ -273,7 +286,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 startActivity(data);
                 break;
             case R.id.end_meet_tv:
-                doNetSubmit(ENDMEET);
+                showExitDialog();
+
                 break;
             case R.id.click_btn:
                 doNetSubmit(SIGNNIN);

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

@@ -11,9 +11,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.MeetEntity;
@@ -23,23 +26,20 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 public class MeetingActivity extends BaseActivity {
+    private static final int PAGE_SIZE = 10;
     private MeetingActivity activity = this;
     private PullToRefreshListView listView;
     private List<MeetEntity> entities;
-
     private String baseUrl;
     private final int whatLoad = 0x11;
     private int requestCode = 0x13;
+    private int basePager = 1;
 
     private Handler handler = new Handler() {
         @Override
@@ -49,14 +49,10 @@ public class MeetingActivity extends BaseActivity {
             String message = (String) msg.getData().get("result");
             switch (msg.what) {
                 case whatLoad:
-                    try {
-                        JSONObject json = new JSONObject(message);
-                        if (json.isNull("listdata")) return;
-                        JSONArray array = json.getJSONArray("listdata");
-                        entities = JSON.parseArray(array.toString(), MeetEntity.class);
-                        updateUI();
-                    } catch (JSONException e) {
-                        e.printStackTrace();
+                    JSONObject json = JSON.parseObject(message);
+                    if (json.containsKey("listdata")) {
+                        List<MeetEntity> chches = JSON.parseArray(json.getJSONArray("listdata").toJSONString(), MeetEntity.class);
+                        updateUI(chches);
                     }
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
@@ -68,11 +64,11 @@ public class MeetingActivity extends BaseActivity {
     };
     private MesstingAdapter adapter;
 
-    private void updateUI() {
+    private void updateUI(List<MeetEntity> listdata) {
         //更新界面
         if (adapter == null)
             adapter = new MesstingAdapter();
-        adapter.setData(entities);
+        adapter.setData(listdata);
 //        listView.setAdapter(adapter);
     }
 
@@ -87,6 +83,7 @@ public class MeetingActivity extends BaseActivity {
 
     private void initView() {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
+        listView.setEmptyView(R.layout.view_empty);
         if (adapter == null)
             adapter = new MesstingAdapter();
         listView.setAdapter(adapter);
@@ -105,7 +102,19 @@ public class MeetingActivity extends BaseActivity {
                 startActivity(intent);
             }
         });
-        loadNetData();
+        listView.setMode(PullToRefreshBase.Mode.BOTH);
+        listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                loadNetData(basePager + 1);
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                loadNetData(basePager);
+            }
+        });
+        loadNetData(basePager);
     }
 
 
@@ -133,24 +142,24 @@ public class MeetingActivity extends BaseActivity {
         return super.onCreateOptionsMenu(menu);
     }
 
-
     //获取网络数据
-    private void loadNetData() {
+    private void loadNetData(int pager) {
+        basePager = pager;
         progressDialog.show();
         //获取网络数据
         String url = baseUrl + "mobile/common/list.action";
         String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
         String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
         String caller = "Meetingroomapply";
-        //TODO cong
+        //TODO 添加限制
 //        String condition = "MA_STATUSCODE='AUDITED'and MD_EMCODE=" + "\'" + emcode + "\'";
         String condition = "1=1";
         final Map<String, Object> param = new HashMap<>();
         param.put("caller", caller);
         param.put("emcode", emcode);
         param.put("currentMaster", CommonUtil.getSharedPreferences(this, "erp_master"));
-        param.put("page", 1);
-        param.put("pageSize", 10);
+        param.put("page", basePager);
+        param.put("pageSize", PAGE_SIZE);
         param.put("condition", condition);
         param.put("sessionId", sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -258,7 +267,7 @@ public class MeetingActivity extends BaseActivity {
             if (resultCode == 0x14) {
                 if ("data".equals(data.getStringExtra("data"))) {
                     //TODO 刷新
-                    loadNetData();
+                    loadNetData(1);
                     listView.setRefreshing(true);
                 }
             }

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

@@ -1,21 +1,26 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
-import android.content.DialogInterface;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.ScrollView;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -34,6 +39,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.DisplayUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.CalendarView;
@@ -65,7 +71,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.uok_task_num)
     private TextView uok_task_num;//未完成个数
     @ViewInject(R.id.ok_scale)
-    private TextView ok_scale;//完成比例
+    private ImageView ok_scale;//完成比例
     @ViewInject(R.id.date_tv)
     private TextView date_tv;  //当前月份
     @ViewInject(R.id.my_client_log)
@@ -114,7 +120,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
-            popAdd();
+            showPopupWindow(getWindow().findViewById(R.id.add_item));
+//            popAdd();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -133,7 +140,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.oa_img_infile:  //筛选
+            case R.id.ok_scale:  //筛选
+                Intent intent = new Intent(ct, UserSelectActivity.class);
+                intent.putExtra("single", true);
+                intent.putExtra("net", true);
+                startActivityForResult(intent, 0x11);
                 break;
             case R.id.ll_signin://打卡签到
                 startActivity(new Intent(activity, SigninActivity.class));
@@ -168,10 +179,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 break;
             case R.id.my_client_log://我的下属工作日志
                 chaneTAG(false);
-                Intent intent = new Intent(ct, UserSelectActivity.class);
-                intent.putExtra("single", true);
-                intent.putExtra("net", true);
-                startActivityForResult(intent, 0x11);
                 break;
             case R.id.my_log://我的工作日志
                 chaneTAG(true);
@@ -180,11 +187,18 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     }
 
     private void initView() {
+        chaneTAG(true);
+        initData();
+        setListener();
+        loadNetData();
+
+    }
+
+
+    private void initData() {
         beans = new ArrayList<>();
         allBean = new ArrayList<>();
         chches = new ArrayList<>();
-        loadNetData();
-        chaneTAG(false);
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         rootScrollView.requestDisallowInterceptTouchEvent(false);
         picker.setCalendarData(new Date());
@@ -192,19 +206,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         adapter = new MyListViewAdapter();
         listview.setAdapter(adapter);
         rootScrollView.smoothScrollTo(0, 20);
-        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy-MM"));
-        setListener();
+        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy-MM-dd") + "  " + TimeUtils.getWeek(System.currentTimeMillis()));
         //CRM链入 隐藏菜单
-        Intent intent = getIntent();
-        int type = 0;
-        if (intent != null) {
-            type = intent.getIntExtra("type", 0);//默认不隐藏
-            if (type == 1) {
-                oa_rl_choose.setVisibility(View.GONE);
-            } else {
-                oa_rl_choose.setVisibility(View.VISIBLE);
-            }
-        }
+        if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) return;
+        oa_rl_choose.setVisibility(View.GONE);
     }
 
     //一次设置全部数据
@@ -213,14 +218,17 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             if (json[i] == null || json[i].size() <= 0) continue;
             chches = JSON.parseArray(json[i].toJSONString(), OABean.class);//获取
             for (int j = 0; j < chches.size(); j++)
-                chches.get(i).setType(type[i]);
+                chches.get(j).setType(type[i]);
+        }
+        if (chches.size() > 0) {
+            beans.addAll(chches);
+            allBean.addAll(beans);
         }
-        beans.addAll(chches);
-        allBean.addAll(beans);
         if (allBean.size() <= 0) return;
         int[] ii = new int[allBean.size()];
         for (int i = 0; i < allBean.size(); i++) {
             String date = allBean.get(i).getStartdate();
+            if (date == null) continue;
             long time = TimeUtils.f_str_2_long(date);
             Calendar c = Calendar.getInstance();
             c.setTimeInMillis(time);
@@ -235,24 +243,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
     }
 
-    private void setData(JSONArray json, int type) {
-        if (json == null || json.size() <= 0) return;
-        chches = JSON.parseArray(json.toJSONString(), OABean.class);
-        for (int i = 0; i < chches.size(); i++)
-            chches.get(i).setType(type);
-        beans.addAll(chches);
-        allBean.addAll(beans);
-        int[] ii = new int[allBean.size()];
-        for (int i = 0; i < allBean.size(); i++) {
-            String date = allBean.get(i).getStartdate();
-            long time = TimeUtils.f_str_2_long(date);
-            Calendar c = Calendar.getInstance();
-            c.setTimeInMillis(time);
-            ii[i] = c.get(Calendar.DAY_OF_MONTH);
-        }
-        picker.setTaskDay(ii);
-
-    }
 
     //获取数据
     public void loadNetData() {
@@ -266,6 +256,86 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         ViewUtil.httpSendRequest(this, url, param, handler, headers, WHAT_LOAD, null, null, "get");
     }
 
+    //需要抽取的代码
+    private PopupWindow popupWindow = null;
+
+    public void showPopupWindow(View parent) {
+        View view = null;
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.pop_crm_list, null);
+            ListView plist = (ListView) view.findViewById(R.id.mList);
+            SimpleAdapter adapter = new SimpleAdapter(
+                    this,
+                    getPopData(),
+                    R.layout.item_pop_list,
+                    new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            plist.setAdapter(adapter);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    Intent intent = null;
+                    switch (position) {
+                        case 0:
+                            intent = new Intent(ct, TaskAddActivity.class);
+                            intent.putExtra("type", 0);
+                            break;
+                        case 1:
+                            intent = new Intent(ct, TaskAddActivity.class);
+                            intent.putExtra("type", 1);
+                            break;
+                        case 2:
+                            intent = new Intent(ct, VisitReportPlanActivity.class);
+                            break;
+                        case 3:
+                            intent = new Intent(ct, VisitReportAddActivity.class);
+                            break;
+                    }
+                    if (intent != null)
+                        startActivity(intent);
+                }
+            });
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
+        }
+        // 使其聚集
+        popupWindow.setFocusable(true);
+        // 设置允许在外点击消失
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(OAActivity.this, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(this, 1f);
+        // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
+        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
+    }
+
+    private List<Map<String, Object>> getPopData() {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("item_name", "创建任务");
+        list.add(map);
+
+        map = new HashMap<String, Object>();
+        map.put("item_name", "创建日程");
+        list.add(map);
+
+        map = new HashMap<String, Object>();
+        map.put("item_name", "新增拜访计划");
+        list.add(map);
+
+        map = new HashMap<String, Object>();
+        map.put("item_name", "新增拜访报告");
+        list.add(map);
+        return list;
+    }
+
     //设置控件点击事件
     private void setListener() {
         findViewById(R.id.ll_signin).setOnClickListener(this);
@@ -280,18 +350,22 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         findViewById(R.id.ll_attendance).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(Date selectedStartDate, Date selectedEndDate, Date downDate) {
-//                Log.i("gongpengming", downDate.getDay() + "");
+            public void OnItemClick(int downDate) {
+                String chche = TimeUtils.long2str(System.currentTimeMillis(), "yyyy-MM") + "-" + (downDate < 10 ? "0" : "") + downDate;
+                date_tv.setText(chche + "  " + TimeUtils.getWeek(chche));
                 Calendar c = Calendar.getInstance();
                 int ok = 0;
                 int noOk = 0;
+                beans.clear();
                 for (OABean e : allBean) {
+                    if (e.getStartdate() == null) continue;
                     c.setTimeInMillis(TimeUtils.f_str_2_long(e.getStartdate()));
                     int day = c.get(Calendar.DAY_OF_MONTH);
-                    Log.i("gongpengming", "day=" + day + "   downDate.getDay()=" + downDate.getDay());
-                    if (day == downDate.getDay()) {//选择那天的任务
+                    if (day == downDate) {//选择那天的任务
+                        beans.add(e);
                         if ("已完成".equals(e.getStatus()) || "已拜访".equals("e.getStatus()")) {
                             ok += 1;
                         } else {
@@ -299,24 +373,14 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         }
                     }
                 }
-                Log.i("gongpengming", "ok=" +ok + "  noOk=" + noOk);
-                all_task_num.setText("我的任务日程:" + (ok + noOk));
+                Log.i("gongpengming", "beans=" + beans.size());
+                all_task_num.setText("工作日历:" + (ok + noOk));
                 ok_task_num.setText("已完成:" + ok);
                 uok_task_num.setText("未完成:" + noOk);
-                ok_scale.setText("达成率:" + ((ok + noOk) > 0 ? (ok * 100 / (ok + noOk) + "%") : "0"));
+                adapter.notifyDataSetChanged();
+                rootScrollView.smoothScrollTo(0, 20);
             }
         });
-        picker.setToday( );//初始化今天
-    }
-
-    /**
-     * 获取数据处理
-     *
-     * @param array 获取的json对象数组
-     * @param type  类型，1、任务 2、日程 3、拜访
-     */
-    private void treatedData(JSONArray array, int type) {
-
     }
 
     /**
@@ -326,48 +390,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
      */
     private void chaneTAG(boolean isMy) {
         if (isMy) {
+            ok_scale.setVisibility(View.GONE);
             my_log_tag.setBackgroundResource(R.color.darkorange);
             my_client_log_tag.setBackgroundDrawable(null);
         } else {
+            ok_scale.setVisibility(View.VISIBLE);
             my_client_log_tag.setBackgroundResource(R.color.darkorange);
             my_log_tag.setBackgroundDrawable(null);
         }
 
     }
 
-    private void popAdd() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("选择");
-        String[] str = {"创建任务", "新增日程", "新增拜访计划", "新增拜访报告"};
-        builder.setItems(str, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                Intent intent = null;
-                switch (i) {
-                    case 0:
-                        intent = new Intent(ct, TaskAddActivity.class);
-                        intent.putExtra("type", 0);
-                        break;
-                    case 1:
-                        intent = new Intent(ct, TaskAddActivity.class);
-                        intent.putExtra("type", 1);
-                        break;
-                    case 2:
-                        intent = new Intent(ct, VisitReportPlanActivity.class);
-                        break;
-                    case 3:
-                        intent = new Intent(ct, VisitReportAddActivity.class);
-                        break;
-                }
-                if (intent != null)
-                    startActivity(intent);
-            }
-        });
-        builder.show();
-    }
-
+    //列表适配器
     class MyListViewAdapter extends BaseAdapter {
-
         public MyListViewAdapter() {
         }
 
@@ -415,15 +450,14 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         intent.putExtra("description", chche.getDescription());
                         intent.putExtra("duration", chche.getDescription());
                         intent.putExtra("status", chche.getStatus() + "");
-                        intent.putExtra("taskid", chche.getTaskcode());//编号
                         intent.putExtra("taskname", chche.getName());//名称
-                        intent.putExtra("taskemcode", chche.getTaskcode());//发起人
+                        intent.putExtra("taskemcode", CommonUtil.getSharedPreferences(ct, "erp_username"));//发起人
                         intent.putExtra("tasktime", chche.getStartdate());//发起时间
-                        intent.putExtra("performer", chche.getHandler());//处理人
-                        intent.putExtra("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));//处理人编号
+                        intent.putExtra("performer", CommonUtil.getSharedPreferences(ct, "erp_username"));//处理人编号
                         intent.putExtra("taskcode", chche.getTaskcode());//处理人编号
 //                        intent.putExtra("ra_taskid", store.task_id);//取回复内容id
 //                        intent.putExtra("attachs", store.attachs);
+                        intent.putExtra("taskid", chche.getTaskcode());//编号
                         intent.putExtra("endtime", chche.getEnddate());
                         startActivity(intent);
                     }
@@ -494,4 +528,26 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
     }
 
+    class GridViewAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return 0;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return 0;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            return null;
+        }
+    }
 }

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

@@ -1,11 +1,10 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
-import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -23,7 +22,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 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.FlexJsonUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
@@ -57,28 +55,35 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
         setContentView(R.layout.activity_out_signin_ok);
         ViewUtils.inject(this);
         Intent intent = getIntent();
-        String time = intent.getStringExtra("time");
         String addr = intent.getStringExtra("addr");
         String com = intent.getStringExtra("com");
-        initView(time, addr, com);
+        initView(addr, com);
     }
 
-    private void initView(String time, String addr, String com) {
-        baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
-        time_tv.setText(time);
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (task != null || !task.isCancelled()) {
+            task.cancel(true);
+        }
+    }
 
+    private void initView(String addr, String com) {
+        baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         com_tv.setText(com);
-        BaiduMapUtil.getInstence().getPoiInfo(this, new BaiduMapUtil.OnLocationListener() {
-            @Override
-            public void result(Map<String, Object> map) {
-                addr_tv.setText(map.get("poi") + "");
-                list = (List<Poi>) map.get("list");
-
-            }
-        });
-        findViewById(R.id.poi_list).setOnClickListener(this);
+        task.execute();
+        addr_tv.setText(addr);
+//        BaiduMapUtil.getInstence().getPoiInfo(this, new BaiduMapUtil.OnLocationListener() {
+//            @Override
+//            public void result(Map<String, Object> map) {
+//                addr_tv.setText(map.get("poi") + "");
+//                list = (List<Poi>) map.get("list");
+//
+//            }
+//        });
         exit_btn.setOnClickListener(this);
     }
+
     private final int whatSignin = 0x12;
     private Handler handler = new Handler() {
         @Override
@@ -110,6 +115,26 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
         }
     };
 
+    AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
+        @Override
+        protected Void doInBackground(Void... voids) {
+            try {
+                while (true) {
+                    publishProgress();
+                    Thread.sleep(1000);
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
+        @Override
+        protected void onProgressUpdate(Void... values) {
+            time_tv.setText(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+        }
+    };
+
     /**
      * 签到
      *
@@ -150,29 +175,7 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
                     }
                 });
                 break;
-            case R.id.poi_list:
-                //获取列表
-                ShowDalogs();
-                break;
         }
     }
 
-    private void ShowDalogs() {
-        if (list == null || list.size() <= 0) return;
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("选择微调距离");
-        //    指定下拉列表的显示数据
-        final String[] cities = new String[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            cities[i] = list.get(i).getName();
-        }
-        //    设置一个下拉的列表选择项
-        builder.setItems(cities, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                addr_tv.setText(cities[which]);
-            }
-        });
-        builder.show();
-    }
 }

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

@@ -4,6 +4,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,6 +19,8 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -34,21 +38,22 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 //添加会议人员界面
 public class UserSelectActivity extends BaseActivity {
     private static final int WHAT_LOAD = 0x11;
     @ViewInject(R.id.listview)
-    private ListView listview;
+    private PullToRefreshListView listview;
     @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
-
     private boolean isSingle = false;
     private boolean isNet = false;
     private DBManager manager;
-    //    private ArrayList<MeetUserEntity> entities;
     private MeetSelectAdapter adapter;
     private Handler handler = new Handler() {
+
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
@@ -74,10 +79,12 @@ public class UserSelectActivity extends BaseActivity {
                         entity.setImId(imId == null ? "" : imId);
                         users.add(entity);
                     }
+                    beans = users;
                     if (users.size() > 0) {
-                        if (adapter == null)
+                        if (adapter == null) {
                             adapter = new MeetSelectAdapter(users);
-                        else
+                            listview.setAdapter(adapter);
+                        } else
                             adapter.setUsers(users);
                     }
                     break;
@@ -85,6 +92,8 @@ public class UserSelectActivity extends BaseActivity {
 
         }
     };
+    private ArrayList<MeetUserEntity> beans;
+    private ArrayList<MeetUserEntity> chche;
 
 
     @Override
@@ -97,10 +106,40 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void initView() {
+        chche = new ArrayList<>();
         View view = LayoutInflater.from(this).inflate(R.layout.view_empty, null);
         listview.setEmptyView(view);
         adapter = new MeetSelectAdapter();
         listview.setAdapter(adapter);
+        listview.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        search_edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                String strChche = editable.toString();
+                //TODO 正则
+                if (beans == null || beans.size() <= 0) return;
+                for (MeetUserEntity e : beans) {
+                    if (getResult(e.getName() + e.getImId(), strChche)) {
+                        chche.add(e);
+                    }
+                }
+                adapter.setUsers(chche);
+            }
+        });
+        listview.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
+            @Override
+            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
+                init();
+            }
+        });
         listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
@@ -120,6 +159,13 @@ public class UserSelectActivity extends BaseActivity {
         });
     }
 
+    //正则
+    private static boolean getResult(String text, String str) {
+        Pattern p = Pattern.compile(str);
+        Matcher m = p.matcher(text);
+        return m.find();
+    }
+
     private void selectOK() {
         //选择人员成功操作
         ArrayList<MeetUserEntity> list = new ArrayList<>();
@@ -147,6 +193,7 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void init() {
+
         isSingle = getIntent().getBooleanExtra("single", false);
         //是否获取网络数据
         isNet = getIntent().getBooleanExtra("net", false);

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

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -11,6 +10,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -19,9 +19,9 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
@@ -45,31 +45,26 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private LatLng point;//位置
     private static int requestCode = 0x11;
     private int sigNum;//签到次数
-    @ViewInject(R.id.num_tv)
-    private TextView num_tv; //签到次数
-    @ViewInject(R.id.out_add_name_tv)
-    private TextView out_add_name_tv;//地点名称
     @ViewInject(R.id.name_img)
-    private TextView name_img;//头像
+    private ImageView name_img;//头像
     @ViewInject(R.id.name_tv)
     private TextView name_tv;//名字
-    @ViewInject(R.id.out_date_tv)
-    private TextView out_date_tv;//日期
-    @ViewInject(R.id.out_time_tv)
-    private TextView out_time_tv;//当前时间
+    @ViewInject(R.id.com_tv)
+    private TextView com_tv;
+    @ViewInject(R.id.num_tv)
+    private TextView num_tv; //签到次数
     @ViewInject(R.id.click_btn)
     private Button click_btn;//点击签到
-    @ViewInject(R.id.out_add_t_tv)
+    @ViewInject(R.id.location_tv)
+    private TextView out_add_name_tv;//地点名称
+    @ViewInject(R.id.addr_tv)
     private TextView out_add_t_tv;//地址
     @ViewInject(R.id.mapView)
     private MapView mapView;
-    @ViewInject(R.id.com_tv)
-    private TextView com_tv;
-    @ViewInject(R.id.date_tag)
-    private TextView date_tag;
+    @ViewInject(R.id.date_tv)
+    private TextView date_tv;
     @ViewInject(R.id.do_trim)
     private TextView do_trim;
-
     private OutofficeActivity ct;
     private Handler handler = new Handler() {
         @Override
@@ -112,25 +107,25 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
 
     private void initview() {
         loadLog();
+        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) + " " + TimeUtils.getWeek(System.currentTimeMillis()) + " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
         num_tv.setText("" + sigNum);
-        String name = MyApplication.getInstance().mLoginUser.getNickName();
-        name_img.setText(name.substring(0, 1));
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
         name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
-        long timeLong = System.currentTimeMillis();
-        date_tag.setText(TimeUtils.getWeek(timeLong) + ":");//星期
-        out_date_tv.setText(TimeUtils.s_long_2_str(timeLong));//日期
-        timeTask.execute();
-        BdLocationHelper locationHelper = MyApplication.getInstance().getBdLocationHelper();
-        double latitude = locationHelper.getLatitude();
-        double longitude = locationHelper.getLongitude();
-        out_add_name_tv.setText(locationHelper.getDistrictName());
-        out_add_t_tv.setText(locationHelper.getAddress());
-        point = new LatLng(latitude, longitude);
-        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
+        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
+            @Override
+            public void result(Map<String, Object> map) {
+                out_add_name_tv.setText(map.get("poi") + "");
+                out_add_t_tv.setText(map.get("name") + "");
+                double latitude = (double) map.get("latitude");
+                double longitude = (double) map.get("lontitude");
+                point = new LatLng(latitude, longitude);
+                BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
+            }
+        });
         do_trim.setOnClickListener(this);
         click_btn.setOnClickListener(this);
-
     }
 
     //获取打卡记录 date:yyyy-MM-dd
@@ -152,31 +147,9 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, WHAT_LOAD, null, null, "get");
     }
 
-    private AsyncTask<Void, Void, Void> timeTask = new AsyncTask() {
-        @Override
-        protected Object doInBackground(Object[] objects) {
-            try {
-                while (true) {
-                    Thread.sleep(1000);
-                    publishProgress();
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            return false;
-        }
-
-        @Override
-        protected void onProgressUpdate(Object[] values) {
-            super.onProgressUpdate(values);
-            out_time_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "HH:mm:ss"));//时间点
-        }
-    };
-
     @Override
     public void onDestroy() {
         super.onDestroy();
-        timeTask.cancel(true);
     }
 
     @Override
@@ -202,9 +175,8 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 break;
             case R.id.click_btn:
                 Intent intent = new Intent(getActivity(), OutSigninOKActivity.class);
-                intent.putExtra("time", out_time_tv.getText().toString());
                 intent.putExtra("addr", out_add_t_tv.getText().toString());
-                intent.putExtra("com", com_tv.getText().toString());
+                intent.putExtra("com", out_add_name_tv.getText().toString());
                 startActivityForResult(intent, requestCode);
                 break;
         }

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

@@ -137,7 +137,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
 
     @Override
     protected int inflateLayoutId() {
-        return R.layout.fragment_signin1;
+        return R.layout.fragment_signin;
     }
 
     @Override
@@ -163,7 +163,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         if (data == null) return;
         if (requestCode == RECODE && resultCode == LocationMapActivity.REQUCODE) {
             PoiInfo poi = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
-            office_addr.setText(poi.address);
+            office_addr.setText("考勤地点:" + poi.name);
             unoffice_mm.setText(getDistance(poi.location.latitude, poi.location.longitude) + "  地点微调");
         }
     }
@@ -181,7 +181,15 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
 //        unoffice_mm.setText(getDistance(b1, b2));
         //TODO　２、获取网络数据
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
-
+        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
+            @Override
+            public void result(Map<String, Object> map) {
+                if (map.containsKey("poi"))
+                    office_addr.setText("考勤地点:" + map.get("poi"));
+                if (map.containsKey("latitude") && map.containsKey("lontitude"))
+                    unoffice_mm.setText(getDistance((double) map.get("latitude"), (double) map.get("latitude")) + "  地点微调");
+            }
+        });
         //TODO 2.获取当天数据库数据
 //        Signin dbBean = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
 //        if (dbBean == null) {//当获取数据库为空（表示当天没有打过卡）
@@ -412,7 +420,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                 if (isPlay) {
                     if ((adapter != null && adapter.getBeans() != null && adapter.getBeans().size() > 0)) {
                         if (adapter.getBeans().get(adapter.getBeans().size() - 1).signin != null && adapter.getBeans().get(adapter.getBeans().size() - 1).signin.length() > 0) {
-                            ToastUtil.showToast(ct, "您为满足签到条件，请稍后再试");
+                            ToastUtil.showToast(ct, "您未满足签到条件，请稍后再试");
                         } else {
                             CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
                                 @Override

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

@@ -1,470 +0,0 @@
-//package com.xzjmyk.pm.activity.ui.erp.fragment;
-//
-//import android.app.Activity;
-//import android.content.Intent;
-//import android.os.Bundle;
-//import android.os.Handler;
-//import android.os.Message;
-//import android.support.v7.app.ActionBar;
-//import android.view.Menu;
-//import android.view.MenuInflater;
-//import android.view.MenuItem;
-//import android.view.View;
-//import android.widget.LinearLayout;
-//import android.widget.TextView;
-//
-//import com.baidu.mapapi.model.LatLng;
-//import com.baidu.mapapi.search.core.PoiInfo;
-//import com.lidroid.xutils.ViewUtils;
-//import com.lidroid.xutils.view.annotation.ViewInject;
-//import com.xzjmyk.pm.activity.MyApplication;
-//import com.xzjmyk.pm.activity.R;
-//import com.xzjmyk.pm.activity.bean.oa.Signin;
-//import com.xzjmyk.pm.activity.bean.oa.SigninBean;
-//import com.xzjmyk.pm.activity.db.dao.SigninDao;
-//import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-//import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
-//import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-//import com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity;
-//import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-//import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
-//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.FlexJsonUtil;
-//import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
-//import com.xzjmyk.pm.activity.util.BaiduMapUtil;
-//import com.xzjmyk.pm.activity.util.TimeUtils;
-//import com.xzjmyk.pm.activity.util.ToastUtil;
-//
-//import org.json.JSONException;
-//import org.json.JSONObject;
-//
-//import java.util.Calendar;
-//import java.util.HashMap;
-//import java.util.LinkedHashMap;
-//import java.util.Map;
-//
-///**
-// * Created by gongpm on 2016/7/5.
-// */
-//public class SigninFragment extends EasyFragment {
-//    private static final int NEW_TIME_WHAT = 0x10;
-//    private static final int whatLoad = 0x11;
-//    private static final int whatSignin = 0x12;
-//    private static final int thrad = 0x13;
-//    private static final int requcode = 0x14;
-//    private static final int whatLog = 0x15;
-//    private static final double X = 22.540551;
-//    private static final double Y = 113.953345;
-//
-//    @ViewInject(R.id.location_tv)
-//    private TextView location_tv;
-//    @ViewInject(R.id.newtime_tv)
-//    private TextView newtime_tv;
-//    @ViewInject(R.id.time0fwork_tv)
-//    private TextView time0fwork_tv;
-//    @ViewInject(R.id.signin0fwork_tv)
-//    private TextView signin0fwork_tv;
-//    @ViewInject(R.id.time0fuwork_tv)
-//    private TextView time0fuwork_tv;
-//    @ViewInject(R.id.signin0fuwork_tv)
-//    private TextView signin0fuwork_tv;
-//    @ViewInject(R.id.untime_signin)
-//    private TextView untime_signin;
-//    @ViewInject(R.id.office_addr)
-//    private TextView office_addr;
-//    @ViewInject(R.id.unoffice_mm)
-//    private TextView unoffice_mm;
-//    @ViewInject(R.id.signin_btn)
-//    private LinearLayout signin_btn;
-//
-//    private LatLng location;
-//
-//    private SigninActivity ct;
-//    private PoiInfo myPoInfo;
-//    private String baseUrl;
-//    private boolean isPlay = false;//是否已经签到
-//    private Handler handler = new Handler() {
-//        @Override
-//        public void handleMessage(Message msg) {
-//            ct.progressDialog.dismiss();
-//            String message = msg.getData().getString("result");
-//            switch (msg.what) {
-//                case whatLog:
-//                    break;
-//                case whatLoad:
-//                    try {
-//                        //获取到当前时间
-//                        JSONObject object = new JSONObject(message);
-//                        String u = object.isNull("ondutytime") ? "00:00" : object.getString("ondutytime");
-//                        String d = object.isNull("offdutytime") ? "00:00" : object.getString("offdutytime");
-//                        int uHH = Integer.parseInt(u.split(":")[0]);
-//                        int uMM = Integer.parseInt(u.split(":")[1]);
-//                        int dHH = Integer.parseInt(d.split(":")[0]);
-//                        int dMM = Integer.parseInt(d.split(":")[1]);
-//                        time0fwork_tv.setText((uHH < 10 ? "0" : "") + uHH + ":" + (uMM < 10 ? "0" : "") + uMM);
-//                        time0fuwork_tv.setText((dHH < 10 ? "0" : "") + dHH + ":" + (dMM < 10 ? "0" : "") + dMM);
-//                        //获取到签到时间后开线程计算距离签到时间
-//                        startThrad(time0fwork_tv.getText().toString().trim() + ":00", time0fuwork_tv.getText().toString().trim() + ":00");
-//                    } catch (JSONException e) {
-//                        e.printStackTrace();
-//                    }
-//                    break;
-//                case whatSignin:
-//                    long time = System.currentTimeMillis();
-//                    Calendar mCalendar = Calendar.getInstance();
-//                    mCalendar.setTimeInMillis(time);
-//                    int mHour = mCalendar.get(Calendar.HOUR_OF_DAY);
-//                    int mMin = mCalendar.get(Calendar.MINUTE);
-//                    String strTime = (mHour < 10 ? "0" : "") + mHour + ":" + (mMin < 10 ? "0" : "") + mMin;
-//                    int k = SigninDao.getInstance(ct).getDateStatus(em_code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//                    if (k == 0) {
-//                        signin0fwork_tv.setText(strTime);
-//                        ToastUtil.showToast(ct, "上班打卡成功");
-//                    } else {
-//                        signin0fuwork_tv.setText(strTime);
-//                        ToastUtil.showToast(ct, "下班打卡成功");
-//                    }
-//                    Signin bean = new Signin();
-//                    bean.setCode(em_code);
-//                    bean.setDate(TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//                    bean.setDtime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//                    bean.setUtime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//                    SigninDao.getInstance(ct).updata(bean);
-//                    signinAble(false);//关闭签到入口
-//                    break;
-//                case thrad:
-//                    if (message == null) return;
-//                    untime_signin.setText(message);
-//                    break;
-//                case NEW_TIME_WHAT:
-//                    newtime_tv.setText(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//                    break;
-//                case Constants.HTTP_SUCCESS_INIT:
-//                    break;
-//                case Constants.APP_SOCKETIMEOUTEXCEPTION:
-//                    break;
-//            }
-//        }
-//    };
-//    private String em_code;
-//    long distanceTime = 60 * 1000 * 20;//允许提前20分钟签到
-//
-//    private void signinAble() {
-//        int k = SigninDao.getInstance(ct).getDateStatus(em_code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//        if (k == 2) {
-//            signinAble(false);
-//        } else {
-//            LatLng lalat = new LatLng(MyApplication.getInstance().getBdLocationHelper().getLatitude(),
-//                    MyApplication.getInstance().getBdLocationHelper().getLongitude());
-//            String str = BaiduMapUtil.getInstence().getDistance(lalat, location);
-//            unoffice_mm.setText("距离考勤地点：" + str + "米");
-//            if (BaiduMapUtil.getInstence().getDistanceD(lalat, location) < 500) {
-//                signinAble(true);
-//            } else {
-//                signinAble(false);
-//            }
-//        }
-//    }
-//
-//    private void signinAble(boolean b) {
-//        isPlay = !b;
-//        signin_btn.setFocusable(b);
-//        signin_btn.setClickable(b);
-//        if (b) {
-//            signin_btn.setBackgroundResource(R.drawable.button_round_shape);
-//        } else {
-//            signin_btn.setBackgroundResource(R.drawable.button_signin);
-//        }
-//    }
-//
-//    @Override
-//    protected int inflateLayoutId() {
-//        return R.layout.fragment_signin;
-//    }
-//
-//    @Override
-//    public void onAttach(Activity activity) {
-//        super.onAttach(activity);
-//        ct = (SigninActivity) activity;
-//    }
-//
-//    //开启线程计算时间
-//    private void startThrad(final String uTime, final String dTime) {
-//        ThreadPool.getThreadPool().addTask(new Runnable() {
-//            @Override
-//            public void run() {
-//                long distance = -1;
-//                if (signinNum == 0) {//没有打过卡,那当前时间和上班时间对比
-//                    distance = getDistanceTime(uTime);
-//                } else {//打了上班卡，拿当前时间和下班时间对比
-//                    distance = getDistanceTime(dTime);
-//                }
-//
-//                long unit;
-//                if (distance > 0) {//当前时间超过指定签到时间，要不断加
-//                    unit = 1000;
-//                } else {//当前时间还没到签到时间，要减
-//                    unit = -1000;
-//                }
-//                distance = Math.abs(distance);
-//                try {
-//                    while (distance > 0) {
-//                        distance -= unit;
-//                        sendHandle(distance);
-//                        Thread.sleep(1000);
-//                    }
-//                } catch (InterruptedException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        });
-//    }
-//
-//    /**
-//     * 获取当天的指定时分秒和当前的时间差
-//     *
-//     * @param time 时分秒 "HH:mm:ss"
-//     * @return 相差时间long(指定时间去减当前时间)
-//     */
-//    private long getDistanceTime(String time) {
-//        String temp = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + time;
-//        return TimeUtils.f_str_2_long(temp) - System.currentTimeMillis();
-//    }
-//
-//    private void sendHandle(long distance) {
-//        Message message = handler.obtainMessage();
-//        message.what = thrad;
-//        int d = (int) distance / 1000;
-//        int h = d / 3600;
-//        int m = (d % 3600) / 60;
-//        int s = ((d % 3600) % 60);
-//        String str = (h < 10 ? "0" : "") + h + ":" + (m < 10 ? "0" : "") + m + ":" + (s < 10 ? "0" : "") + s;
-//        Bundle bundle = new Bundle();
-//        bundle.putString("result", str);
-//        message.setData(bundle);
-//        handler.sendMessage(message);
-//    }
-//
-//    @Override
-//    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
-//        setHasOptionsMenu(true);
-//        ViewUtils.inject(getmRootView());
-//        long time = System.currentTimeMillis();
-//        ct.getSupportActionBar().setTitle(TimeUtils.day_long_2_str(time) + "  " + TimeUtils.getWeek(time));
-//        baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
-//        initView();
-//        loadNetData();
-//        loadLog();
-//    }
-//
-//    //获取网络数据
-//    private void loadNetData() {
-//        ct.progressDialog.show();
-//        //获取网络数据
-//        String url = baseUrl + "mobile/getWorkDate.action";
-//        if (em_code == null)
-//            em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
-//        int date = TimeUtils.int_long_2_str(System.currentTimeMillis());
-//        String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
-//        final Map<String, Object> param = new HashMap<>();
-//        param.put("emcode", em_code);
-//        param.put("date", date);
-//        param.put("sessionId", sessionId);
-//        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-//        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-//        ViewUtil.httpSendRequest(ct, url, param, handler, headers, whatLoad, null, null, "post");
-//    }
-//
-//    //获取打卡记录接口
-//    private void loadLog() {
-//        ct.progressDialog.show();
-//        //获取网络数据
-//        String url = baseUrl + "mobile/common/list.action";
-//        int date = TimeUtils.int_long_2_str(System.currentTimeMillis());
-//        String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
-//        String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
-//        final Map<String, Object> param = new HashMap<>();
-//        param.put("emcode", emcode);
-//        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
-//        param.put("page", 1);
-//        param.put("pageSize", 10);
-//        param.put("condition", "1=1");
-//        param.put("sessionId", sessionId);
-//        param.put("caller", "CardLog");
-//        param.put("sessionId", sessionId);
-//        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-//        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-//        ViewUtil.httpSendRequest(ct, url, param, handler, headers, whatLog, null, null, "get");
-//    }
-//
-//    //当位置信息长度超过8个字符，就会报错
-//    public String getLocation() {
-//        String temp = location_tv.getText().toString();
-//        String locationStr = "";
-//        if (temp.length() > 8) {
-//            locationStr = temp.substring(0, 7);
-//        }
-//        if (temp.length() <= 0) {
-//            locationStr = "未捕获位置名称";
-//        }
-//        return locationStr;
-//    }
-//
-//    //签到接口
-//    private void doSignin(String code) {
-//        //获取网络数据
-//        String url = baseUrl + "mobile/saveCardLog.action";
-//        final Map<String, Object> param = new HashMap<>();
-//        SigninBean bean = new SigninBean();
-//        bean.setCl_code(code);
-//        bean.setCl_address(office_addr.getText().toString());
-//        bean.setCl_distance(300);
-//        bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-//        bean.setCl_time(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//        bean.setCl_location(getLocation());
-//        bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
-//        bean.setCl_phone(MyApplication.getInstance().mLoginUser.getTelephone());
-//        String formStore = FlexJsonUtil.toJson(bean);
-//        String caller = "CardLog";
-//        param.put("caller", caller);
-//        param.put("formStore", formStore);
-//        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-//        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-//        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-//        ViewUtil.httpSendRequest(ct, url, param, handler, headers, whatSignin, null, null, "post");
-//    }
-//
-//    private void initView() {
-////        ct.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-//        setListener();
-//        location_tv.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());//初始化地址
-//        em_code = CommonUtil.getSharedPreferences(ct, "erp_username");//获取当前员工编号
-//        Signin bean = SigninDao.getInstance(ct).query(em_code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//        if (bean != null) {//当打卡有记录
-//
-//
-//        }
-//        //判断考勤距离
-//        LatLng lalat = new LatLng(MyApplication.getInstance().getBdLocationHelper().getLatitude(),
-//                MyApplication.getInstance().getBdLocationHelper().getLongitude());
-//        String str = BaiduMapUtil.getInstence().getDistance(lalat, location);
-//        unoffice_mm.setText("距离考勤地点：" + str + "米");
-//        signinAble();
-//    }
-//
-//    private void setListener() {
-//        ThreadPool.getThreadPool().addTask(new Runnable() {//开启线程进入时间显示
-//            @Override
-//            public void run() {
-//                while (true) {
-//                    if (isPlay) break;
-//                    try {
-//                        handler.sendEmptyMessage(NEW_TIME_WHAT);
-//                        Thread.sleep(1000);
-//                    } catch (InterruptedException e) {
-//                        e.printStackTrace();
-//                    }
-//                }
-//            }
-//        });
-//        signin_btn.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
-//                    @Override
-//                    public void callBack(String code) {
-//                        doSignin(code);
-//                    }
-//                });
-//
-//            }
-//        });
-//        findViewById(R.id.addr_tag).setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                startActivityForResult(new Intent(getActivity(), LocationMapActivity.class), requcode);
-//            }
-//        });
-//    }
-//
-////    private void showDateDalog() {
-////        //显示日期选择窗口
-////        if (dateDialog == null)
-////            dateDialog = new AlertDialog.Builder(getActivity()).create();
-////        if (!dateDialog.isShowing())
-////            dateDialog.show();
-////        DatePicker picker = new DatePicker(ct);
-////        picker.setDate(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth());
-////        picker.setMode(DPMode.SINGLE);
-////        picker.setOnDatePickedListener(new OnDatePickedListener() {
-////            @Override
-////            public void onDatePicked(String date) {
-////                ct.getSupportActionBar().setTitle(TimeUtils.day_long_2_str(TimeUtils.s_str_2_long(date)) + "   " + TimeUtils.getWeek(date));
-////                updataUIByDate(TimeUtils.day_long_2_str(TimeUtils.s_str_2_long(date)));
-////                dateDialog.dismiss();
-////            }
-////        });
-////        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-////                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-////        dateDialog.getWindow().setContentView(picker, params);
-////        dateDialog.getWindow().setGravity(Gravity.CENTER);
-////    }
-//
-//    private void updataUIByDate(String date) {
-//        //当日期改变时候更新ui
-//        if (!date.equals(TimeUtils.day_long_2_str(System.currentTimeMillis())))
-//            signinAble(false);//选择时间非当日，不给签到
-//        Signin bean = SigninDao.getInstance(ct).query(em_code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//        if (bean == null) {
-//            signin0fwork_tv.setText("--:--");
-//            signin0fuwork_tv.setText("--:--");
-//            newtime_tv.setText(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//            return;
-//        }
-//        if (bean.getSigninNum() >= 1) {
-//            signin0fwork_tv.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(bean.getUtime()), "HH:mm"));
-//            newtime_tv.setText(bean.getUtime());
-//        }
-//        if (bean.getSigninNum() == 2) {
-//            signin0fuwork_tv.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(bean.getDtime()), "HH:mm"));
-//            newtime_tv.setText(bean.getDtime());
-//        } else {
-//            signin0fwork_tv.setText("--:--");
-//            signin0fuwork_tv.setText("--:--");
-//            newtime_tv.setText(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//        }
-//    }
-//
-//    @Override
-//    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-//        inflater.inflate(R.menu.menu_oa_signin, menu);
-//        super.onCreateOptionsMenu(menu, inflater);
-//    }
-//
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (item.getItemId() == R.id.oa_alarma) {
-//            startActivity(new Intent(ct, AlarmaActivity.class));
-//        }
-//        return super.onOptionsItemSelected(item);
-//    }
-//
-//    @Override
-//    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-//        if (data != null) {
-//            if (requestCode == requcode) {
-//                if (resultCode == LocationMapActivity.REQUCODE) {//地图选择返回
-//                    myPoInfo = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
-//                    location_tv.setText(myPoInfo.name);
-//                    if (location == null)
-//                        location = new LatLng(X, Y);
-//                    String str = BaiduMapUtil.getInstence().getDistance(myPoInfo.location, location);
-//                    unoffice_mm.setText("距离考勤地点：" + str + "米");
-//                    signinAble();
-//                }
-//            }
-//        }
-//        super.onActivityResult(requestCode, resultCode, data);
-//    }
-//}

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

@@ -466,7 +466,7 @@ public class AutoCreateChatFragment extends EasyFragment {
         String master = CommonUtil.getSharedPreferences(mContext, "erp_master");
         String emCode = CommonUtil.getSharedPreferences(mContext, "erp_username");
         //查找本地数据库，管理群存在，则不创建
-        if (StringUtils.isEmpty(master))return;
+        if (StringUtils.isEmpty(master)) return;
         List<HrorgsEntity> hlist = db.queryHrorgList(new String[]{master, emCode}, "whichsys=? and or_headmancode=?");
         if (!ListUtils.isEmpty(hlist)) {
             String roomdesc = "本群为管理群！";

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

@@ -39,7 +39,7 @@ public class InstantMessageActivity extends BaseActivity implements OnClickListe
         // TODO Auto-generated method stub
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_messageinstant);
-        message = (ChatMessage) getIntent().getParcelableExtra(Constants.INSTANT_MESSAGE);
+        message = getIntent().getParcelableExtra(Constants.INSTANT_MESSAGE);
         instantFilePath = getIntent().getStringExtra(Constants.INSTANT_MESSAGE_FILE);
         loadData();
         initView();

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/BaiduMapUtil.java

@@ -114,6 +114,7 @@ public class BaiduMapUtil {
     public void getNearInfo(int radius, int pagerNum, LatLng location, PoiSearch mPoiSearch, OnNeerPoiListener neerPoiListener) {
         getNearInfo(radius, pagerNum, location, mPoiSearch, "写字楼", neerPoiListener);
     }
+
     public void getNearInfo(int radius, int pagerNum, LatLng location, PoiSearch mPoiSearch, String keyword, final OnNeerPoiListener neerPoiListener) {
         if (option == null)
             option = new PoiNearbySearchOption();
@@ -173,10 +174,10 @@ public class BaiduMapUtil {
 
     /**
      * 结束获取周围位置信息
-     * <p/>
-     * <p/>
-     * <p/>
-     * <p/>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
      * 开始定位功能
      */
 
@@ -185,12 +186,16 @@ public class BaiduMapUtil {
 
     public void getPoiInfo(Context context, OnLocationListener locationListener) {
         this.locationListener = locationListener;
-        if (mLocationClient == null)
+        if (mLocationClient == null) {
             mLocationClient = new LocationClient(context); // 声明LocationClient类
+        }
         mLocationClient.registerLocationListener(bdLocationListener); // 注册监听函数
         mLocationClient.setLocOption(initLocation());
         if (!mLocationClient.isStarted()) {
             mLocationClient.start();
+        } else {
+            mLocationClient.stop();
+            mLocationClient.start();
         }
     }
 
@@ -250,9 +255,11 @@ public class BaiduMapUtil {
             List<Poi> list = location.getPoiList();// POI数据
             map.put("list", list);//
             map.put("poi", list.get(0).getName());//
+            mLocationClient.stop();
+            mLocationClient.unRegisterLocationListener(this);
             if (locationListener == null) return;
             locationListener.result(map);
-            mLocationClient.unRegisterLocationListener(this);
+
         }
     };
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/TimeUtils.java

@@ -26,7 +26,6 @@ public class TimeUtils {
         Calendar c = Calendar.getInstance();
         c.setTimeInMillis(TimeUtils.s_str_2_long(date));
         String src = "";
-
         int week = c.get(Calendar.DAY_OF_WEEK);
         switch (week) {
             case 1:

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -321,12 +321,6 @@ public class CalendarView extends View implements View.OnTouchListener {
         this.isSelectMore = isSelectMore;
     }
 
-    public void setToday() {
-        downDate = new Date();
-        if (onItemClickListener != null)
-            onItemClickListener.OnItemClick(new Date(), new Date(), new Date());
-        invalidate();
-    }
 
     private void setSelectedDateByCoor(float x, float y) {
         if (y > surface.monthHeight + surface.weekHeight) {
@@ -334,7 +328,7 @@ public class CalendarView extends View implements View.OnTouchListener {
             int n = (int) (Math
                     .floor((y - (surface.monthHeight + surface.weekHeight))
                             / Float.valueOf(surface.cellHeight)) + 1);
-            int index = (n - 1) * 6 + m - 1;
+            int index = (n - 1) * 7 + m - 1;
             if (index < curStartIndex || curEndIndex <= index) return;
             downIndex = index;
             calendar.setTime(curDate);
@@ -359,28 +353,11 @@ public class CalendarView extends View implements View.OnTouchListener {
                 break;
             case MotionEvent.ACTION_UP:
                 if (downDate != null) {
-                    if (isSelectMore) {
-                        if (!completed) {
-                            if (downDate.before(selectedStartDate)) {
-                                selectedEndDate = selectedStartDate;
-                                selectedStartDate = downDate;
-                            } else {
-                                selectedEndDate = downDate;
-                            }
-                            completed = true;
-                            //响应监听事件
-                            onItemClickListener.OnItemClick(selectedStartDate, selectedEndDate, downDate);
-                        } else {
-                            selectedStartDate = selectedEndDate = downDate;
-                            completed = false;
-                        }
-                    } else {
-                        selectedStartDate = selectedEndDate = downDate;
-                        //响应监听事件
-                        onItemClickListener.OnItemClick(selectedStartDate, selectedEndDate, downDate);
-                    }
-                    invalidate();
+                    selectedStartDate = selectedEndDate = downDate;
+                    //响应监听事件
+                    onItemClickListener.OnItemClick(date[downIndex]);
                 }
+                invalidate();
                 break;
         }
         return true;
@@ -393,7 +370,7 @@ public class CalendarView extends View implements View.OnTouchListener {
 
     //监听接口
     public interface OnItemClickListener {
-        void OnItemClick(Date selectedStartDate, Date selectedEndDate, Date downDate);
+        void OnItemClick(int date);
     }
 
     /**
@@ -414,7 +391,7 @@ public class CalendarView extends View implements View.OnTouchListener {
         private int borderColor = Color.parseColor("#CCCCCC");
         public int todayNumberColor = Color.RED;
         public int cellDownColor = Color.parseColor("#CCFFFF");
-        public int cellSelectedColor = Color.parseColor("#FF69B4");
+        public int cellSelectedColor = Color.parseColor("#ea493d");
         public Paint borderPaint;
         public Paint monthPaint;
         public Paint weekPaint;

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/TextRed" />
+            <corners android:radius="360dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+
+</selector>

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

@@ -235,8 +235,7 @@
                 <TextView
                     android:id="@+id/location_tv"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="广东深圳南山区英唐大厦" />
+                    android:layout_height="wrap_content" />
 
                 <View
                     android:layout_width="6dp"
@@ -249,7 +248,6 @@
                     android:clickable="true"
                     android:text="@string/agare"
                     android:textColor="@color/blue" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -265,7 +263,7 @@
                     android:id="@+id/num_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="当前签到人数 0/52" />
+                    android:text="当前签到人数 0/0" />
 
                 <View
                     android:layout_width="6dp"

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

@@ -17,11 +17,12 @@
         android:drawableLeft="@drawable/search"
         android:drawableRight="@drawable/search_clear"
         android:hint="@string/search"
+        android:padding="8dp"
         android:textColor="@color/dark_grey"
         android:textColorHint="@color/grey"
         android:textSize="15sp" />
 
-    <ListView
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -11,6 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#ebe9e9"
         android:orientation="vertical">
 
         <TextView
@@ -28,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/toobar"
-            android:background="@color/text_black"
+            android:background="@drawable/oa_top_bg"
             android:orientation="vertical"
             android:paddingTop="10dp">
 
@@ -373,6 +374,13 @@
             android:layout_height="1px"
             android:background="@color/item_line" />
 
+        <GridView
+            android:id="@+id/gridview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:numColumns="7"
+            android:visibility="gone" />
+
         <com.xzjmyk.pm.activity.view.CalendarView
             android:id="@+id/oa_picker"
             android:layout_width="match_parent"
@@ -394,8 +402,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
                 android:gravity="center"
-                android:text="我的任务日程:0"
-                android:textSize="12sp" />
+                android:text="工作日历:0"
+                android:textSize="@dimen/text_main" />
 
             <View
                 android:layout_width="1px"
@@ -409,7 +417,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="已完成:0"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_main" />
 
             <View
                 android:layout_width="1px"
@@ -423,21 +431,21 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="未完成:0"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_main" />
 
             <View
                 android:layout_width="1px"
                 android:layout_height="match_parent"
                 android:background="@color/item_line" />
 
-            <TextView
+            <ImageView
+                android:src="@drawable/filter"
                 android:id="@+id/ok_scale"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="22dp"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="达成率:0%"
-                android:textSize="12sp" />
+             />
         </LinearLayout>
 
         <View

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

@@ -18,6 +18,7 @@
             android:id="@+id/time_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/outoffice_time"
             android:text="签到时间:"
             android:textSize="@dimen/text_main" />
 
@@ -34,6 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/time_tag"
             android:layout_marginTop="5dp"
+            android:drawableLeft="@drawable/outffice_addr"
             android:text="签到地点:"
             android:textSize="@dimen/text_main" />
 
@@ -52,6 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/addr_tag"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/outffice_com"
             android:text="当前企业:"
             android:textSize="@dimen/text_main" />
 
@@ -63,16 +66,7 @@
             android:layout_toRightOf="@+id/com_tag"
             android:textSize="@dimen/text_main" />
 
-        <TextView
-            android:id="@+id/poi_list"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/com_tag"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@+id/com_tv"
-            android:text="附近地址"
-            android:textColor="@color/blue"
-            android:textSize="@dimen/text_main" />
+
     </RelativeLayout>
 
     <View

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

@@ -1,174 +1,174 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="20dp">
-
-    <TextView
-        android:id="@+id/name_img"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:background="@drawable/text_button_stye3"
-        android:gravity="center"
-        android:scaleType="fitXY"
-        android:textColor="@color/white"
-        android:textSize="40sp" />
-
-    <TextView
-        android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/name_img"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/name_img"
-        android:text="熊晨阳"
-        android:textSize="20dp" />
-
-    <TextView
-        android:id="@+id/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:text="你今天完成签到"
-        android:textSize="20dp" />
-
-    <TextView
-        android:id="@+id/num_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv"
-        android:layout_alignBottom="@+id/name_tv"
-        android:layout_marginLeft="5dp"
-        android:layout_toRightOf="@+id/tv"
-        android:text="0 "
-        android:textColor="@color/mainList2"
-        android:textSize="25dp" />
-
-    <TextView
+    android:background="@color/bg_main"
+    android:orientation="vertical">
 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/num_tv"
-        android:text="次"
-        android:textSize="20dp" />
-
-    <TextView
-        android:id="@+id/com_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/tv"
-        android:layout_below="@+id/tv"
-        android:layout_marginTop="5dp"
-        android:text="优软科技"
-        android:textSize="@dimen/text_hine" />
-
-    <View
-        android:id="@+id/line1"
+    <RelativeLayout
+        android:id="@+id/top"
         android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/name_img"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
-    <TextView
-        android:id="@+id/date_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/line1"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/alarm"
-        android:textSize="@dimen/text_hine" />
-
-    <TextView
-        android:id="@+id/out_date_tv"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/date_tag"
-        android:layout_below="@+id/line1"
-        android:layout_toRightOf="@+id/date_tag"
-        android:textSize="@dimen/text_hine" />
-
-    <TextView
-        android:id="@+id/out_time_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/date_tag"
-        android:textSize="@dimen/text_hine" />
+        android:padding="10dp">
+
+        <ImageView
+            android:id="@+id/name_img"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:scaleType="fitXY"
+            android:textColor="@color/white"
+            android:textSize="40sp" />
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_alignLeft="@id/name_img"
+            android:layout_below="@id/name_img"
+            android:background="@color/item_line" />
+
+        <TextView
+            android:id="@+id/name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/name_img"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/name_img"
+            android:text="熊天命"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/name_tv"
+            android:layout_below="@+id/line"
+            android:layout_marginTop="10dp"
+            android:text="你今天完成签到"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/num_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/tv"
+            android:layout_alignBottom="@+id/name_tv"
+            android:layout_marginLeft="5dp"
+            android:layout_toRightOf="@+id/tv"
+            android:text="0 "
+            android:textColor="@color/mainList2"
+            android:textSize="25dp" />
+
+        <TextView
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/tv"
+            android:layout_marginLeft="2dp"
+            android:layout_toRightOf="@+id/num_tv"
+            android:text="次"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/com_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:text="优软科技"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
+    </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/out_time_tv"
-        android:layout_toLeftOf="@+id/out_time_tv"
-        android:drawableLeft="@drawable/alarm"
-        android:text="时间:"
-        android:textSize="@dimen/text_hine" />
 
     <View
-        android:id="@+id/line2"
         android:layout_width="match_parent"
         android:layout_height="2px"
-        android:layout_below="@+id/out_date_tv"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="30dp"
         android:background="@color/item_line" />
 
-    <com.baidu.mapapi.map.MapView
-        android:id="@+id/mapView"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_below="@+id/line2"
-        android:clickable="true" />
-
-    <TextView
-        android:id="@+id/out_add_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/mapView"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/mapView"
-        android:text="英唐大厦"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/out_add_t_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/out_add_name_tv"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toRightOf="@+id/mapView"
-        android:maxLines="2"
-        android:text="广东深圳南山区高新技术产业园。。。。"
-        android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
-
-    <TextView
-        android:id="@+id/do_trim"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/mapView"
-        android:layout_alignLeft="@+id/out_add_name_tv"
-        android:layout_toRightOf="@+id/mapView"
-        android:maxLines="1"
-        android:text="地点微调"
-        android:textColor="@color/green"
-        android:textSize="@dimen/text_hine" />
+        android:layout_below="@id/tv"
+        android:background="@color/white"
+        android:padding="10dp">
+
+        <com.baidu.mapapi.map.MapView
+            android:id="@+id/mapView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_centerVertical="true"
+            android:clickable="true" />
+
+        <ImageView
+            android:id="@+id/tag_img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/mapView"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/mapView"
+            android:src="@drawable/outoffice_time" />
+
+        <TextView
+            android:id="@+id/date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/tag_img"
+            android:layout_marginLeft="5dp"
+            android:layout_toRightOf="@id/tag_img"
+            android:textSize="@dimen/text_hine" />
+
+        <ImageView
+            android:id="@+id/tag_img2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/tag_img"
+            android:layout_below="@id/tag_img"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/outffice_addr" />
+
+        <TextView
+            android:id="@+id/location_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/date_tv"
+            android:layout_alignTop="@id/tag_img2"
+            android:layout_below="@+id/date_tv"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/addr_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/date_tv"
+            android:layout_below="@+id/location_tv"
+            android:layout_marginTop="5dp"
+            android:maxLines="2"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
+
+        <TextView
+            android:id="@+id/do_trim"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/date_tv"
+            android:layout_below="@id/addr_tv"
+            android:layout_marginTop="10dp"
+            android:maxLines="1"
+            android:text="地点微调"
+            android:textColor="@color/green"
+            android:textSize="@dimen/text_hine" />
+    </RelativeLayout>
 
     <View
-        android:id="@+id/line3"
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:layout_below="@+id/mapView"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
         android:background="@color/item_line" />
 
     <Button
@@ -177,9 +177,10 @@
         android:layout_height="100dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:layout_gravity="center"
+        android:layout_marginTop="100dp"
         android:background="@drawable/button_round_shape"
-        android:gravity="center"
         android:text="签到"
         android:textColor="@color/white"
         android:textSize="20sp" />
-</RelativeLayout>
+</LinearLayout>

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

@@ -1,249 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_above="@+id/bottom">
+    android:orientation="vertical">
 
     <RelativeLayout
+        android:id="@+id/top"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="50dp"
-        android:paddingRight="50dp"
-        android:paddingTop="50dp">
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/antionbarcolor">
 
-        <LinearLayout
-            android:id="@+id/time0fwork_ll"
-            android:layout_width="100dp"
-            android:layout_height="60dp"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="上班时间" />
-
-            <TextView
-                android:id="@+id/time0fwork_tv"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/signin0fwork_ll"
-            android:layout_width="120dp"
-            android:layout_height="60dp"
-            android:layout_alignParentRight="true"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="上班签到时间" />
-
-            <TextView
-                android:id="@+id/signin0fwork_tv"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/time0fuwork_ll"
-            android:layout_width="100dp"
-            android:layout_height="60dp"
-            android:layout_below="@+id/time0fwork_ll"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="下班时间" />
-
-            <TextView
-                android:id="@+id/time0fuwork_tv"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/signin0fuwork_ll"
-            android:layout_width="120dp"
-            android:layout_height="60dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/time0fuwork_ll"
-            android:layout_below="@+id/signin0fwork_ll"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="下班签到时间" />
-
-            <TextView
-                android:id="@+id/signin0fuwork_tv"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/back"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:src="@drawable/back" />
 
-        <RelativeLayout
-            android:id="@+id/signin_rl"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/signin0fuwork_ll"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/oa_signin_tv_bg">
-
-            <TextView
-                style="@style/add_signin_tv_hine"
-                android:text="距离签到时间：" />
+            android:layout_centerInParent="true"
+            android:drawableRight="@drawable/down"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main" />
+
+        <ImageView
+            android:id="@+id/seting"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:padding="5dp"
+            android:src="@drawable/setting" />
+    </RelativeLayout>
 
-            <TextView
-                android:id="@+id/untime_signin"
-                style="@style/add_signin_tv_hine"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dp" />
-        </RelativeLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/addr_rl"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/signin_rl"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/addr_tag"
-                style="@style/add_signin_tv_hine"
-                android:layout_marginLeft="0dp"
-                android:drawableLeft="@drawable/oa_signin"
-                android:text="地址：" />
 
-            <TextView
-                android:id="@+id/location_tv"
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/listview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:drawableRight="@drawable/oa_next"
-                android:ellipsize="marquee"
-                android:gravity="right"
-                android:lines="1"
-                android:textSize="@dimen/text_hine" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/oa_range_addr_rl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/addr_rl"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:orientation="vertical"
-            android:padding="5dp">
-
-            <TextView
-                android:id="@+id/office_addr"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="考勤地点：深圳市优软科技有限公司" />
-
-            <TextView
-                android:id="@+id/unoffice_mm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="距离考勤地点：" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/addr_rl"
-            android:layout_marginTop="5dp"
-            android:text="定位不准？重新定位"
-            android:textColor="@color/blue"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/signin_btn"
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_below="@+id/oa_range_addr_rl"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/button_round_shape"
-            android:clickable="true"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="20dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="打卡"
-                android:textColor="@color/white"
-                android:textSize="30dp" />
-
-            <TextView
-                android:id="@+id/newtime_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
                 android:layout_marginTop="10dp"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_min" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_do"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_below="@+id/oa_range_addr_rl"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/button_round_shape"
-            android:clickable="true"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="10dp"
-            android:visibility="gone">
-
-            <TextView
+                android:clickable="false"
+                android:divider="@null"
+                android:dividerHeight="0dp"
+                android:focusable="false"
+                android:longClickable="false"
+                android:minHeight="100dp" />
+
+            <ImageView
+                android:id="@+id/signin_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="打卡"
-                android:textColor="@color/white"
-                android:textSize="20sp" />
-
-            <View
-                android:layout_width="@dimen/abc_text_size_body_1_material"
-                android:layout_height="5dp" />
+                android:layout_below="@+id/oa_range_addr_rl"
+                android:layout_gravity="center"
+                android:clickable="true"
+                android:gravity="center"
+                android:src="@drawable/signin_btn" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/oa_range_addr_rl"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="XX:XX:XX"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
+                android:layout_below="@+id/addr_rl"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="50dp"
+                android:clickable="true"
+                android:orientation="vertical"
+                android:padding="5dp">
+
+                <TextView
+                    android:id="@+id/office_addr"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/oa_signin"
+                    android:text="考勤地点:" />
+
+                <TextView
+                    android:id="@+id/unoffice_mm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="地点微调"
+                    android:textColor="@color/cadetblue" />
+            </LinearLayout>
         </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
+    </ScrollView>
+</LinearLayout>

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

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:layout_height="match_parent">
-    <RelativeLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/antionbarcolor">
-
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="40dp"
-            android:layout_height="match_parent"
-            android:src="@drawable/back" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:drawableRight="@drawable/down"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main" />
-
-        <ImageView
-            android:id="@+id/seting"
-            android:layout_width="40dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:padding="5dp"
-            android:src="@drawable/setting" />
-    </RelativeLayout>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-
-
-            <com.xzjmyk.pm.activity.view.MyListView
-                android:id="@+id/listview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="0dp"
-                android:layout_marginTop="10dp"
-                android:clickable="false"
-                android:divider="@null"
-                android:dividerHeight="0dp"
-                android:focusable="false"
-                android:longClickable="false"
-                android:minHeight="100dp" />
-
-            <ImageView
-                android:id="@+id/signin_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/oa_range_addr_rl"
-                android:layout_gravity="center"
-                android:clickable="true"
-                android:gravity="center"
-                android:src="@drawable/signin_btn" />
-
-            <LinearLayout
-                android:id="@+id/oa_range_addr_rl"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/addr_rl"
-                android:layout_marginTop="100dp"
-                android:clickable="true"
-                android:orientation="vertical"
-                android:padding="5dp">
-
-                <TextView
-                    android:id="@+id/office_addr"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/oa_signin"
-                    android:text="考勤地点：深圳市优软科技有限公司" />
-
-                <TextView
-                    android:id="@+id/unoffice_mm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="地点微调"
-                    android:textColor="@color/cadetblue" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

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

@@ -3,27 +3,26 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <View
-        android:layout_width="10px"
-        android:layout_height="100dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/item_line" />
-
     <View
         android:id="@+id/point"
         android:layout_width="15dp"
         android:layout_height="15dp"
         android:layout_centerHorizontal="true"
-        android:layout_margin="10dp"
-        android:background="@drawable/button_round_shape" />
+        android:background="@drawable/signin_point" />
+
+    <View
+        android:layout_width="6px"
+        android:layout_height="100dp"
+        android:layout_below="@+id/point"
+        android:layout_centerHorizontal="true"
+        android:background="@color/item_line" />
 
     <TextView
         android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/point"
+        android:layout_marginRight="10dp"
         android:layout_toLeftOf="@+id/point"
         android:gravity="center"
         android:text="08:00"
@@ -47,6 +46,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/point"
+        android:layout_marginLeft="10dp"
         android:layout_toRightOf="@+id/point"
         android:text="上班签到时间  "
         android:textColor="@color/text_main"
@@ -66,7 +66,7 @@
         android:id="@+id/tag"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/point"
+        android:layout_below="@+id/signin_tag"
         android:layout_marginLeft="10dp"
         android:layout_toRightOf="@+id/point"
         android:background="@drawable/bg_btn"

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

@@ -4,5 +4,6 @@
     <item
         android:id="@id/title"
         android:title="设置"
+        android:icon="@drawable/setting"
         app:showAsAction="always" />
 </menu>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 06 08:53:18 CST 2016
+#Fri Aug 19 18:54:48 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip