接口

WeiChat/build.gradle

@@ -31,9 +31,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
-        /*debug {
+         debug {
             signingConfig signingConfigs.config
-        }*/
+        }
     }
 }
 

WeiChat/src/main/AndroidManifest.xml

@@ -471,7 +471,9 @@
         <activity
             android:name=".ui.erp.activity.oa.OutofficeSetActivity"
             android:label="签到设置" />
-        <activity android:name=".ui.erp.activity.oa.TestActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.TestActivity" />
+        <activity android:name=".ui.erp.activity.oa.OutSigninOKActivity"
+            android:label="签到"/>
     </application>
 
 </manifest>

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

@@ -0,0 +1,142 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+/**
+ * Created by gongpm on 2016/7/22.
+ */
+public class MeetBean {
+    private String ma_code;
+    private String ma_mrcode;
+    private String ma_theme;
+    private String ma_status;
+    private String ma_recorder;
+    private String ma_recorddate;
+    private String ma_starttime;
+    private String ma_isturndoc;
+    private String ma_remark;
+    private String ma_group;
+    private String ma_id;
+    private String ma_endtime;
+//    private int ma_groupid;
+    private String ma_statuscode;
+    private String ma_mrname;
+
+    public String getMa_mrname() {
+        return ma_mrname;
+    }
+
+    public void setMa_mrname(String ma_mrname) {
+        this.ma_mrname = ma_mrname;
+    }
+
+    public String getMa_code() {
+        return ma_code;
+    }
+
+    public void setMa_code(String ma_code) {
+        this.ma_code = ma_code;
+    }
+
+    public String getMa_mrcode() {
+        return ma_mrcode;
+    }
+
+    public void setMa_mrcode(String ma_mrcode) {
+        this.ma_mrcode = ma_mrcode;
+    }
+
+    public String getMa_theme() {
+        return ma_theme;
+    }
+
+    public void setMa_theme(String ma_theme) {
+        this.ma_theme = ma_theme;
+    }
+
+    public String getMa_status() {
+        return ma_status;
+    }
+
+    public void setMa_status(String ma_status) {
+        this.ma_status = ma_status;
+    }
+
+    public String getMa_recorder() {
+        return ma_recorder;
+    }
+
+    public void setMa_recorder(String ma_recorder) {
+        this.ma_recorder = ma_recorder;
+    }
+
+    public String getMa_recorddate() {
+        return ma_recorddate;
+    }
+
+    public void setMa_recorddate(String ma_recorddate) {
+        this.ma_recorddate = ma_recorddate;
+    }
+
+    public String getMa_starttime() {
+        return ma_starttime;
+    }
+
+    public void setMa_starttime(String ma_starttime) {
+        this.ma_starttime = ma_starttime;
+    }
+
+    public String getMa_isturndoc() {
+        return ma_isturndoc;
+    }
+
+    public void setMa_isturndoc(String ma_isturndoc) {
+        this.ma_isturndoc = ma_isturndoc;
+    }
+
+    public String getMa_remark() {
+        return ma_remark;
+    }
+
+    public void setMa_remark(String ma_remark) {
+        this.ma_remark = ma_remark;
+    }
+
+    public String getMa_group() {
+        return ma_group;
+    }
+
+    public void setMa_group(String ma_group) {
+        this.ma_group = ma_group;
+    }
+
+    public String getMa_id() {
+        return ma_id;
+    }
+
+    public void setMa_id(String ma_id) {
+        this.ma_id = ma_id;
+    }
+
+    public String getMa_endtime() {
+        return ma_endtime;
+    }
+
+    public void setMa_endtime(String ma_endtime) {
+        this.ma_endtime = ma_endtime;
+    }
+
+//    public int getMa_groupid() {
+//        return ma_groupid;
+//    }
+//
+//    public void setMa_groupid(int ma_groupid) {
+//        this.ma_groupid = ma_groupid;
+//    }
+
+    public String getMa_statuscode() {
+        return ma_statuscode;
+    }
+
+    public void setMa_statuscode(String ma_statuscode) {
+        this.ma_statuscode = ma_statuscode;
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+/**
+ * Created by gongpm on 2016/7/22.
+ */
+public class OutSigninBean {
+    private String mo_signtime;
+    private String mo_address;
+    private String mo_mancode;
+    private String mo_man;
+    private String mo_remark;
+    private int  mo_attachid;
+    private String mo_company;
+
+    public String getMo_company() {
+        return mo_company;
+    }
+
+    public void setMo_company(String mo_company) {
+        this.mo_company = mo_company;
+    }
+
+    public String getMo_signtime() {
+        return mo_signtime;
+    }
+
+    public void setMo_signtime(String mo_signtime) {
+        this.mo_signtime = mo_signtime;
+    }
+
+    public String getMo_address() {
+        return mo_address;
+    }
+
+    public void setMo_address(String mo_address) {
+        this.mo_address = mo_address;
+    }
+
+    public String getMo_mancode() {
+        return mo_mancode;
+    }
+
+    public void setMo_mancode(String mo_mancode) {
+        this.mo_mancode = mo_mancode;
+    }
+
+    public String getMo_man() {
+        return mo_man;
+    }
+
+    public void setMo_man(String mo_man) {
+        this.mo_man = mo_man;
+    }
+
+    public String getMo_remark() {
+        return mo_remark;
+    }
+
+    public void setMo_remark(String mo_remark) {
+        this.mo_remark = mo_remark;
+    }
+
+    public int getMo_attachid() {
+        return mo_attachid;
+    }
+
+    public void setMo_attachid(int mo_attachid) {
+        this.mo_attachid = mo_attachid;
+    }
+}

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

@@ -1,7 +1,5 @@
 package com.xzjmyk.pm.activity.bean.oa;
 
-import com.baidu.mapapi.search.core.PoiInfo;
-
 /**
  * Created by gongpm on 2016/7/14.
  */
@@ -12,7 +10,7 @@ public class SigninBean {
     private String cl_emcode;//打卡员工编号
     private String cl_emname;//打卡员工名
     private String cl_location;//考勤地址
-    private String cl_distance;//考勤距离
+    private int cl_distance;//考勤距离
 
     public String getCl_time() {
         return cl_time;
@@ -62,11 +60,11 @@ public class SigninBean {
         this.cl_location = cl_location;
     }
 
-    public String getCl_distance() {
+    public int getCl_distance() {
         return cl_distance;
     }
 
-    public void setCl_distance(String cl_distance) {
+    public void setCl_distance(int cl_distance) {
         this.cl_distance = cl_distance;
     }
 }

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

@@ -2,25 +2,63 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.MeetBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class AddMeetingActivity extends BaseActivity implements View.OnClickListener {
 
     private AddMeetingActivity ct;
+    private final int whatLoad = 0x11;
+    private final int whatSignin = 0x12;
+    private String baseUrl;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            ct.progressDialog.dismiss();
+            String message = (String) msg.getData().get("result");
+            Log.i("gongpengming", message);
+            switch (msg.what) {
+                case whatLoad:
+                    Log.i("gongpengming", "msg.what == whatLoad");
+                    break;
+                case whatSignin:
+                    Log.i("gongpengming", "msg.what == whatSignin");
+                    break;
+                case Constants.HTTP_SUCCESS_INIT:
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    break;
+            }
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_meeting);
+        baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         ct = this;
         initView();
     }
 
+
     private void initView() {
         findViewById(R.id.meet_main_rl).setOnClickListener(this);
+        findViewById(R.id.bt_save).setOnClickListener(this);
     }
 
     @Override
@@ -29,6 +67,45 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             case R.id.meet_main_rl:
                 startActivity(new Intent(ct, AddMeetMainActivity.class));
                 break;
+            case R.id.bt_save:
+                doSignin();
+                break;
+        }
+    }
+
+    private void doSignin() {
+        //获取网络数据
+        if (baseUrl == null) {
+            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         }
+        String url = baseUrl + "oa/meeting/saveMeetingroomapply.action";
+        final Map<String, Object> param = new HashMap<>();
+        MeetBean bean = new MeetBean();
+        bean.setMa_code("20160700044");
+        bean.setMa_mrcode("2015120001");
+        bean.setMa_mrname("1212");
+        bean.setMa_theme("测试");
+        bean.setMa_status("在录入");
+        bean.setMa_recorder("陈萍");
+        bean.setMa_recorddate("2016-07-20");
+        bean.setMa_starttime("2016-07-20 14:54:00");
+        bean.setMa_isturndoc("否");
+        bean.setMa_remark("");
+        bean.setMa_group("陈小小虎");
+        bean.setMa_id("10010");
+        bean.setMa_endtime("2016-07-21 19:54:00");
+//        bean.setMa_groupid(201);
+        bean.setMa_statuscode("ENTERING");
+        String formStore = FlexJsonUtil.toJson(bean);
+        Log.i("gongpengming", formStore);
+        Log.i("gongpengming", url);
+        String caller = "Meetingroomapply";
+        param.put("caller", caller);
+        param.put("param", "[]");
+        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");
     }
 }

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

@@ -2,37 +2,80 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class
-        MeetDetailsActivity extends BaseActivity implements View.OnClickListener {
+MeetDetailsActivity extends BaseActivity implements View.OnClickListener {
     private CustomerListView meet_listview;
+    private final int whatLoad = 0x11;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = (String) msg.getData().get("result");
+            Log.i("gongpengming", message);
+            switch (msg.what) {
+                case whatLoad:
+                    Log.i("gongpengming", "what==whatLoad");
+                    break;
+            }
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meet_details);
         getSupportActionBar().setTitle("会议详情");
-
+        loadNetData();
         initView();
     }
 
     private void initView() {
         meet_listview = (CustomerListView) findViewById(R.id.meet_listview);
-
         findViewById(R.id.click_find).setOnClickListener(this);
     }
 
+    String baseUrl;
+
+    //获取网络数据
+    private void loadNetData() {
+        progressDialog.show();
+        //获取网络数据
+        if (baseUrl == null) {
+            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        }
+        String url = baseUrl + "mobile/common/getPanel.action";
+        String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
+        final Map<String, Object> param = new HashMap<>();
+        String caller = "Meetingroomapply";
+        param.put("caller", caller);
+        param.put("emcode", em_code);
+        param.put("sessionId", sessionId);
+        Log.i("gongpengming", url + "?emcode=" + em_code + "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");
+    }
 
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.click_find:
-                startActivity(new Intent(MeetDetailsActivity.this,OARegisterActivity.class));
+                startActivity(new Intent(MeetDetailsActivity.this, OARegisterActivity.class));
                 break;
         }
     }

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

@@ -2,6 +2,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -14,15 +17,48 @@ import android.widget.TextView;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class MeetingActivity extends BaseActivity {
     private MeetingActivity activity = this;
     private PullToRefreshListView listView;
 
+
+    private String baseUrl;
+    private final int whatLoad = 0x11;
+    private final int whatSignin = 0x12;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            progressDialog.dismiss();
+            String message = (String) msg.getData().get("result");
+            Log.i("gongpengming", message);
+            switch (msg.what) {
+                case whatLoad:
+                    Log.i("gongpengming", "msg.what == whatLoad");
+                    break;
+                case whatSignin:
+                    Log.i("gongpengming", "msg.what == whatSignin");
+                    break;
+                case Constants.HTTP_SUCCESS_INIT:
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    break;
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meeting);
+        baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         getSupportActionBar().setTitle("会议助手");
         initView();
     }
@@ -36,6 +72,8 @@ public class MeetingActivity extends BaseActivity {
                 startActivity(new Intent(MeetingActivity.this, MeetDetailsActivity.class));
             }
         });
+
+        loadNetData();
     }
 
 
@@ -63,6 +101,29 @@ public class MeetingActivity extends BaseActivity {
     }
 
 
+    //获取网络数据
+    private void loadNetData() {
+        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";
+        String condition = "MA_STATUSCODE='AUDITED'";
+        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("condition", condition);
+        param.put("sessionId", sessionId);
+        Log.i("gongpengming", url + "?emcode=" + emcode + "&caller=" + caller + "&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");
+    }
+
     class MesstingAdapter extends BaseAdapter {
         @Override
         public int getCount() {
@@ -99,15 +160,25 @@ public class MeetingActivity extends BaseActivity {
             } else {
                 viewholder = (ViewHolder) view.getTag();
             }
+            bindData(viewholder, i);
+            return view;
+        }
+
+        private void bindData(ViewHolder viewholder, int i) {
 
 
-            return view;
         }
 
         class ViewHolder {
-            TextView oa_meeting_name_tv, oa_meeting_status_tv, oa_meeting_start, oa_meeting_end, oa_meeting_start_date, oa_meeting_end_date,
-                    oa_meeting_addr_tv, oa_meeting_user_tv, oa_meeting_tag_tv;
-
+            TextView oa_meeting_name_tv,    //会议名称
+                    oa_meeting_status_tv, //会议状态
+                    oa_meeting_start,//会议开始日期
+                    oa_meeting_end,//会议结束日期
+                    oa_meeting_start_date,//会议开始时间
+                    oa_meeting_end_date,//会议结束时间
+                    oa_meeting_addr_tv,//会议地址
+                    oa_meeting_user_tv,//会议发起人
+                    oa_meeting_tag_tv;//会议标签
         }
 
     }

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

@@ -0,0 +1,103 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.OutSigninBean;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+//外勤签到
+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;
+    private String baseUrl;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        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);
+    }
+
+    private void initView(String time, String addr, String com) {
+        baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
+        time_tv.setText(time);
+        addr_tv.setText(addr);
+        com_tv.setText(com);
+        exit_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                doSignin();
+            }
+        });
+    }
+    private final int whatSignin = 0x12;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            progressDialog.dismiss();
+            String message = (String) msg.getData().get("result");
+            Log.i("gongpengming", message);
+            switch (msg.what) {
+                case whatSignin:
+                    Log.i("gongpengming", "msg.what == whatSignin");
+                    break;
+                case Constants.HTTP_SUCCESS_INIT:
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    break;
+            }
+        }
+    };
+
+    private void doSignin() {
+        //获取网络数据
+        String url = baseUrl + "mobile/oa/saveOutSign.action";
+        final Map<String, Object> param = new HashMap<>();
+        OutSigninBean bean = new OutSigninBean();
+        bean.setMo_address("广东深圳南山");
+        bean.setMo_mancode("U0735");
+        bean.setMo_man("gongpengming");
+        bean.setMo_remark("Tag");
+        bean.setMo_attachid(201);
+        bean.setMo_company("又软科技");
+        bean.setMo_signtime("2016-11-11 11:11:11");
+        String formStore = FlexJsonUtil.toJson(bean);
+        Log.i("gongpengming", formStore);
+        String caller = "mobile_outsign";
+        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");
+    }
+}

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

@@ -34,7 +34,7 @@ public class SigninActivity extends BaseActivity {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 if (b) {
-                    Log.i("gong", "R.id.setting_rb");
+
                     if (setFragment == null) {
                         setFragment = new SigninSetFragment();
                     }
@@ -57,9 +57,6 @@ public class SigninActivity extends BaseActivity {
         });
 
     }
-
-
-
     @Override
     public void onBackPressed() {
         super.onBackPressed();
@@ -70,6 +67,4 @@ public class SigninActivity extends BaseActivity {
         //TODO 退出时候操作
         finish();
     }
-
-
 }

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

@@ -2,9 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 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;
@@ -18,24 +15,12 @@ import com.baidu.mapapi.search.core.PoiInfo;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 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;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * Created by gongpm on 2016/7/14.
@@ -50,7 +35,6 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private Button click_btn;//点击签到
     private TextView out_add_t_tv;//地址
     private OutofficeActivity ct;
-    private String baseUrl;
 
     //当前位置
     private LatLng point;
@@ -58,35 +42,19 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
 
     private MapView mapView;
 
-    private final int whatSignin = 0x12;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            ct.progressDialog.dismiss();
-            String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
-            switch (msg.what) {
-                case whatSignin:
-                    Log.i("gongpengming", "msg.what == whatSignin");
-                    break;
-                case Constants.HTTP_SUCCESS_INIT:
-                    break;
-                case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    break;
-            }
-        }
-    };
+
+    private TextView com_tv;
 
     @Override
     protected int inflateLayoutId() {
         return R.layout.fragment_outoffice;
     }
+
     //mobile/oa/saveOutSign.action
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         setHasOptionsMenu(true);
         ct = (OutofficeActivity) getActivity();
-//        baseUrl=CommonUtil.getSharedPreferences()/
         initview();
     }
 
@@ -100,27 +68,13 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         out_time_tv = (TextView) findViewById(R.id.out_time_tv);
         click_btn = (Button) findViewById(R.id.click_btn);
         mapView = (MapView) findViewById(R.id.mapView);
+        com_tv = (TextView) findViewById(R.id.com_tv);
         findViewById(R.id.do_trim).setOnClickListener(this);
         initData();
         click_btn.setOnClickListener(this);
     }
 
-    private void doSignin() {
-        //获取网络数据
-        String url = baseUrl + "mobile/oa/saveOutSign.action";
-        final Map<String, Object> param = new HashMap<>();
-        SigninBean bean = new SigninBean();
-        String formStore = FlexJsonUtil.toJson(bean);
-
-        Log.i("gongpengming", formStore);
-        String caller = "mobile_outsign";
-        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");
-    }
+
 
     @Override
     public void onClick(View view) {
@@ -129,7 +83,11 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 startActivityForResult(new Intent(getActivity(), LocationMapActivity.class), requestCode);
                 break;
             case R.id.click_btn:
-                startActivityForResult(new Intent(getActivity(), LocationMapActivity.class), requestCode);
+                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());
+                startActivityForResult(intent, requestCode);
                 break;
         }
     }

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

@@ -16,7 +16,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.android.volley.toolbox.StringRequest;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -57,7 +56,7 @@ public class SigninFragment extends EasyFragment {
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            ct.progressDialog.dismiss();
+//            ct.progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
             Log.i("gongpengming", message);
             switch (msg.what) {
@@ -137,11 +136,11 @@ public class SigninFragment extends EasyFragment {
         final Map<String, Object> param = new HashMap<>();
         SigninBean bean = new SigninBean();
         bean.setCl_address(office_addr.getText().toString());
-        bean.setCl_distance(unoffice_mm.getText().toString());
+        bean.setCl_distance(300);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
-        bean.setCl_time(TimeUtils.int_long_2_str(System.currentTimeMillis()) + "");
-        bean.setCl_location(location_tv.getText().toString()+"test地址");
+        bean.setCl_time("2016-07-22");
+        bean.setCl_location("test地址");
         bean.setCl_phone(MyApplication.getInstance().mLoginUser.getTelephone());
         String formStore = FlexJsonUtil.toJson(bean);
         Log.i("gongpengming", formStore);

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

@@ -624,7 +624,6 @@ public class ViewUtil {
             final Bundle bundle,
             final String request) {
         new Thread(new Runnable() {
-
             @Override
             public void run() {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);

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

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity">
+
+    <RelativeLayout
+        android:id="@+id/top_tag"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/time_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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_toRightOf="@+id/time_tag" />
+
+        <TextView
+            android:id="@+id/addr_tag_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/time_tag"
+            android:layout_marginTop="5dp"
+            android:text="签到地点:"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/addr_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/addr_tag_tv"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:background="@color/item_line" />
+
+    <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="请填写备注"
+        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" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/com_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="当前企业:"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/com_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/com_tag" />
+
+        <Button
+            android:id="@+id/exit_btn"
+            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>

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

@@ -1,5 +1,4 @@
 <RelativeLayout 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="@color/white">

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

@@ -13,7 +13,16 @@
         android:padding="10dp"
         android:text="晨阳"
         android:textSize="25dp" />
+    <TextView
+        android:id="@+id/com_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_alignBottom="@+id/name_tv"
+        android:layout_toRightOf="@+id/name_tv"
+        android:text="又软帝国"
 
+        android:textSize="@dimen/text_hine" />
     <TextView
         android:id="@+id/name2_tv"
         android:layout_width="wrap_content"
@@ -28,8 +37,8 @@
         android:id="@+id/tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/name_tv"
-        android:layout_marginBottom="10dp"
+        android:layout_above="@+id/com_tv"
+        android:layout_below="@+id/name2_tv"
         android:layout_toRightOf="@+id/name_tv"
         android:text="你今天完成签到"
         android:textSize="20dp" />
@@ -51,7 +60,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/name_tv"
-        android:layout_marginBottom="10dp"
+        android:layout_alignTop="@+id/tv"
         android:layout_marginLeft="2dp"
         android:layout_toRightOf="@+id/num_tv"
         android:text="次"
@@ -67,13 +76,23 @@
         android:background="@color/item_line" />
 
     <TextView
-        android:id="@+id/out_date_tv"
+        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:text="星期一：2016.06.13"
+        android:text="星期一:"
+        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:text="2016.06.13"
         android:textSize="@dimen/text_hine" />
 
     <TextView
@@ -81,9 +100,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/out_date_tv"
+        android:layout_alignTop="@+id/date_tag"
+        android:text="20:24"
+        android:textSize="@dimen/text_hine" />
+
+    <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="当前时间：20:24"
+        android:text="时间:"
         android:textSize="@dimen/text_hine" />
 
     <View
@@ -154,9 +181,9 @@
         android:layout_height="100dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:textColor="@color/white"
-        android:textSize="20sp"
         android:background="@drawable/button_round_shape"
         android:gravity="center"
-        android:text="签到" />
+        android:text="签到"
+        android:textColor="@color/white"
+        android:textSize="20sp" />
 </RelativeLayout>

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

@@ -149,6 +149,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
+                android:gravity="left"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/addr_tag"
                 android:drawableRight="@drawable/oa_next"