|
|
@@ -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,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
} else if (item.getItemId() == R.id.add_item) {
|
|
|
if (isCrm) {//从客户
|
|
|
Intent intent = null;
|
|
|
- if (CommonUtil.isReleaseVersion() || isB2b)
|
|
|
- intent = new Intent(ct, VisitReportAddActivity.class);
|
|
|
- else intent = new Intent(ct, AddVisitReportActivity.class);
|
|
|
+ if (OAConfig.canShowCrm2_0())
|
|
|
+ intent = new Intent(ct, AddVisitReportActivity.class);
|
|
|
+ else intent = new Intent(ct, VisitReportAddActivity.class);
|
|
|
startActivityForResult(intent, 0x20);
|
|
|
} else
|
|
|
showPopupWindow(getWindow().findViewById(R.id.add_item));
|
|
|
@@ -242,7 +243,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
if (StringUtils.isInclude(e.getHandler(), otherName))
|
|
|
filterModels.add(e);
|
|
|
}
|
|
|
- Set<Integer> filterTasks = util.getTaskList(curDate,filterModels);
|
|
|
+ Set<Integer> filterTasks = util.getTaskList(curDate, filterModels);
|
|
|
setDateToListener(filterTasks);
|
|
|
setAdapterBeans(filterModels);
|
|
|
}
|
|
|
@@ -315,7 +316,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
}
|
|
|
startActivityForResult(intent, isMe ? 0x20 : 0x21);
|
|
|
} else if (e.isVisitRecord()) {
|
|
|
- intent = new Intent(ct, CommonUtil.isReleaseVersion() || isB2b ? VisitReportAddActivity.class : AddVisitReportActivity.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));
|
|
|
@@ -325,7 +326,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
startActivityForResult(intent, isMe ? 0x20 : 0x21);
|
|
|
} else if (e.isMission()) {
|
|
|
if (util.isMissionOk(e)) {//外勤计划
|
|
|
- intent = new Intent(ct, CommonUtil.isReleaseVersion() || isB2b ? VisitReportAddActivity.class : AddVisitReportActivity.class);
|
|
|
+ intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
|
|
|
intent.putExtra("type", 3);
|
|
|
intent.putExtra("isOutplan", true);
|
|
|
intent.putExtra("isMe", isMe);//可以提交拜访报告
|
|
|
@@ -592,8 +593,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
}
|
|
|
|
|
|
private synchronized void handlerDataInThread(final JSONObject jsonObject, final String date) throws Exception {
|
|
|
- meModels = util.getModelByJSON(jsonObject, "me", true);
|
|
|
- otherModels = util.getModelByJSON(jsonObject, "other", false);
|
|
|
+ meModels = util.getModelByJSON(jsonObject, "me", isCrm, true);
|
|
|
+ otherModels = util.getModelByJSON(jsonObject, "other", isCrm, false);
|
|
|
meInt = util.getTaskList(curDate, meModels);
|
|
|
otherInt = util.getTaskList(curDate, otherModels);
|
|
|
OAHttpHelper.getInstance().post(new Runnable() {
|
|
|
@@ -744,10 +745,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
intent.putExtra("type", 1);
|
|
|
break;
|
|
|
case 2:
|
|
|
- //TODO 测试
|
|
|
- if (CommonUtil.isReleaseVersion() || isB2b)
|
|
|
- intent = new Intent(ct, VisitReportAddActivity.class);
|
|
|
- else intent = new Intent(ct, AddVisitReportActivity.class);
|
|
|
+ if (OAConfig.canShowCrm2_0())
|
|
|
+ intent = new Intent(ct, AddVisitReportActivity.class);
|
|
|
+ else intent = new Intent(ct, VisitReportAddActivity.class);
|
|
|
+
|
|
|
break;
|
|
|
default:
|
|
|
String caller = (String) menusMap.get(position).get("item_caller");
|