合并代码

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

@@ -196,7 +196,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 showPopupWindow(getWindow().findViewById(R.id.add_item));
             } else {
                 Intent intent = null;
-                if (CommonUtil.isReleaseVersion())
+                if (CommonUtil.isReleaseVersion()||isB2b)
                     intent = new Intent(ct, VisitReportAddActivity.class);
                 else intent = new Intent(ct, AddVisitReportActivity.class);
                 startActivityForResult(intent, 0x20);
@@ -318,7 +318,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() ? VisitReportAddActivity.class : AddVisitReportActivity.class);
+                    intent = new Intent(ct, CommonUtil.isReleaseVersion()||isB2b ? VisitReportAddActivity.class : AddVisitReportActivity.class);
                     intent.putExtra("type", 2);
                     String chche = object.containsKey("status") ? object.getString("status") == null ? "" : object.getString("status") : "";
                     boolean me = (isMe && !"已拜访".equals(chche) && !"".equals(chche));
@@ -328,7 +328,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() ? VisitReportAddActivity.class : AddVisitReportActivity.class);
+                        intent = new Intent(ct, CommonUtil.isReleaseVersion()||isB2b ? VisitReportAddActivity.class : AddVisitReportActivity.class);
                         intent.putExtra("type", 3);
                         intent.putExtra("isOutplan", true);
                         intent.putExtra("isMe", isMe);//可以提交拜访报告

WeiChat/src/main/res/values-en/strings.xml

@@ -1110,10 +1110,6 @@
     <string name="Rated_next">Next time</string>
     <string name="fangkui_success">Submitted success, we will be the first time to view your question, thank you for your cooperation!</string>
     <string name="Uploaded_successfully">Uploaded successfully</string>
-    <string name="language_sys">跟随系统</string>
-    <string name="language_rCN">简体中文</string>
-    <string name="language_rTW">繁体中文</string>
-    <string name="language_en">英文</string>
     <string name="create_date">创建日期</string>
     <string name="select_contact">选择联系人</string>
     <string name="delete_business_ok">删除商机成功</string>