Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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/BusinessDetailInfoActivity.java

@@ -310,7 +310,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
                 headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
                 ViewUtil.httpSendRequest(ct, url, stringMap, mHandler, headers, CAN_QIANG_NOT, null, null, "post");
-
                 break;
             case R.id.bt_fenpei:
                 startActivityForResult(new Intent(ct, DbfindList2Activity.class), 1);

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

@@ -362,6 +362,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     "\"custname\":\"" +
                     tv_customer.getText().toString() +//联系人
                     "\",\n" +
+//                    "\",\n" +
+//                    "\"type\":\"" + 1 +//是否需要待确认
                     "\"timealert\":\"" +
                     tv_notice.getText().toString() +//提醒
                     "\",\n" +

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)) {
@@ -190,28 +189,34 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
     private void initStatus(int status) {
         this.status = status;
-        switch (status) {
-            case 0:
-                save_btn.setText(R.string.common_submit_button);
-                delete_btn.setVisibility(View.GONE);
-                delete_btn.setOnClickListener(null);
-                break;
-            case 1:
-                save_btn.setText(R.string.common_update_button);
-                delete_btn.setVisibility(View.VISIBLE);
-                delete_btn.setOnClickListener(this);
-                break;
-            case 2:
-                save_btn.setText(R.string.unsubmit);
-                delete_btn.setVisibility(View.GONE);
-                delete_btn.setOnClickListener(null);
-                break;
-            case 3:
-                save_btn.setVisibility(View.GONE);
-                delete_btn.setVisibility(View.GONE);
-                delete_btn.setOnClickListener(null);
-                break;
-        }
+        if (isB2b) {
+            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:
+                    save_btn.setText(R.string.common_save_button);
+                    delete_btn.setVisibility(View.GONE);
+                    delete_btn.setOnClickListener(null);
+                    break;
+                case 1:
+                    save_btn.setText(R.string.common_update_button);
+                    delete_btn.setVisibility(View.VISIBLE);
+                    delete_btn.setOnClickListener(this);
+                    break;
+                case 2:
+                    save_btn.setText(R.string.unsubmit);
+                    delete_btn.setVisibility(View.GONE);
+                    delete_btn.setOnClickListener(null);
+                    break;
+                case 3:
+                    save_btn.setVisibility(View.GONE);
+                    delete_btn.setVisibility(View.GONE);
+                    delete_btn.setOnClickListener(null);
+                    break;
+            }
     }
 
     /**
@@ -247,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);
@@ -287,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) {
@@ -439,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;
         }
@@ -540,7 +545,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
                 break;
             case R.id.voice_search_iv:
-                RecognizerDialogUtil.showRecognizerDialog(ct,this);
+                RecognizerDialogUtil.showRecognizerDialog(ct, this);
                 break;
             case R.id.save_btn:
                 if (save_btn.getText().toString().trim().equals(getString(R.string.unsubmit)))

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

@@ -92,7 +92,12 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
             String cuaddress = OACheckUtil.getJson2Text(object, "address", "vr_cuaddress", "mpd_address");//客户地址
             String remark = OACheckUtil.getJson2Text(object, "vr_title", "mpd_remark");//拜访目的,主题
             String cucontact = OACheckUtil.getJson2Text(object, "vr_cucontact");//联系人
-            String context = OACheckUtil.getJson2Text(object, "vr_detail");//联系人
+            String context = OACheckUtil.getJson2Text(object, "vr_detail");//拜访内容
+            LogUtil.i("context="+context);
+            context=context.replaceAll("\\n","\n");
+            LogUtil.i("context="+context);
+            context=context.replaceAll("\\n","");
+            LogUtil.i("context="+context);
             String vr_recorddate = OACheckUtil.getJson2Text(object, "vr_recorddate", "mpd_actdate", "mpd_arrivedate");
             String nichestep = OACheckUtil.getJson2Text(object, "vr_nichestep");//商机阶段
             String cutype = OACheckUtil.getJson2Text(object, "vr_class");//拜访类型

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<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -306,7 +306,7 @@ public class ViewUtil {
                     Bundle bundle = new Bundle();
                     Message message = new Message();
                     bundle.putString("result", "{\n" +
-                            "\"exception\":\""+MyApplication.getInstance().getString(R.string.common_notlinknet)+"！\"\n" +
+                            "\"exception\":\"" + MyApplication.getInstance().getString(R.string.common_notlinknet) + "！\"\n" +
                             "}");
                     message.setData(bundle);
                     message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
@@ -328,7 +328,10 @@ public class ViewUtil {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                 if (isNetHas) {
                     String result = getDataFromServer(url, params, request);
-                    Log.i("result", "http:" + result);
+                    LogUtil.prinlnLongMsg("result", "http 发送请求-----------------------------------------");
+                    LogUtil.prinlnLongMsg("result", "url：" + url);
+                    LogUtil.prinlnLongMsg("resultParams", "parms：" + params.toString());
+                    LogUtil.prinlnLongMsg("result", "http:" + result);
                     if (result != null) {
                         if (bundle == null || message == null) {
                             Bundle bundle = new Bundle();
@@ -349,7 +352,7 @@ public class ViewUtil {
                 } else {
                     Bundle bundle = new Bundle();
                     Message message = new Message();
-                    bundle.putString("result", "{\"exception\":\""+MyApplication.getInstance().getString(R.string.common_notlinknet)+"\"}");
+                    bundle.putString("result", "{\"exception\":\"" + MyApplication.getInstance().getString(R.string.common_notlinknet) + "\"}");
                     message.setData(bundle);
                     message.what = what;
                     handler.sendMessage(message);
@@ -375,7 +378,7 @@ public class ViewUtil {
         if (!(ct instanceof LoginActivity)) {
             if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "loginJson"))) {
                 showDialogCompany(CommonUtil.getSharedPreferences(ct, "loginJson"), user_phone, user_password);
-            } 
+            }
         } else {
             //登录界面过来，不走缓存
             String url = Constants.BASE_URL_LOGIN;
@@ -999,7 +1002,7 @@ public class ViewUtil {
                     Bundle bundle = new Bundle();
                     Message message = new Message();
                     bundle.putString("result", "{\n" +
-                            "\"exception\":\""+MyApplication.getInstance().getString(R.string.common_notlinknet)+"\"\n" +
+                            "\"exception\":\"" + MyApplication.getInstance().getString(R.string.common_notlinknet) + "\"\n" +
                             "}");
                     message.setData(bundle);
                     message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;

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

@@ -58,8 +58,9 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
         if (new JsonValidator().validate(model.getObject())) {
             JSONObject object = JSON.parseObject(model.getObject());
             client.code = OACheckUtil.getJson2Text(object, "CU_CODE");
+            client.cuRealName = OACheckUtil.getJson2Text(object, "CU_NAME");
             if (StringUtils.isEmpty(model.getName()))
-                client.name = OACheckUtil.getJson2Text(object, "CU_NAME");
+                client.name = client.cuRealName;
             client.contact = OACheckUtil.getJson2Text(object, "CU_CONTACT");
             if (StringUtils.isEmpty(model.getAddress()))
                 client.address = OACheckUtil.getJson2Text(object, "CU_ADD1");
@@ -92,9 +93,15 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
     }
 
     public String getCuName() {
-        if (client == null) return "";
-        if (StringUtils.isEmpty(client.name)) return "";
-        return client.name;
+        String name = "";
+        if (client != null) {
+            if (!StringUtils.isEmpty(client.cuRealName)) {
+                name = client.cuRealName;
+            } else {
+                name = StringUtils.isEmpty(client.name) ? "" : client.name;
+            }
+        }
+        return name;
     }
 
     public String getContact() {
@@ -356,6 +363,7 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
 
     private class Client {
         public String code;
+        public String cuRealName;
         public String name;
         public String contact;
         public String address;

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

@@ -31,7 +31,7 @@ public class OACheckUtil {
             try {
                 if (!StringUtils.isEmpty(object.getString(key)) && object.getString(key).equals("(null)"))
                     return "";
-                return String.valueOf(Html.fromHtml(object.getString(key)));
+                return replaceAll(Html.fromHtml(object.getString(key)).toString());
             } catch (Exception e) {
                 return object.getString(key);
             }
@@ -39,6 +39,25 @@ public class OACheckUtil {
         return "";
     }
 
+    private static String replaceAll(String message) {
+        boolean isfist = false;
+        StringBuilder sp = new StringBuilder();
+        if (message != null && message.length() > 0)
+            for (int i = 0; i < message.length(); i++) {
+                char c = message.charAt(i);
+                sp.append(c);
+                if ('\\' == c) {
+                    isfist = true;
+                }
+                if ('n' == c && isfist && sp.length() > 2) {
+                    sp.deleteCharAt(sp.length() - 1);
+                    sp.deleteCharAt(sp.length() - 1);
+                    sp.append('\n');
+                }
+            }
+        return sp.toString();
+    }
+
     /**
      * 通过json数据获取double
      *

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

@@ -89,7 +89,7 @@ public class StringUtils {
     public static boolean isInclude(String text, String str) {
         if (StringUtils.isEmpty(str))
             return true;
-        if (StringUtils.isEmpty(text))return false;
+        if (StringUtils.isEmpty(text)) return false;
         try {
             Pattern p = Pattern.compile(str);
             Matcher m = p.matcher(text);
@@ -338,7 +338,7 @@ public class StringUtils {
             for (Map.Entry<String, Object> e : m.entrySet()) {
                 builder.append("\"" + e.getKey() + "\":");
                 if (e.getValue() instanceof String || e.getValue() instanceof CharSequence) {
-                    builder.append("\"" + e.getValue() + "\",\n");
+                    builder.append("\"" + string2Json((String) e.getValue()) + "\",\n");
                 } else {
                     builder.append(e.getValue() + ",\n");
                 }

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

@@ -5,6 +5,8 @@ import android.content.Intent;
 
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddVisitReportActivity;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 /**
  * 自动打卡变量集合
@@ -34,11 +36,13 @@ public class OAConfig {
     public static boolean canShowCrm2_0 = true;
 
     public static boolean canShowCrm2_0() {
-        return true;
+        if (ApiUtils.getApiModel() instanceof ApiPlatform)
+            return false;
+        return canShowCrm2_0;
     }
 
     /*调转到拜访报告界面*/
     public static Intent getVisitClass(Context ct) {
-        return new Intent(ct, canShowCrm2_0 ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+        return new Intent(ct, canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
     }
 }