关闭打开自动打卡提交

修改拜访报告联系人

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

@@ -40,19 +40,12 @@ public class OABean implements Parcelable {
     private String vp_custcode;//联系人编号
     private String nichestep;//沟通阶段
     private String vp_contact;//联系人
+    private String vp_cucontact;//联系人
 
 
     public OABean() {
     }
 
-    public String getVp_contact() {
-        return vp_contact;
-    }
-
-    public void setVp_contact(String vp_contact) {
-        this.vp_contact = vp_contact;
-    }
-
     public int getType() {
         return type;
     }
@@ -261,6 +254,22 @@ public class OABean implements Parcelable {
         this.nichestep = nichestep;
     }
 
+    public String getVp_contact() {
+        return vp_contact;
+    }
+
+    public void setVp_contact(String vp_contact) {
+        this.vp_contact = vp_contact;
+    }
+
+    public String getVp_cucontact() {
+        return vp_cucontact;
+    }
+
+    public void setVp_cucontact(String vp_cucontact) {
+        this.vp_cucontact = vp_cucontact;
+    }
+
     protected OABean(Parcel in) {
         type = in.readInt();
         startdate = in.readString();
@@ -289,6 +298,7 @@ public class OABean implements Parcelable {
         vp_custcode = in.readString();
         nichestep = in.readString();
         vp_contact = in.readString();
+        vp_cucontact = in.readString();
     }
 
     @Override
@@ -320,6 +330,7 @@ public class OABean implements Parcelable {
         dest.writeString(vp_custcode);
         dest.writeString(nichestep);
         dest.writeString(vp_contact);
+        dest.writeString(vp_cucontact);
     }
 
     @Override

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

@@ -128,7 +128,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_date_start.setText(bean.getStartdate() == null ? "未填写" : bean.getStartdate());
             tv_date_end.setText(bean.getEnddate() == null ? "未填写" : bean.getEnddate());
             tv_customer_login.setText(bean.getClient() == null ? "未填写" : bean.getClient());
-            tv_linksman_login.setText(bean.getVp_contact() == null ? "未填写" : bean.getVp_contact());
+            tv_linksman_login.setText(StringUtils.isEmpty(bean.getVp_contact()) ? (StringUtils.isEmpty(bean.getVp_cucontact()) ? "未填写" : bean.getVp_cucontact()) : bean.getVp_contact());
             tv_address_login.setText(bean.getAddress() == null ? "未填写" : bean.getAddress());
             tv_visit_theme.setText(bean.getRemark() == null ? "未填写" : bean.getRemark());
             tv_visit_steps.setText(bean.getNichestep() == null ? "" : bean.getNichestep());

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

@@ -37,7 +37,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
 
     private boolean isAlarm;//判断是否为提醒
     private boolean isAuto;//判断是否为自动
-
     private AlarmManage manage;
 
     @Override

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

@@ -126,6 +126,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                         CommonUtil.setSharedPreferences(ct, "companyX", (float) companyX);
                         CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
+                        CommonUtil.setSharedPreferences(ct, "distance",  companyDistance);
                         unoffice_mm.setText(setDistance());
                     }
                     if (jsonObject.getBoolean("success")) {

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

@@ -108,31 +108,45 @@ public class AlarmReceiver extends BroadcastReceiver {
         form.put("cl_phone", MyApplication.getInstance().mLoginUser.getTelephone());
         form.put("cl_emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         form.put("cl_emname", MyApplication.getInstance().mLoginUser.getNickName());
+        boolean isp = isPlay(ct, form);
+        if (!isp) return;//不符合打卡
+        String formStore = StringUtils.mapToJson(form);
+        param.put("caller", "CardLog");
+        param.put("formStore", formStore);
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/saveCardLog.action";
+        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "get");
+    }
+
+    private boolean isPlay(Context ct, Map<String, Object> form) {
         try {
+            //判断是否符合打卡
             BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
             form.put("cl_address", helper.getAddress());
             form.put("cl_location", helper.getName());
             double companyX = CommonUtil.getSharedPreferencesfloat(ct, "companyX", 0);
             double companyY = CommonUtil.getSharedPreferencesfloat(ct, "companyY", 0);
+            int comDistance = CommonUtil.getSharedPreferencesInt(ct, "distance", 0);
             double latitude = helper.getLatitude();
             double longitude = helper.getLongitude();
             String distance = BaiduMapUtil.getInstence().getDistance(companyX, companyY, latitude, longitude);
-            form.put("cl_distance", distance);
+            if (comDistance < Float.valueOf(distance)) {//规定地址<实际地址  不符合
+                helper.requestLocation();//当不符合时候提交定位，并不执行打卡签到
+                return false;
+            } else {
+                form.put("cl_distance", distance);
+                return true;
+            }
         } catch (NullPointerException e) {
-
+            return false;
         } catch (SQLException e) {
-
+            return false;
         }
-        String formStore = StringUtils.mapToJson(form);
-        param.put("caller", "CardLog");
-        param.put("formStore", formStore);
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/saveCardLog.action";
-        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "get");
     }
 
+
     //获取打卡记录 date:yyyy-MM-dd
     private void loadLog() {
         String date = TimeUtils.s_long_2_str(System.currentTimeMillis());

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/StringJsonObjectRequest.java

@@ -184,7 +184,6 @@ public class StringJsonObjectRequest<T> extends Request<String> {
 				String data = jsonObject.getString(Result.DATA);
 				if (!TextUtils.isEmpty(data)) {
 					if (mClazz.equals(String.class) || mClazz.getSuperclass().equals(Number.class)) {// String
-																										// 类型或者基本数据类型（Integer）
 						result.setData(castValue(mClazz, data));
 					} else {
 						result.setData(JSON.parseObject(data, mClazz));

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

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
+        android:visibility="gone"
         android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">