end of 2016-08-22

WeiChat/build.gradle

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/OABean.java

@@ -7,7 +7,7 @@ import android.os.Parcelable;
  * oa首页对象实体
  * Created by gongp on 2016/8/17.
  */
-public class OABean implements Parcelable{
+public class OABean implements Parcelable {
     //通用属性
     private int type;//类型  1、任务 2、日程 3、拜访
     private String startdate;//2016-08-09 02:01:23
@@ -15,6 +15,7 @@ public class OABean implements Parcelable{
     private String enddate;//2016-08-09 02:01:23
 
     //任务日程属性
+    private String resourcecode;//未知
     private String taskcode;//2016070004
     private String description;//测试（类型）
     private String recorder;//录入人（陈萍）

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

@@ -66,7 +66,6 @@ import java.util.UUID;
 
 /**
  * @author LiuJie
- * @updata gongpm 2016.5.25
  */
 public class AddTaskActivity extends BaseActivity implements OnClickListener {
 

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

@@ -9,7 +9,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
@@ -50,8 +49,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     @ViewInject(R.id.tv_content)
     private FormEditText tv_content;
     @ViewInject(R.id.tv_date_start)
-    private FormEditText  tv_date_start;
-    
+    private FormEditText tv_date_start;
+
     private String code = null;
 
     @Override
@@ -72,6 +71,11 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         } else if (type == 1) {
             getSupportActionBar().setTitle("新增日程");
             tv_type.setText("日程");
+        } else if (type == 2) {
+            getSupportActionBar().setTitle("新增会议任务");
+            tv_type.setText("会议任务");
+            tv_name.setText(getIntent().getStringExtra("meetname"));
+            tv_name.setFocusable(false);
         }
         tv_notice.setOnClickListener(this);
         tv_priority.setOnClickListener(this);
@@ -104,9 +108,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (tv_name.testValidity()&&tv_executive.testValidity()&&tv_date.testValidity()
-                        &&tv_priority.testValidity()
-                        &&tv_date_start.testValidity()) {
+                if (tv_name.testValidity() && tv_executive.testValidity() && tv_date.testValidity()
+                        && tv_priority.testValidity()
+                        && tv_date_start.testValidity()) {
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
                 }
                 break;
@@ -127,6 +131,12 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     ToastMessage("保存成功！");
                     if (!StringUtils.isEmpty(code))
                         setCodeByNet(code);
+                    if ("会议任务".equals(tv_name.getText().toString().trim())) {
+                        Intent intent = new Intent();
+//                        intent.putExtra()
+                        setResult(0x11,intent);
+                        finish();
+                    }
 //                    finish();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -137,6 +147,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 case endCodeWhat:
                     Log.i("gongpengming", msg.getData().getString("result"));
                     ToastMessage("保存上传成功！");
+
                     break;
                 case codeWhat://获取编号
                     progressDialog.dismiss();
@@ -148,7 +159,6 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
 
     private void sendHttpResquest(int what) {
         progressDialog.show();
-       
         String formStore = "{\n" +
                 "\"taskcode\":\"" + tv_code + "\",\n" +//编号
                 "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
@@ -175,7 +185,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 "\"description\":\"" +
                 tv_content.getText().toString() +
                 "\",\n" +
-       
+
                 "}";
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
@@ -237,16 +247,16 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
             public void onDatePicked(String year, String month, String day) {
-                switch (view.getId()){
+                switch (view.getId()) {
                     case R.id.tv_date:
-                       view.setText(year + "-" + month + "-" + day);
+                        view.setText(year + "-" + month + "-" + day);
                         break;
                     case R.id.tv_date_start:
                         view.setText(year + "-" + month + "-" + day);
                         break;
                 }
-                    
-               
+
+
             }
         });
         picker.show();

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

@@ -12,6 +12,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -31,29 +32,29 @@ import java.util.Map;
 
 public class VisitReportAddActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.tv_date_select)
-    private EditText tv_date_select;
+    private FormEditText tv_date_select;
     @ViewInject(R.id.tv_address_login)
-    private EditText tv_address_login;
+    private FormEditText tv_address_login;
     @ViewInject(R.id.tv_address_refresh)
     private TextView tv_address_refresh;
     @ViewInject(R.id.tv_customer_login)
-    private EditText tv_customer_login;
+    private FormEditText tv_customer_login;
     @ViewInject(R.id.tv_linksman_login)
-    private EditText tv_linksman_login;
+    private FormEditText tv_linksman_login;
     @ViewInject(R.id.tv_visit_login)
-    private EditText tv_visit_login;
+    private FormEditText tv_visit_login;
     @ViewInject(R.id.tv_date_start)
-    private EditText ttv_date_start;
+    private FormEditText ttv_date_start;
     @ViewInject(R.id.tv_date_end)
-    private EditText tv_date_end;
+    private FormEditText tv_date_end;
 
     @ViewInject(R.id.tv_notes_login)
-    private EditText tv_notes_login;
+    private FormEditText tv_notes_login;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_visit_report_add);
+        setContentView(R.layout.activity_visit_report_plan);
         initView();
         initData();
         initListener();
@@ -125,7 +126,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
     private void sendHttpResquest(int what) {
         progressDialog.show();
-        String formStore ="";
+        String formStore = "";
          /*       "{\n" +
                 "\"vr_code\":\"" + tv_code + "\",\n" +
                 "\"vr_visittime\":\"" + tv_date_select.getText().toString() + "\",\n" +
@@ -186,7 +187,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
                     @Override
                     public void result(Map<String, Object> map) {
-                        tv_address_login.setText(map.get("poi")+"");
+                        tv_address_login.setText(map.get("poi") + "");
                     }
                 });
                 break;

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

@@ -31,14 +31,15 @@ public class AddMeetTaskActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
-            Log.i("gongpengming", message);
             switch (msg.what) {
                 case 0x11:
+                    Log.i("gongpengming", message);
                     break;
             }
 
         }
     };
+    private String meetName;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,8 +51,10 @@ public class AddMeetTaskActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (R.id.add_item == item.getItemId()) {
-
-            startActivityForResult(new Intent(ct, TaskAddActivity.class), 0x11);
+            Intent intent = new Intent(ct, TaskAddActivity.class);
+            intent.putExtra("type", 2);
+            intent.putExtra("meetname", meetName);
+            startActivityForResult(intent, 0x11);
         }
         return super.onOptionsItemSelected(item);
     }
@@ -62,11 +65,19 @@ public class AddMeetTaskActivity extends BaseActivity {
         return super.onCreateOptionsMenu(menu);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        if (requestCode == 0x11 && resultCode == 0x11) {
+              data.getStringExtra("name");
+        }
+    }
+
     private void initView() {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setEmptyView(R.layout.view_empty);
+        meetName = getIntent().getStringExtra("name");
         loadNetData();
-
     }
 
 

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

@@ -261,9 +261,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View view) {
+        Intent intent = null;
         switch (view.getId()) {
             case R.id.num_tag:
-                Intent intent = new Intent(MeetDetailsActivity.this, OARegisterActivity.class);
+                intent = new Intent(MeetDetailsActivity.this, OARegisterActivity.class);
                 intent.putExtra("code", ma_code);
                 intent.putExtra("id", ma_code);
                 startActivity(intent);
@@ -274,7 +275,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     return;
                 }
                 MeetingDocBean bean = new MeetingDocBean();
-                Intent data = new Intent(ct, SaveMeetActivity.class);
+                intent = new Intent(ct, SaveMeetActivity.class);
                 bean.setMd_recorder(user_tv.getText().toString());
                 bean.setMd_recorderdate("");
                 bean.setMd_status("在录入");
@@ -291,8 +292,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 bean.setMd_attachs("");
                 bean.setMd_contents("jil");
                 bean.setMd_groupid("employee#1010913");//数据返回
-                data.putExtra("data", bean);
-                startActivity(data);
+                intent.putExtra("data", bean);
+                startActivity(intent);
                 break;
             case R.id.end_meet_tv:
                 if (!user_tv.getText().toString().trim().equals(MyApplication.getInstance().mLoginUser.getNickName().trim())) {
@@ -308,7 +309,9 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 getPoinfo();
                 break;
             case R.id.add_task_ll://添加任务
-                startActivity(new Intent(ct, AddMeetTaskActivity.class));
+                intent = new Intent(ct, AddMeetTaskActivity.class);
+                intent.putExtra("name", name_tv.getText().toString() == null ? "" : name_tv.getText().toString());
+                startActivity(intent);
                 break;
         }
     }

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

@@ -78,7 +78,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private View my_client_log_tag;//我的下属工作日志标识
     @ViewInject(R.id.my_log_tag)
     private View my_log_tag;//我的工作日志标识
-
     private int tag = 1;
     private ArrayList<OABean> meBeans = null;
     private ArrayList<OABean> otherBeans = null;
@@ -262,7 +261,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         loadNetData();
     }
 
-
     private void initData() {
         rootScrollView.requestDisallowInterceptTouchEvent(false);
         picker.setCalendarData(new Date());
@@ -392,24 +390,29 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 int ok = 0;
                 int noOk = 0;
                 List<OABean> beans = new ArrayList<>();
-                for (OABean e : (tag == 1 ? meBeans : otherBeans)) {
-                    if (e.getStartdate() == null) continue;
-                    c.setTimeInMillis(TimeUtils.f_str_2_long(e.getStartdate()));
-                    int day = c.get(Calendar.DAY_OF_MONTH);
-                    if (day == downDate) {//选择那天的任务
-                        beans.add(e);
-                        if ("已完成".equals(e.getStatus()) || "已拜访".equals("e.getStatus()")) {
-                            ok += 1;
-                        } else {
-                            noOk += 1;
+                try {// meBeans : otherBeans 可能为空
+                    for (OABean e : (tag == 1 ? meBeans : otherBeans)) {
+                        if (e.getStartdate() == null) continue;
+                        c.setTimeInMillis(TimeUtils.f_str_2_long(e.getStartdate()));
+                        int day = c.get(Calendar.DAY_OF_MONTH);
+                        if (day == downDate) {//选择那天的任务
+                            beans.add(e);
+                            if ("已完成".equals(e.getStatus()) || "已拜访".equals("e.getStatus()")) {
+                                ok += 1;
+                            } else {
+                                noOk += 1;
+                            }
                         }
                     }
+                } catch (NullPointerException e) {
+                    e.printStackTrace();
+                } finally {
+                    all_task_num.setText("工作日历:" + (ok + noOk));
+                    ok_task_num.setText("已完成:" + ok);
+                    uok_task_num.setText("未完成:" + noOk);
+                    adapter.setBeans(beans);
+                    rootScrollView.smoothScrollTo(0, 20);
                 }
-                all_task_num.setText("工作日历:" + (ok + noOk));
-                ok_task_num.setText("已完成:" + ok);
-                uok_task_num.setText("未完成:" + noOk);
-                adapter.setBeans(beans);
-                rootScrollView.smoothScrollTo(0, 20);
             }
         });
     }

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

@@ -5,12 +5,18 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.baidu.location.Poi;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -24,31 +30,26 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 //外勤签到
-public class OutSigninOKActivity extends BaseActivity implements View.OnClickListener {
+public class OutSigninOKActivity extends BaseActivity {
     @ViewInject(R.id.time_tv)//签到时间
     private TextView time_tv;
     @ViewInject(R.id.addr_tv)//签到地址
     private TextView addr_tv;
     @ViewInject(R.id.com_tv)//签到对应公司
     private TextView com_tv;
-    @ViewInject(R.id.exit_btn)//签到按钮
-    private Button exit_btn;
-    @ViewInject(R.id.text_edit)//签到按钮
+    @ViewInject(R.id.text_edit)
     private EditText text_edit;
+    @ViewInject(R.id.listview)
+    private MyListView listview;
     private String baseUrl;
 
-    private List<Poi> list;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,7 +58,27 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
         Intent intent = getIntent();
         String addr = intent.getStringExtra("addr");
         String com = intent.getStringExtra("com");
-        initView(addr, com);
+        JSONArray json = intent.getParcelableExtra("list");
+        initView(addr, com, json);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.push) {
+            CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
+                @Override
+                public void callBack(String code) {
+                    doSignin(code);
+                }
+            });
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_push, menu);
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
@@ -68,20 +89,13 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
         }
     }
 
-    private void initView(String addr, String com) {
+    private void initView(String addr, String com, JSONArray json) {
         baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         com_tv.setText(com);
         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);
+        if (json != null)
+            listview.setAdapter(new SigninAdapter(json));
     }
 
     private final int whatSignin = 0x12;
@@ -92,21 +106,18 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
             String message = (String) msg.getData().get("result");
             switch (msg.what) {
                 case whatSignin:
-                    try {
-                        JSONObject json = new JSONObject(message);
-                        if (!json.isNull("success") && json.getBoolean("success")) {
-                            ToastUtil.showToast(ct, "签到成功");
-                            Intent intent = new Intent();
-                            intent.putExtra("result", true);
-                            setResult(0x12, intent);
-                            finish();
-                        } else {
-                            ToastUtil.showToast(ct, "签到失败");
-                        }
-                    } catch (JSONException e) {
+                    JSONObject json = JSON.parseObject(message);
+
+                    if (json.containsKey("success") && json.getBoolean("success")) {
+                        ToastUtil.showToast(ct, "签到成功");
+                        Intent intent = new Intent();
+                        intent.putExtra("result", true);
+                        setResult(0x12, intent);
+                        finish();
+                    } else {
                         ToastUtil.showToast(ct, "签到失败");
-                        e.printStackTrace();
                     }
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     ToastUtil.showToast(ct, "签到失败");
@@ -164,17 +175,55 @@ public class OutSigninOKActivity extends BaseActivity implements View.OnClickLis
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, whatSignin, null, null, "post");
     }
 
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.exit_btn:
-                CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
-                    @Override
-                    public void callBack(String code) {
-                        doSignin(code);
-                    }
-                });
-                break;
+    class SigninAdapter extends BaseAdapter {
+        private JSONArray json;
+
+        public SigninAdapter(JSONArray json) {
+            this.json = json;
+        }
+
+        @Override
+        public int getCount() {
+            return json == null ? 0 : json.size();
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return json.get(i);
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            ViewHolder holder = null;
+            if (view == null) {
+                holder = new ViewHolder();
+                view = LayoutInflater.from(ct).inflate(R.layout.item_outoffice_list, null);
+                holder.time = (TextView) view.findViewById(R.id.time);
+                holder.name = (TextView) view.findViewById(R.id.name);
+                holder.addr = (TextView) view.findViewById(R.id.addr);
+                holder.company = (TextView) view.findViewById(R.id.company);
+                view.setTag(holder);
+            } else {
+                holder = (ViewHolder) view.getTag();
+            }
+            JSONObject object = json.getJSONObject(i);
+            holder.time.setText(object.getString("mo_signtime") == null ? "" : object.getString("mo_signtime"));
+            holder.name.setText(object.getString("mo_man") == null ? "" : object.getString("mo_man"));
+            holder.addr.setText(object.getString("mo_address") == null ? "" : object.getString("mo_address"));
+            holder.company.setText(object.getString("mo_company") == null ? "" : object.getString("mo_company"));
+            return view;
+        }
+
+        class ViewHolder {
+            TextView time,//时间
+                    name,//签到人
+                    addr, //地址
+                    company;//签到公司
         }
     }
 

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -14,6 +13,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
@@ -66,15 +66,16 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @ViewInject(R.id.do_trim)
     private TextView do_trim;
     private OutofficeActivity ct;
+    private JSONArray json = null;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             ct.progressDialog.dismiss();
             String message = msg.getData().getString("result");
-            Log.i("gongpengming", message);
             if (msg.what == WHAT_LOAD) {
                 if (JSON.parseObject(message).containsKey("listdata")) {
-                    sigNum = JSON.parseObject(message).getJSONArray("listdata").size();
+                    json = JSON.parseObject(message).getJSONArray("listdata");
+                    sigNum = json.size();
                     num_tv.setText(sigNum + "");
                 }
             }
@@ -177,6 +178,8 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 Intent intent = new Intent(getActivity(), OutSigninOKActivity.class);
                 intent.putExtra("addr", out_add_t_tv.getText().toString());
                 intent.putExtra("com", out_add_name_tv.getText().toString());
+                if (json != null)
+                    intent.putExtra("list", json);
                 startActivityForResult(intent, requestCode);
                 break;
         }

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

@@ -81,7 +81,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     private String baseUrl = null;
     private SigninActivity ct = null;
     private String code = null;
-    private boolean isRef = false;
     private boolean isPlay = true;
     private Bean chche = null;//临时对象
     private SigninAdapter adapter;
@@ -91,6 +90,9 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
             ct.progressDialog.dismiss();
+            if (!signin_btn.isFocusable()) {
+                signin_btn.setFocusable(true);
+            }
             switch (msg.what) {
                 case WHATLOAD://下拉时间
                     JSONObject jsonObject = JSON.parseObject(message);//返回对象
@@ -331,6 +333,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
 
     //签到
     private void doSignin(String code) {
+        signin_btn.setFocusable(false);
         String url = "mobile/saveCardLog.action";
         final Map<String, Object> param = new HashMap<>();
         SigninBean bean = new SigninBean();

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/oa_main"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetDetailsActivity">
 
 
@@ -10,7 +11,6 @@
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:background="@color/item_color1"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -286,6 +286,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_below="@+id/meet_about"
+        android:background="@color/white"
         android:clickable="true"
         android:gravity="center"
         android:padding="20dp"

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

@@ -40,7 +40,7 @@
         android:layout_below="@+id/seach_top"
         android:layout_marginTop="10dp"
         android:background="@color/item_color2"
-        android:divider="@color/item_line"
+        android:divider="@color/oa_main"
         android:dividerHeight="10dp" />
 
 </RelativeLayout>

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

@@ -1,113 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
-    android:orientation="vertical"
+    android:background="@color/oa_main"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity">
 
-    <RelativeLayout
-        android:id="@+id/top_tag"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:padding="10dp">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <TextView
-            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" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
 
-        <TextView
-            android:id="@+id/time_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/time_tag"
-            android:layout_toRightOf="@id/time_tag" />
+            <TextView
+                android:id="@+id/com_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
+                android:drawableLeft="@drawable/outffice_com"
+                android:text="当前企业:"
+                android:textSize="@dimen/text_main" />
 
-        <TextView
-            android:id="@+id/addr_tag"
-            android:layout_width="wrap_content"
-            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" />
-
-        <TextView
-            android:id="@+id/addr_tv"
-            android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/com_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/com_tag"
+                android:layout_toRightOf="@+id/com_tag"
+                android:textSize="@dimen/text_main" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/top_tag"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/addr_tag"
+            android:background="@color/white"
+            android:padding="10dp">
 
-            android:layout_toRightOf="@+id/addr_tag"
-            android:maxLines="2" />
+            <TextView
+                android:id="@+id/time_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:drawableLeft="@drawable/outoffice_time"
+                android:text="签到时间:"
+                android:textSize="@dimen/text_main" />
 
-        <TextView
-            android:id="@+id/com_tag"
-            android:layout_width="wrap_content"
-            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" />
+            <TextView
+                android:id="@+id/time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/time_tag"
+                android:layout_toRightOf="@id/time_tag" />
 
-        <TextView
-            android:id="@+id/com_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/com_tag"
-            android:layout_toRightOf="@+id/com_tag"
-            android:textSize="@dimen/text_main" />
+            <TextView
+                android:id="@+id/addr_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/time_tag"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="5dp"
+                android:drawableLeft="@drawable/outffice_addr"
+                android:text="签到地点:"
+                android:textSize="@dimen/text_main" />
 
-    </RelativeLayout>
+            <TextView
+                android:id="@+id/addr_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/addr_tag"
+                android:layout_toRightOf="@+id/addr_tag"
+                android:maxLines="2" />
+        </RelativeLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:background="@color/item_line" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="20dp" />
 
-    <EditText
-        android:id="@+id/text_edit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/top_tag"
-        android:background="@drawable/full_edit_bg"
-        android:gravity="top"
-        android:hint="请填写备注(不超过100个字)"
-        android:inputType="textMultiLine"
-        android:minHeight="150dp"
-        android:padding="10dp"
-        android:textColor="@color/black"
-        android:textColorHint="@color/grey"
-        android:textSize="16sp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:background="@color/item_line" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:padding="10dp">
+            <EditText
+                android:id="@+id/text_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:gravity="top"
+                android:hint="请填写备注(不超过100个字)"
+                android:inputType="textMultiLine"
+                android:minLines="4"
+                android:textSize="@dimen/text_main" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:src="@drawable/picture" />
+            </RelativeLayout>
+        </LinearLayout>
 
-        <Button
-            android:id="@+id/exit_btn"
+        <com.xzjmyk.pm.activity.view.MyListView
+            android:id="@+id/listview"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_alignParentBottom="true"
-            android:layout_margin="50dp"
-            android:background="@drawable/bg_btn"
-            android:text="提交签到"
-            android:textColor="@color/white" />
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:divider="@color/item_line"
+            android:dividerHeight="2px" />
+
+    </LinearLayout>
+</ScrollView>

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

@@ -22,12 +22,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:layout_marginLeft="20dp"
                 android:text="名称"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+
             <TextView
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="60dp"
@@ -38,8 +39,8 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_name"
                 style="@style/form_relative_right_text"
-                editTextFormExample:testType="nocheck"
-                android:hint="请输入" />
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -69,8 +70,8 @@
                 android:id="@+id/tv_executive"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -81,27 +82,29 @@
                 android:id="@+id/tv_id1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
                 android:gravity="center"
                 android:text="开始日期"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+
             <TextView
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="25dp"
                 android:layout_toRightOf="@+id/tv_id1"
                 android:text="*"
                 android:textColor="@color/red" />
-          
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_date_start"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
-          
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
+
         </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/company_erp_rl"
             style="@style/form_relative_customer"
@@ -118,6 +121,7 @@
                 android:text="截止日期"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+
             <TextView
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="25dp"
@@ -129,14 +133,15 @@
                 android:id="@+id/tv_date"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/deparment_erp_rl"
             style="@style/form_relative_customer"
-          
+
             android:background="@color/white">
 
             <TextView
@@ -150,18 +155,20 @@
                 android:text="紧急程度"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+
             <TextView
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="25dp"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_priority"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -180,12 +187,13 @@
                 android:text="类型"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-            
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_type"
                 style="@style/form_relative_right_text"
-                editTextFormExample:testType="nocheck"
-                android:text="任务" />
+                android:focusable="false"
+                android:text="任务"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -200,18 +208,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-           
+
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="关联客户"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-            
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_customer"
                 style="@style/form_relative_right_text"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 
@@ -227,20 +235,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-          
+
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="提醒"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
-          
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_notice"
                 style="@style/form_relative_right_text"
-                editTextFormExample:testType="nocheck"
-                android:hint="请选择" />
+                android:hint="请选择"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 
@@ -257,18 +264,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawablePadding="10dp"
                 android:layout_marginLeft="20dp"
+                android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="详情"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_content"
-                android:layout_height="80dp"
                 style="@style/form_relative_right_text"
-                editTextFormExample:testType="nocheck"
-                android:hint="最多输入十五个字符" />
+                android:gravity="top|left"
+                android:minLines="4"
+                android:padding="5dp"
+                android:hint="最多输入十五个字符"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="签到人" />
+
+    <TextView
+        android:id="@+id/company"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:text="签到企业" />
+
+    <TextView
+        android:id="@+id/time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/name"
+        android:layout_marginTop="8dp"
+        android:text="签到地点" />
+
+    <TextView
+        android:id="@+id/addr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/time"
+        android:layout_marginTop="8dp"
+        android:text="签到地点" />
+</RelativeLayout>

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

@@ -5,7 +5,6 @@
 
     <item
         android:id="@+id/push"
-        android:icon="@drawable/fab_add"
         android:title="发送"
         app:showAsAction="ifRoom" />
 

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

@@ -6,6 +6,7 @@
     <string name="alar_content"> 上班时间快到了，请尽快打卡 </string>
     <string name="ualar_content"> 下班时间过去了，请尽快打卡 </string>
 
+    <color name="oa_main">#f4f4f5</color>
     <!--listView 中对于 contentView的settag方法参数定义 -->
     <item name="position" type="id"></item>
 

readme.md

@@ -1,2 +1,2 @@
 3:30
-名片取数据为本地，日后需要接口支持；
+名片取数据为本地，日后需要接口支持