本地合并代码 -----》》》 draft and developer for arison

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -41,8 +41,13 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
@@ -391,7 +396,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         super.onCreate(savedInstanceState);
         getSupportActionBar().setDisplayShowHomeEnabled(false);
         getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-        /**@注释：主页布局文件 */
+      
         setContentView(R.layout.activity_main);
         SIP_USERNAME = MyApplication.getInstance().mLoginUser.getUserId();
         String host = mConfig.MeetingHost;
@@ -463,6 +468,20 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 Log.d("wang", "MainActivity....解锁");
             }
         });
+        
+        
+        //查询数据库，取出中文名:
+        DBManager  dbManager = new DBManager(ct);
+        List<EmployeesEntity> db = dbManager.select_getEmployee(
+                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+                        CommonUtil.getSharedPreferences(ct, "erp_username")}
+                , "whichsys=? and em_code=? ");
+        if (!ListUtils.isEmpty(db)){
+            if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
+                CommonUtil.setSharedPreferences(ct,"erp_emname",db.get(0).getEM_NAME());
+            }
+        }
+        dbManager.closeDB();
     }
 
     public void updateVersion() {

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

@@ -124,7 +124,12 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("创建商机");
-        et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct,"erp_emname"))){
+            et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct,"erp_emname")); 
+        }else{
+            et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        }
+       
     }
 
     @Override

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

@@ -186,7 +186,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initData() {
-        et_cu_sellername.setText(MyApplication.getInstance().mLoginUser.getNickName().trim());
+        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
+            et_cu_sellername.setText(CommonUtil.getSharedPreferences(ct, "erp_emname").trim());
+        } else {
+            et_cu_sellername.setText(MyApplication.getInstance().mLoginUser.getNickName().trim());
+        }
+
         if (cu_code != null) {
             et_cu_code.setText(cu_code);
         } else {
@@ -209,7 +214,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             mContact = intent.getStringExtra("contact");
             mPosition = intent.getStringExtra("position");
             mTelephone = intent.getStringExtra("telephone");
-            et_cu_sellercode = CommonUtil.getSharedPreferences(ct,"erp_username");
+            et_cu_sellercode = CommonUtil.getSharedPreferences(ct, "erp_username");
             if ("已提交".equals(cu_status)) {
                 disableEdit(false);
             } else {

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

@@ -41,6 +41,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 
@@ -101,7 +102,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         ct = this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("客户");
-        tv_name.setText(MyApplication.getInstance().mLoginUser.getNickName());
+       
         loadParams(3);
 
         mAdapter = new BussinessDetailAdapter(ct, jsonArray);
@@ -170,16 +171,15 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                         CommonUtil.getSharedPreferences(ct, "erp_username")}
                 , "whichsys=? and em_code=? ");
         if (!ListUtils.isEmpty(db)) {
-            for (EmployeesEntity model : db) {
-                Log.i(TAG, "initData:" + model.getEM_DEPART());
-                Log.i(TAG, "initData:" + model.getEM_POSITION());
-                Log.i(TAG, "initData:" + model.getCOMPANY());
-                Log.i(TAG, "initData:" +model.getEm_IMID()  );
-
-            }
             tv_position.setText(db.get(0).getEM_POSITION());
             tv_department.setText(db.get(0).getEM_DEFAULTORNAME() + "|");
             AvatarHelper.getInstance().displayAvatar(String.valueOf(db.get(0).getEm_IMID()), iv_head, false);
+            if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
+                tv_name.setText(db.get(0).getEM_NAME());
+            }else{
+                tv_name.setText(MyApplication.getInstance().mLoginUser.getNickName()); 
+            }
+         
         }
     }
 

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

@@ -268,6 +268,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void sendHttpResquest(int what, String code) {
+        String emname="";
+        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
+            emname=CommonUtil.getSharedPreferences(ct, "erp_emname").trim();
+        } else {
+            emname=MyApplication.getInstance().mLoginUser.getNickName().trim();
+        }
         String formStore = "";
         if (tv_date_start.testValidity() && tv_date_end.testValidity()
                 && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
@@ -309,7 +315,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "ENTERING" +
                             "\",\n" +
                             "\"vr_recorder\":\"" +
-                            MyApplication.getInstance().mLoginUser.getNickName() +
+                            emname +
                             "\",\n" +
                             //TODO 修改
                             "\"vr_status\":\"" +
@@ -331,7 +337,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
         params.put("caller", "VisitRecord");
-        String param1 = "{\"pl_detno\":1,\"pl_name\":" + MyApplication.getInstance().mLoginUser.getNickName() + ",\"pl_vrid\":" + mVrId + "}";
+        String param1 = "{\"pl_detno\":1,\"pl_name\":" + emname + ",\"pl_vrid\":" + mVrId + "}";
         params.put("param1", "[]");
         params.put("param2", "[]");
         params.put("param3", param1);
@@ -430,6 +436,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 tv_customer_login.setText(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : " ");
                 tv_linksman_login.setText(object.containsKey("CU_CONTACT") ? object.getString("CU_CONTACT") : " ");
                 tv_address_login.setText(object.containsKey("CU_ADD1") ? object.getString("CU_ADD1") : " ");
+                tv_visit_steps.setText(object.containsKey("CU_NICHESTEP") ? object.getString("CU_NICHESTEP") : " ");
 
             }
         } else if (requestCode == 0x23 && resultCode == 0x20) {
@@ -527,6 +534,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             vp_code = array.getJSONObject(i).getString("CU_CODE");
                         tv_linksman_login.setText(array.getJSONObject(i).getString("CU_CONTACT"));
                         tv_address_login.setText(array.getJSONObject(i).getString("CU_ADD1"));
+                        tv_visit_steps.setText(array.getJSONObject(i).getString("CU_NICHESTEP"));
                     }
                 }
             }

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

@@ -223,6 +223,12 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     };
 
     private void sendHttpResquest(int what) {
+        String emname="";
+        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
+            emname=CommonUtil.getSharedPreferences(ct, "erp_emname").trim();
+        } else {
+            emname=MyApplication.getInstance().mLoginUser.getNickName().trim();
+        }
         String formStore = "";
         if (tv_date_select.testValidity() && tv_date_end.testValidity()
                 && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
@@ -256,10 +262,10 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     CommonUtil.getNoMarkEditText(tv_linksman_login) +
                     "\",\n" +
                     "\"vp_visitman\":\"" +
-                    MyApplication.getInstance().mLoginUser.getNickName() +
+                   emname +
                     "\",\n" +
                     "\"vp_recordman\":\"" +
-                    MyApplication.getInstance().mLoginUser.getNickName() +
+                   emname +
                     "\",\n" +
                     "\"vp_status\":\"" +
                     "未拜访" +