2016/08/17-1

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/AndroidManifest.xml

@@ -404,7 +404,8 @@
         <activity android:name=".ui.message.SubscriptionActivity" />
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
-        <activity android:name=".ui.erp.activity.oa.SigninActivity" />
+        <activity android:name=".ui.erp.activity.oa.SigninActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity android:name=".ui.erp.activity.oa.AddMeetingActivity"
             android:label="新增会议"/>
         <activity

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -36,11 +36,9 @@ import java.io.File;
 import java.util.List;
 
 public class MyApplication extends Application {
-
     /**
      * @注释：记录Cookie
      */
-
     public String JSESSION_B2B;
     public static Cookie cookie;
     public static Cookie cookieERP;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -484,7 +484,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
                 forwardingBuilder.append(message.getFowardText());
             }
         }
-
         if (viewType == VIEW_TYPE_NORMAL_TEXT) {
             viewHolder.content_fl.setVisibility(View.GONE);// 因为有个MarginTop
             // 5dp，所以没内容的时候隐藏，免得中间间隔有点大

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -467,9 +467,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 if (result != null && result.getData() != null && result.getData().size() > 0) {
                     mMessages.clear();
                     mMessages.addAll(result.getData());
-
                     mAdapter.notifyDataSetInvalidated();
-
                 }
                 requestData(true);
             }

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

@@ -446,19 +446,23 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                 break;
             case R.id.ll_subject://我的行程
                 //TODO 审批先不做
-                ToastUtil.showToast(activity, "该功能暂未开通");
+                ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
             case R.id.attendance_ll://考勤单据
                 startActivity(new Intent(activity, ErpMenActivity.class));
                 break;
             case R.id.borrowing_ll://借款申请
+                ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
             case R.id.repayment_ll://还款申请
+                ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
             case R.id.ll_://差旅费报销
+                ToastUtil.showToast(activity, "该功能还在内测中");
                 break;
             case R.id.ll_attendance://考勤统计
-                startActivity(new Intent(activity, StatisticsActivity.class));
+                ToastUtil.showToast(activity, "该功能还在内测中");
+//                startActivity(new Intent(activity, StatisticsActivity.class));
                 break;
             case R.id.staff_tv://点击人员
 //                startActivity(new Intent(activity, StatisticsActivity.class));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.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.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -53,7 +52,6 @@ public class UserSelectActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
-            Log.i("gongpengming", message);
             progressDialog.dismiss();
             switch (msg.what) {
                 case WHAT_LOAD:
@@ -128,9 +126,6 @@ public class UserSelectActivity extends BaseActivity {
         for (int i = 0; i < adapter.getUsers().size(); i++) {
             if (adapter.getUsers().get(i).isClick()) list.add(adapter.getUsers().get(i));
         }
-        for (MeetUserEntity e : list) {
-            Log.i("gongpengming", e.getName() + e.getEmCode() + e.getImId());
-        }
         Intent intent = new Intent();
         intent.putExtra("data", list);
         setResult(0x11, intent);

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

@@ -3,6 +3,9 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -24,14 +27,20 @@ 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.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * Created by gongpm on 2016/7/14.
  */
 public class OutofficeFragment extends EasyFragment implements View.OnClickListener {
+    private static final int WHAT_LOAD = 0x11;
     private LatLng point;//位置
     private static int requestCode = 0x11;
     private int sigNum;//签到次数
@@ -61,6 +70,13 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private TextView do_trim;
 
     private OutofficeActivity ct;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = msg.getData().getString("result");
+            Log.i("gongpengming", message);
+        }
+    };
 
     @Override
     protected int inflateLayoutId() {
@@ -86,6 +102,7 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     }
 
     private void initview() {
+        loadLog();
         num_tv.setText("" + sigNum);
         String name = MyApplication.getInstance().mLoginUser.getNickName();
         name_img.setText(name.substring(0, 1));
@@ -107,6 +124,25 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
 
     }
 
+    //获取打卡记录 date:yyyy-MM-dd
+    private void loadLog() {
+        ct.progressDialog.show();
+        //获取网络数据
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/common/list.action";
+        String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        final Map<String, Object> param = new HashMap<>();
+        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
+        param.put("page", 1);
+        param.put("pageSize", 1000);
+        param.put("condition", "cl_emcode='" + emcode + "' and to_char(cl_time,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("caller", "mobile_outsign");
+        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        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, WHAT_LOAD, null, null, "get");
+    }
+
     private AsyncTask<Void, Void, Void> timeTask = new AsyncTask() {
         @Override
         protected Object doInBackground(Object[] objects) {

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

@@ -27,7 +27,6 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.Signin;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
-import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
@@ -36,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.FormatUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -43,6 +43,7 @@ import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -78,7 +79,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     @ViewInject(R.id.office_addr)
     private TextView office_addr;//考勤地点
     @ViewInject(R.id.unoffice_mm)
-    private TextView unoffice_mm;//区里考勤地点
+    private TextView unoffice_mm;//地点微调
     //初始化
     private String sessionId = null;
     private String baseUrl = null;
@@ -99,7 +100,8 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                     if (JSON.parseObject(message).getBoolean("success")) {//返回正确
                         signinSeccess(message);
                     } else {
-
+                        //如果返回失败
+                        ToastUtil.showToast(ct, "网络连接失败，请稍后再试");
                     }
                     break;
                 case WHATLOG://获取打卡
@@ -109,20 +111,30 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                     if (JSON.parseObject(message).getBoolean("success")) {//返回正确
                         ToastUtil.showToast(ct, "签到成功");
                         setSigninAble(false);
-                        //TODO 将时间保存到数据库中
-                        Signin signin = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-                        if (signin == null) return;
-                        if (signin.getUsigmin() == null) {
-                            signin.setUsigmin(TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
-                            Log.i("gongpengming", "signin.getUsigmin() == null");
-                        } else {
-                            Log.i("gongpengming", "signin.setDsigmin() == null");
-                            signin.setDsigmin(TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+                        //TODO 将数据提交到界面
+                        if (adapter == null || adapter.getBeans() == null) return;
+                        for (int i = 0; i < adapter.getBeans().size(); i++) {
+                            if (adapter.getBeans().get(i).signin == null || adapter.getBeans().get(i).signin.length() <= 2) {
+                                adapter.getBeans().get(i).signin = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+//                                adapter.getBeans().get(i).tag = -FormatUtil.getInsance().reckonHHMM(adapter.getBeans().get(i).signin, TimeUtils.f_long_2_str(System.currentTimeMillis()));
+                            }
                         }
-                        SigninDao.getInstance(ct).updata(signin);
+                        adapter.notifyDataSetChanged();
+                        //TODO 将时间保存到数据库中
+//                        Signin signin = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
+//                        if (signin == null) return;
+//                        if (signin.getUsigmin() == null) {
+//                            signin.setUsigmin(TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+//                            Log.i("gongpengming", "signin.getUsigmin() == null");
+//                        } else {
+//                            Log.i("gongpengming", "signin.setDsigmin() == null");
+//                            signin.setDsigmin(TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+//                        }
+//                        SigninDao.getInstance(ct).updata(signin);
                     }
                     break;
                 default:
+                    ToastUtil.showToast(ct, "网络连接失败，请稍后再试");
                     break;
             }
         }
@@ -177,14 +189,17 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         //TODO 1.考勤地点获取,并计算距离长度
         double b1 = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double b2 = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        unoffice_mm.setText(getDistance(b1, b2));
+//        unoffice_mm.setText(getDistance(b1, b2));
+        //TODO　２、获取网络数据
+        loadNetData(System.currentTimeMillis());//获取打卡班次信息
+
         //TODO 2.获取当天数据库数据
-        Signin dbBean = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        if (dbBean == null) {//当获取数据库为空（表示当天没有打过卡）
-            loadNetData(System.currentTimeMillis());//获取打卡班次信息
-        } else {//已经签过了可以不获取签到时间
-            loadByDB(dbBean);
-        }
+//        Signin dbBean = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
+//        if (dbBean == null) {//当获取数据库为空（表示当天没有打过卡）
+//            loadNetData(System.currentTimeMillis());//获取打卡班次信息
+//        } else {//已经签过了可以不获取签到时间
+//            loadByDB(dbBean);
+//        }
     }
 
 
@@ -200,7 +215,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         back.setOnClickListener(this);
         signin_btn.setOnClickListener(this);
         title.setOnClickListener(this);
-        findViewById(R.id.oa_range_addr_rl).setOnClickListener(this);
+//        findViewById(R.id.oa_range_addr_rl).setOnClickListener(this);
     }
 
     private AsyncTask<Void, String, Void> task = new AsyncTask<Void, String, Void>() {
@@ -226,12 +241,20 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         }
     };
 
-    private void seccess() {
+    private void seccess(boolean is) {
         if (oa_range_addr_rl.getVisibility() == View.GONE) {
-            oa_range_addr_rl.setVisibility(View.VISIBLE);
+            if (is)
+                oa_range_addr_rl.setVisibility(View.VISIBLE);
+        } else {
+            if (!is)
+                oa_range_addr_rl.setVisibility(View.GONE);
         }
         if (signin_btn.getVisibility() == View.GONE) {
-            signin_btn.setVisibility(View.VISIBLE);
+            if (is)
+                signin_btn.setVisibility(View.VISIBLE);
+        } else {
+            if (!is)
+                signin_btn.setVisibility(View.GONE);
         }
     }
 
@@ -248,25 +271,30 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             return;//签到时间没有数据  无法使用
         }
         if (beans.size() <= logsJson.size()) setSigninAble(false);//当天签到次数已经达到要求
-        for (int i = 0; i < Math.min(beans.size(), logsJson.size()); i++) {
-            beans.get(i).signin = FormatUtil.getInsance().clearDay(logsJson.getJSONObject(i).getString("cl_time"));
-            beans.get(i).tag = FormatUtil.getInsance().reckonHHMM(beans.get(i).time, logsJson.getJSONObject(i).getString("cl_time"));
-            if (beans.get(i).type == 1 || beans.get(i).type == 0) {//上班
-                beans.get(i).tag = -beans.get(i).tag;
-            }
+        String[] time = new String[logsJson.size()];
+        for (int i = 0; i < logsJson.size(); i++) {
+            time[i] = FormatUtil.getInsance().clearDay(logsJson.getJSONObject(i).getString("cl_time")).trim();
+        }
+        Arrays.sort(time);
+        for (int i = 0; i < Math.min(beans.size(), time.length); i++) {
+            beans.get(i).signin = time[i];
+//            beans.get(i).tag = FormatUtil.getInsance().reckonHHMM(beans.get(i).time, logsJson.getJSONObject(i).getString("cl_time"));
+//            if (beans.get(i).type == 1 || beans.get(i).type == 0) {//上班
+//                beans.get(i).tag = -beans.get(i).tag;
+//            }
         }
         adapter.setBeens(beans);
-        seccess();
+        seccess(true);
         //TODO 保存成功后更新数据库
-        Signin signin = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        if (signin == null) return;
-        Log.i("gongpengming", "数据库有数据");
-        if (logsJson.size() > 0) {
-            signin.setUsigmin(logsJson.getJSONObject(0).getString("cl_time"));
-            if (logsJson.size() > 1)
-                signin.setDsigmin(logsJson.getJSONObject(1).getString("cl_time"));
-        }
-        SigninDao.getInstance(ct).updata(signin);
+//        Signin signin = SigninDao.getInstance(ct).query(code, TimeUtils.s_long_2_str(System.currentTimeMillis()));
+//        if (signin == null) return;
+//        Log.i("gongpengming", "数据库有数据");
+//        if (logsJson.size() > 0) {
+//            signin.setUsigmin(logsJson.getJSONObject(0).getString("cl_time"));
+//            if (logsJson.size() > 1)
+//                signin.setDsigmin(logsJson.getJSONObject(1).getString("cl_time"));
+//        }
+//        SigninDao.getInstance(ct).updata(signin);
     }
 
     private ArrayList<Bean> getBeanByAdapter() {
@@ -287,7 +315,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             chche.time = dbBean.getUtime();
             if (dbBean.getUsigmin() != null) {
                 chche.signin = dbBean.getUsigmin();
-                chche.tag = FormatUtil.getInsance().reckonHHMM(dbBean.getUtime(), TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + dbBean.getUsigmin() + ":00");
                 chche.tag = -chche.tag;
             }
             setSigninAble(true);
@@ -299,7 +326,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             chche.time = dbBean.getDtime();
             if (dbBean.getDsigmin() != null) {
                 chche.signin = dbBean.getDsigmin();
-                chche.tag = FormatUtil.getInsance().reckonHHMM(dbBean.getUtime(), TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + dbBean.getDsigmin() + ":00");
                 chche.tag = -chche.tag;
 
             }
@@ -310,7 +336,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             adapter.setBeens(beans);
         else
             loadNetData(System.currentTimeMillis());
-        seccess();
+        seccess(true);
     }
 
     private void signinSeccess(String message) {
@@ -327,16 +353,18 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         beans.add(chche);
         adapter.setBeens(beans);
         loadLog(TimeUtils.s_long_2_str(selectTime));//获取打卡时间
-        seccess();
+        seccess(true);
+
+
         //TODO 更新完界面后将数据保存到数据库中,只有当数据库没有的时候才会请求网络
-        String u = JSON.parseObject(message).getString("ondutytime") == null ? "08:30" : JSON.parseObject(message).getString("ondutytime");
-        String d = JSON.parseObject(message).getString("offdutytime") == null ? "18:00" : JSON.parseObject(message).getString("offdutytime");
-        Signin signin = new Signin();
-        signin.setCode(code);
-        signin.setDate(TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        signin.setUtime(u);
-        signin.setDtime(d);
-        SigninDao.getInstance(ct).insert(signin);
+//        String u = JSON.parseObject(message).getString("ondutytime") == null ? "08:30" : JSON.parseObject(message).getString("ondutytime");
+//        String d = JSON.parseObject(message).getString("offdutytime") == null ? "18:00" : JSON.parseObject(message).getString("offdutytime");
+//        Signin signin = new Signin();
+//        signin.setCode(code);
+//        signin.setDate(TimeUtils.s_long_2_str(System.currentTimeMillis()));
+//        signin.setUtime(u);
+//        signin.setDtime(d);
+//        SigninDao.getInstance(ct).insert(signin);
     }
 
     //当位置信息长度超过8个字符，就会报错
@@ -528,7 +556,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         }
 
         //临时变量
-        Bean bean = null;
 
         @Override
         public View getView(int i, View view, ViewGroup viewGroup) {
@@ -545,11 +572,21 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             } else {
                 holder = (Holder) view.getTag();
             }
-            bean = beans.get(i);
+            chche = beans.get(i);
             String textTimeTag = "";
             String textSigninTag = "";
+            if (!StringUtils.isEmpty(chche.time) && !StringUtils.isEmpty(chche.signin)) {
+                //如果上班 当tag》0说明正常 反之迟到   如果下班 tag》0 说明早退 反之正常
+                chche.tag = FormatUtil.getInsance().reckonByhm(chche.time, chche.signin);//前面减去后面
+                Log.i("gongpengming", "chche.tag=" + chche.tag);
+                if ((chche.type == 1 && chche.tag > 0) || (chche.type == 2 && chche.tag < 0))
+                    holder.tag.setVisibility(View.GONE);
+                else
+                    holder.tag.setVisibility(View.VISIBLE);
+            } else
+                holder.tag.setVisibility(View.GONE);
             String textTag = "";
-            if (bean.type == 1) {
+            if (chche.type == 1) {
                 textTimeTag = "上班时间";
                 textSigninTag = "上班签到时间";
                 textTag = "迟到";
@@ -560,14 +597,9 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             }
             holder.time_tag.setText(textTimeTag);
             holder.signin_tag.setText(textSigninTag);
-            holder.time.setText(bean.time);
-            holder.signin.setText(bean.signin);
+            holder.time.setText(chche.time);
+            holder.signin.setText(chche.signin);
             holder.tag.setText(textTag);
-            if (bean.tag < 0) {
-                holder.tag.setVisibility(View.VISIBLE);
-            } else {
-                holder.tag.setVisibility(View.GONE);
-            }
             return view;
         }
 

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

@@ -28,13 +28,19 @@ public class FormatUtil {
         return TimeUtils.long2str(TimeUtils.f_str_2_long(date), "HH:mm");
     }
 
-
-    //比较两个时间相差的毫秒数
-    public long reckonHHMM(String d1, String d2) {
+    //比较两个差
+    public long reckonByhm(String d1, String d2) {
         String t1 = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + d1 + ":" + "00";
-        return TimeUtils.f_str_2_long(d2) - TimeUtils.f_str_2_long(t1);
+        String t2 = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + d2 + ":" + "00";
+        return TimeUtils.f_str_2_long(t1) - TimeUtils.f_str_2_long(t2);
     }
 
+    //比较两个时间相差的毫秒数
+//    public long reckonHHMM(String d1, String d2) {
+//        String t1 = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + d1 + ":" + "00";
+//        return TimeUtils.f_str_2_long(d2) - TimeUtils.f_str_2_long(t1);
+//    }
+
     //提醒相关
     //获取下一次提醒时间
     private String name = "alar";

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

@@ -45,11 +45,9 @@
                     android:clickable="true"
                     android:gravity="center"
                     android:orientation="vertical">
-
                     <Button
                         style="@style/oa_btn_style"
                         android:background="@drawable/text_button_stye" />
-
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -58,7 +56,6 @@
                         android:text="打卡签到"
                         android:textColor="@color/white" />
                 </LinearLayout>
-
                 <LinearLayout
                     android:id="@+id/ll_outside"
                     android:layout_width="0dp"
@@ -127,7 +124,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:id="@+id/ll_subject"
+                    android:id="@+id/attendance_ll"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -137,16 +134,17 @@
 
                     <Button
                         style="@style/oa_btn_style"
-                        android:background="@drawable/text_button_stye4" />
+
+                        android:background="@drawable/text_button_stye" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-
                         android:layout_marginTop="2dp"
-                        android:text="我的行程"
+                        android:text="考勤单据"
                         android:textColor="@color/white" />
                 </LinearLayout>
+
             </LinearLayout>
 
             <View
@@ -159,7 +157,7 @@
                 android:orientation="horizontal">
 
                 <LinearLayout
-                    android:id="@+id/attendance_ll"
+                    android:id="@+id/ll_subject"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -169,17 +167,18 @@
 
                     <Button
                         style="@style/oa_btn_style"
-
-                        android:background="@drawable/text_button_stye" />
+                        android:background="@drawable/text_button_stye4" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+
                         android:layout_marginTop="2dp"
-                        android:text="考勤单据"
+                        android:text="我的行程"
                         android:textColor="@color/white" />
                 </LinearLayout>
 
+
                 <LinearLayout
                     android:id="@+id/borrowing_ll"
                     android:layout_width="0dp"
@@ -289,9 +288,9 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:textCursorDrawable="@color/yellow_home"
                 android:gravity="center"
                 android:text="我的工作日志"
+                android:textCursorDrawable="@color/yellow_home"
                 android:textSize="20dp" />
         </LinearLayout>
 

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

@@ -84,24 +84,25 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/addr_rl"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/oa_signin_tv_bg"
+            android:layout_marginTop="100dp"
             android:clickable="true"
             android:orientation="vertical"
-            android:padding="5dp"
-            android:visibility="gone">
+            android:padding="5dp">
 
             <TextView
                 android:id="@+id/office_addr"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/oa_signin"
                 android:text="考勤地点：深圳市优软科技有限公司" />
 
             <TextView
                 android:id="@+id/unoffice_mm"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="距离考勤地点：" />
+                android:layout_gravity="center"
+                android:text="地点微调"
+                android:textColor="@color/cadetblue" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>