提交代码保存

1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

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

@@ -55,6 +55,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAHttpUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
@@ -192,9 +193,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         } else if (item.getItemId() == R.id.add_item) {
             if (isCrm) {//从客户
                 Intent intent = null;
-                //TODO 发布版本使用旧款的拜访报告
-                intent = new Intent(ct, VisitReportAddActivity.class);
-//              intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
 
                 startActivityForResult(intent, 0x20);
             } else
@@ -317,9 +316,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     }
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (e.isVisitRecord()) {
-                    //TODO 发布版本使用旧款的拜访报告
-                    intent = new Intent(ct, VisitReportAddActivity.class);
-//                    intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                    intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
                     intent.putExtra("type", 2);
                     String chche = object.containsKey("status") ? object.getString("status") == null ? "" : object.getString("status") : "";
                     boolean me = (isMe && !"已拜访".equals(chche) && !"".equals(chche));
@@ -329,9 +326,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (e.isMission()) {
                     if (util.isMissionOk(e)) {//外勤计划
-                        //TODO 发布版本使用旧款的拜访报告
-                        intent = new Intent(ct, VisitReportAddActivity.class);
-//                      intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                        intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
                         intent.putExtra("type", 3);
                         intent.putExtra("isOutplan", true);
                         intent.putExtra("isMe", isMe);//可以提交拜访报告
@@ -750,9 +745,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                             intent.putExtra("type", 1);
                             break;
                         case 2:
-                            //TODO 发布版本使用旧款的拜访报告
-                            intent = new Intent(ct, VisitReportAddActivity.class);
-//                          intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                            intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
                             break;
                         default:
                             String caller = (String) menusMap.get(position).get("item_caller");
@@ -761,9 +754,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                             intent = new Intent(ct, DataFormDetailActivity.class)
                                     .putExtra("caller", caller)
                                     .putExtra("title", name);
-
                             break;
-
                     }
                     if (intent != null)
                         startActivityForResult(intent, 0x20);

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

@@ -337,7 +337,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
                     public void result(SearchResult result) {
                         if (result instanceof PoiResult) {
                             List<PoiInfo> pois = ((PoiResult) result).getAllPoi();
-                            if (ListUtils.isEmpty(pois)) return;
+                            if (ListUtils.isEmpty(pois) || companyLocation == null) return;
                             for (int i = 0; i < pois.size(); i++) {
                                 double dis = BaiduMapUtil.getInstence().distance(compayLng, pois.get(i).location);
                                 if (companyLocation.getValidrange() < dis) {
@@ -375,11 +375,11 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         //获取当前最近的位置信息
         if (!ListUtils.isEmpty(locationList)) {
             float dis = 0;
-            boolean first=true;
+            boolean first = true;
             for (WorkLocationModel location : locationList) {
-                float distance=BaiduMapUtil.getInstence().autoDistance(location.getLocation());
-                if (first||dis > distance) {
-                    dis =distance;
+                float distance = BaiduMapUtil.getInstence().autoDistance(location.getLocation());
+                if (first || dis > distance) {
+                    dis = distance;
                     companyLocation = location;
                 }
             }

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

@@ -26,6 +26,6 @@ public class OAConfig {
 
     /*是否显示Crm2.0功能*/
     public static boolean canShowCrm2_0() {
-        return true;
+        return false;
     }
 }