2016/8/29 -2

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

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

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

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

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

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

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

@@ -81,12 +81,13 @@ public class MeetingActivity extends BaseActivity {
 
     private void updateUI(List<MeetEntity> listdata) {
         //更新界面
-        if (adapter == null)
+        if (adapter == null) {
             adapter = new MesstingAdapter();
+            list_business.setAdapter(adapter);
+        }
         if (entities == null)
             entities = listdata;
         else entities.addAll(listdata);
-        Log.i("gongpengmingss", entities.size() + "");
         adapter.setData(entities);
     }
 
@@ -108,6 +109,7 @@ public class MeetingActivity extends BaseActivity {
         progressDialog.show();
         loadNetData(basePager);
     }
+
     private void listener() {
         list_business.setMode(PullToRefreshBase.Mode.BOTH);
         list_business.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {

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

@@ -394,15 +394,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("item_name", "创建任务");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "创建日程");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "新增拜访计划");
         list.add(map);
-
         map = new HashMap<>();
         map.put("item_name", "新增拜访报告");
         list.add(map);

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

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

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

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

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

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

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

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

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

@@ -39,7 +39,6 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         style="@style/ListViewBasic"
-        android:background="@color/hintColor"
-        android:divider="@color/item_line" />
+        android:divider="@drawable/bg_bar" />
 
 </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/oa_main"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -28,7 +29,6 @@
         <ImageView
             android:id="@+id/seting"
             android:layout_width="40dp"
-
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:padding="8dp"