修改测试提的关于独立版本不兼容bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -41,7 +41,6 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CompanyContactsActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddContactsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatContactAddPeopleActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
@@ -53,7 +52,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
@@ -139,9 +137,10 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.search) {
             if (!isB2b) {
-                if (OAConfig.canShowCrm2_0())
-                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
-                else startActivity(new Intent(getActivity(), UserSearchActivity.class));
+//                if (OAConfig.canShowCrm2_0())
+//                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
+//                else
+                    startActivity(new Intent(getActivity(), UserSearchActivity.class));
             } else {
                 showPopupWindow();
             }

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

@@ -16,7 +16,6 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
@@ -164,7 +163,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         mVrId = OACheckUtil.getJsonIntager(object, "id");
         vr_code = OACheckUtil.getJson2Text(object, "vr_code");
         if (StringUtils.isEmpty(vr_status)) {
-            status = 0;
+            status = isB2b ? 2 : 0;
         } else if ("在录入".equals(vr_status)) {
             status = 1;
         } else if ("已提交".equals(vr_status)) {
@@ -194,6 +193,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             save_btn.setText(R.string.common_save_button);
             delete_btn.setVisibility(View.GONE);
             delete_btn.setOnClickListener(null);
+            if (status ==2)save_btn.setVisibility(View.GONE);
         } else
             switch (status) {
                 case 0:
@@ -252,7 +252,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_visit_content.setFocusableInTouchMode(true);
             tv_address_login.setFocusableInTouchMode(true);
             tv_linksman_login.setFocusableInTouchMode(true);
-            LogUtil.i("status=" + status);
             tv_relate_business.setKeyListener(null);
             tv_relate_business.setOnClickListener(this);
             tv_visit_type.setOnClickListener(this);
@@ -292,16 +291,16 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (getIntent().getBooleanExtra("isMe", true) && isB2b) {
-            getMenuInflater().inflate(R.menu.main_btn_submit, menu);
-            if (!getIntent().getBooleanExtra("isAgen", false)) {
-                menu.getItem(0).setTitle(getString(R.string.common_save_button));
-            }
-        }
-        return true;
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        if (getIntent().getBooleanExtra("isMe", true) && isB2b) {
+//            getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+//            if (!getIntent().getBooleanExtra("isAgen", false)) {
+//                menu.getItem(0).setTitle(getString(R.string.common_save_button));
+//            }
+//        }
+//        return true;
+//    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -444,7 +443,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             Crouton.makeText(ct, R.string.not_time_start_biger_end);
             return false;
         }
-        if (TextUtils.isEmpty(phone_tv.getText()) || !com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone_tv.getText().toString())) {
+        if (!isB2b && (TextUtils.isEmpty(phone_tv.getText())
+                || !com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone_tv.getText().toString()))) {
             ToastUtil.showToast(ct, R.string.phone_number_format_error);
             return false;
         }

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

@@ -32,6 +32,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,6 +50,7 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     private RecycleAdapter adapter;
     private boolean isRemark = false;
     private String contact;
+    private boolean isB2b;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -144,6 +147,7 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     }
 
     private void initData() {
+        isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         isRemark = getIntent() == null || !getIntent().getBooleanExtra("isContact", false);
         String title = getIntent() == null ? "" : getIntent().getStringExtra("title");
         if (!StringUtils.isEmpty(title)) getSupportActionBar().setTitle(title);
@@ -174,6 +178,10 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     }
 
     private void loadBusinessRemark() {
+        if (isB2b) {
+            handlerData(null);
+            return;
+        }
         progressDialog.show();
         Map<String, Object> param = new HashMap<>();
         param.put("condition", "1=1");
@@ -186,6 +194,10 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     }
 
     private void loadContact(String cuName) {
+        if (isB2b) {
+            handlerData(null);
+            return;
+        }
         progressDialog.show();
         String url = "mobile/crm/getContactPerson.action";
         Map<String, Object> param = new HashMap<>();