提交代码保存

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

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

@@ -42,7 +42,6 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddVisitReportActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -1095,10 +1094,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         case 3:
                             break;
                         case 2:
-                            if (CommonUtil.isReleaseVersion())
-                                startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
-                            else
-                                startActivity(new Intent(ClientActivity.this, AddVisitReportActivity.class));
+                            //TODO 发布版本使用旧款的拜访报告
+                            startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
+//                            if (OAConfig.canShowCrm2_0())
+//                                startActivity(new Intent(ClientActivity.this, AddVisitReportActivity.class));
+//                            else
+//                                startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
+
                             break;
                        /* case 4:
                             startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class).putExtra("type",1));

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

@@ -200,7 +200,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             et_cu_code.setText(cu_code);
             et_cu_code.setEnabled(false);
         } else {
-           // getCodeByNet();
+            // getCodeByNet();
         }
         loadParams(FORM_TYPE);//判断预录入
     }
@@ -213,8 +213,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             type = intent.getIntExtra("type", 0);
             cu_code = intent.getStringExtra("code");
             cu_status = intent.getStringExtra("status");
-            bc_code=intent.getStringExtra("bc_code");
-            
+            bc_code = intent.getStringExtra("bc_code");
+
             mCompanyName = intent.getStringExtra("companyname");
             mCompanyAddress = intent.getStringExtra("companyaddress");
             mContact = intent.getStringExtra("contact");
@@ -329,7 +329,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 //
 
                 formStore = "{\n" +
-                        " \"cu_nichecode\":" +bc_code + ",\n" +
+                        " \"cu_nichecode\":" + bc_code + ",\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_recordman\":\"" + emname + "\",\n" +
                         " \"cu_recorddate\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
@@ -751,54 +751,54 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     public void onPopupButtonClick(View button) {
-    
+
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putExtra("reid", R.style.OAThemeMeet);
-        List<SelectBean> beanList=new ArrayList<>();
-        
+        List<SelectBean> beanList = new ArrayList<>();
+
         //华东地区，华南地区，华北地区，华中地区，西南地区，西北地区，东北地区，港澳台地区，海外地区，其它地区
-        SelectBean ben=new SelectBean();
+        SelectBean ben = new SelectBean();
         ben.setName(getString(R.string.client_Huadong_Region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_Huanan_Region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_Huabei_Region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_Huazhong_Region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_Southwest_Region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_North_west_region));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_North_east_area));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_HongKong_Macao_and_Taiwan_regions));
         ben.setJson("{}");
         beanList.add(ben);
 
-        ben=new SelectBean();
+        ben = new SelectBean();
         ben.setName(getString(R.string.client_other_areas));
         ben.setJson("{}");
         beanList.add(ben);
@@ -806,7 +806,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("title", getString(R.string.client_payment_method));
         intent.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) beanList);
         startActivityForResult(intent, 0x27);
-        
+
 //        popup = new PopupMenu(this, button);
 //        switch (button.getId()) {
 //            case R.id.et_cu_kind:
@@ -925,14 +925,14 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("action", "mobile/common/getDbfind.action");
         intent.putExtra("title", getString(R.string.client_type));
         startActivityForResult(intent, 0x21);
-   
+
     }
 
     /**
      * 加载收款方式
      */
     public void loadPayments() {
- //       progressDialog.show();
+        //       progressDialog.show();
 //        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getDbfind.action";
 //        Map<String, Object> params = new HashMap<>();
 //        params.put("which", "form");
@@ -990,8 +990,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("showKey", "cr_name");
         intent.putExtra("action", "mobile/common/getDbfind.action");
         intent.putExtra("title", getString(R.string.client_payment_method));
-                startActivityForResult(intent, 0x23);
-   
+        startActivityForResult(intent, 0x23);
+
     }
 
     private void loadParams(int what) {
@@ -1012,13 +1012,13 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 SelectBean b = data.getParcelableExtra("data");
                 LogUtil.d(JSON.toJSONString(b));
                 if (b == null || StringUtils.isEmpty(b.getJson())) return;
-                switch (requestCode){
+                switch (requestCode) {
                     case 0x21:
-                       et_cu_kind.setText(b.getName());
+                        et_cu_kind.setText(b.getName());
                         break;
                     case 0x22:
                         et_cu_payments.setText(b.getName());
-                        pa_code =JSON.parseObject(b.getJson()).getString("pa_code");
+                        pa_code = JSON.parseObject(b.getJson()).getString("pa_code");
                         break;
                     case 0x23:
                         tv_cu_currency.setText(b.getName());
@@ -1052,7 +1052,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 break;
             case R.id.et_cu_district:
                 onPopupButtonClick(v);
-                
+
                 break;
             case R.id.tv_cu_nichestep:
                 loadJieDuan();

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

@@ -55,7 +55,6 @@ 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;
@@ -193,9 +192,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         } else if (item.getItemId() == R.id.add_item) {
             if (isCrm) {//从客户
                 Intent intent = null;
-                if (OAConfig.canShowCrm2_0())
-                    intent = new Intent(ct, AddVisitReportActivity.class);
-                else intent = new Intent(ct, VisitReportAddActivity.class);
+                //TODO 发布版本使用旧款的拜访报告
+                intent = new Intent(ct, VisitReportAddActivity.class);
+//              intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+
                 startActivityForResult(intent, 0x20);
             } else
                 showPopupWindow(getWindow().findViewById(R.id.add_item));
@@ -316,7 +316,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     }
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (e.isVisitRecord()) {
-                    intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                    //TODO 发布版本使用旧款的拜访报告
+                    intent = new Intent(ct, 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));
@@ -326,7 +328,9 @@ 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, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+                        //TODO 发布版本使用旧款的拜访报告
+                        intent = new Intent(ct, 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);//可以提交拜访报告
@@ -745,10 +749,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                             intent.putExtra("type", 1);
                             break;
                         case 2:
-                            if (OAConfig.canShowCrm2_0())
-                                intent = new Intent(ct, AddVisitReportActivity.class);
-                            else intent = new Intent(ct, VisitReportAddActivity.class);
-
+                            //TODO 发布版本使用旧款的拜访报告
+                            intent = new Intent(ct, VisitReportAddActivity.class);
+//                          intent = new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
                             break;
                         default:
                             String caller = (String) menusMap.get(position).get("item_caller");

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 false;
+        return true;
     }
 }

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1337,6 +1337,6 @@
     <string name="remove_blacklist_prompt">確定要移出黑名單嗎</string>
     <string name="add_blacklist_prompt">確定要加入黑名單嗎？ </string>
     <string name="add_blacklist_succ">加入黑名單成功</string>
-    <string name="unsubmit">unsubmit</string>
+    <string name="unsubmit">反提交</string>
     <string name="Operation_succeeded">Operation succeeded</string>
 </resources>