push HIU

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -22,6 +22,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.andreabaccega.formedittext.BuildConfig;
+import com.andreabaccega.widget.FormEditText;
 import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -29,7 +30,6 @@ import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.dao.SignAutoLogDao;
 import com.core.xmpp.model.SignAutoLogEntity;
-import com.core.app.R;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
@@ -38,6 +38,9 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -613,4 +616,52 @@ public class CommonUtil {
         }
 
     }
+
+    public static boolean isBiteman() {
+        String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
+        return !StringUtil.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");
+    }
+
+
+    public static void getCommonId(Context ct, String seq, Handler mHandler, int codeWhat) {
+        getCommonId(CommonUtil.getAppBaseUrl(ct), ct, seq, mHandler, codeWhat);
+    }
+
+    public static void getCommonId(String action, Context ct, String seq, Handler mHandler, int codeWhat) {
+        String url = action + "/common/getId.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("seq", seq);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        com.core.net.http.ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+    }
+    /**
+     * 去除字符串中的换行符，空格
+     *
+     * @param s
+     * @return
+     */
+    public static String removeStringMark(String s) {
+        String result = "";
+        if (!TextUtils.isEmpty(s)) {
+            Pattern pattern = Pattern.compile("\\s*|\t|\r|\n");
+//            Pattern pattern = Pattern.compile("\r|\n");
+            Matcher matcher = pattern.matcher(s);
+            result = matcher.replaceAll("");
+        }
+        return result;
+    }
+    /**
+     * 返回输入框内去除换行符和空格之后的字符串
+     *
+     * @param et
+     * @return
+     */
+    public static String getNoMarkEditText(FormEditText et) {
+        String temp = "";
+        temp = et.getText().toString().trim();
+        temp = removeStringMark(temp);
+        return StringUtil.toHttpString(temp);
+    }
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/AddBusinessActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/AddBusinessActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,6 +14,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
@@ -21,20 +22,16 @@ import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonInterface;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.CRM.erp.adapter.AddBusinessAdapter;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.oa.AddBusinessAdapter;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -53,18 +50,11 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     private final int SAVE_BUSINESS = 0x763;
     private final int LOAD_BUSINESS_CHANCESTAGE = 0x764;
     private final int UPDATE_BUSINESS = 0x765;
-    @ViewInject(R.id.company_tv)
     private TextView company_tv;
-    @ViewInject(R.id.company_add_tv)
     private TextView company_add_tv;
-    @ViewInject(R.id.remark_tv)
     private TextView remark_tv;
-    @ViewInject(R.id.business_stage_tv)
     private TextView business_stage_tv;//商机阶段
-    @ViewInject(R.id.business_Library_tv)
     private TextView business_Library_tv;//商机库
-
-    @ViewInject(R.id.contact_lv)
     private MyListView contact_lv;
     private AddBusinessAdapter adapter;
     private LatLng latLng;
@@ -76,11 +66,20 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_business);
-        ViewUtils.inject(this);
+        initIDS();
         initEvent();
         initView();
     }
 
+    private void initIDS() {
+        company_tv = (TextView) findViewById(R.id.company_tv);
+        company_add_tv = (TextView) findViewById(R.id.company_add_tv);
+        remark_tv = (TextView) findViewById(R.id.remark_tv);
+        business_stage_tv = (TextView) findViewById(R.id.business_stage_tv);
+        business_Library_tv = (TextView) findViewById(R.id.business_Library_tv);
+        contact_lv = (MyListView) findViewById(R.id.contact_lv);
+    }
+
     private void initView() {
         getSupportActionBar().setTitle(R.string.crm_creat_business);
         Intent intent = getIntent();
@@ -121,31 +120,24 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
         Intent intent = null;
-        switch (v.getId()) {
-            case R.id.company_tv:
-                intent = new Intent(ct, SelectAimActivity.class).putExtra("title", getString(R.string.select) + getString(R.string.Company_Name));
-                startActivityForResult(intent, SELECT_COMPANY);
-                break;
-            case R.id.remark_tv:
-                startActivityForResult(new Intent(ct, SearchSelectActivity.class), SearchSelectActivity.RESULT_CODE);
-                break;
-            case R.id.additem_tv:
-                adapter.getContacts().add(new EmployeesModel());
-                adapter.notifyDataSetChanged();
-                break;
-            case R.id.submit_btn:
-                if (canSubmit()) {
-                    if (isUpdata) updateBusiness();
-                    else
-                        getIdByNet();
-                }
-                break;
-            case R.id.business_Library_tv:
-                loadBusiness();
-                break;
-            case R.id.business_stage_tv:
-                loadJieDuan();
-                break;
+        if (v.getId() == R.id.company_tv){
+            intent = new Intent(ct, SelectAimActivity.class).putExtra("title", getString(R.string.select) + getString(R.string.Company_Name));
+            startActivityForResult(intent, SELECT_COMPANY);
+        }else if (v.getId() == R.id.remark_tv){
+            startActivityForResult(new Intent(ct, SearchSelectActivity.class), AppConstant.RESULT_CODE);
+        }else if (v.getId() ==  R.id.additem_tv){
+            adapter.getContacts().add(new EmployeesModel());
+            adapter.notifyDataSetChanged();
+        }else if (v.getId() == R.id.submit_btn){
+            if (canSubmit()) {
+                if (isUpdata) updateBusiness();
+                else
+                    getIdByNet();
+            }
+        }else if (v.getId() == R.id.business_Library_tv){
+            loadBusiness();
+        }else if (v.getId() == R.id.business_stage_tv){
+            loadJieDuan();
         }
     }
 
@@ -193,8 +185,8 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
                 String remark = StringUtil.isEmpty(message) ? getResources().getString(R.string.maintain_customers) : message;
                 remark_tv.setText(remark);
                 break;
-            case SearchSelectActivity.RESULT_CODE:
-                if (SearchSelectActivity.RESULT_CODE == resultCode) {
+            case AppConstant.RESULT_CODE:
+                if (AppConstant.RESULT_CODE == resultCode) {
                     String result = data.getStringExtra("data");
                     if (!StringUtil.isEmpty(result))
                         remark_tv.setText(result);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+package com.uas.appworks.CRM.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -18,7 +18,7 @@ import android.widget.Button;
 import android.widget.HorizontalScrollView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.Scroller;
+import android.widget.ScrollView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
@@ -28,17 +28,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.CalendarUtil;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewOneAdapter;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
+import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.view.ListViewInScroller;
-import com.xzjmyk.pm.activity.view.FunnelView;
+import com.uas.appworks.CRM.erp.adapter.HListViewOneAdapter;
+import com.uas.appworks.CRM.erp.view.FunnelView;
+import com.uas.appworks.R;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -53,21 +51,13 @@ import java.util.Map;
 public class BusinessActivity extends BaseActivity implements View.OnClickListener, AdapterView.OnItemClickListener {
 
     private static final String TAG = "BusinessActivity";
-    @ViewInject(R.id.bt_qiang)
     private Button bt_qiang;
-    @ViewInject(R.id.bt_create)
     private Button bt_create;
-    @ViewInject(R.id.bt_manage)
     private Button bt_manage;
-    @ViewInject(R.id.sv_funnel)
-    private Scroller sv_funnel;
-    @ViewInject(R.id.bt_go)
+    private ScrollView sv_funnel;
     private Button bt_go;
-    @ViewInject(R.id.funnelview)
     private FunnelView funnelView;
-    @ViewInject(R.id.layout)
     private HorizontalScrollView layout;
-    @ViewInject(R.id.lv_grid_dispaly)
     private ListViewInScroller lv_grid_dispaly;
     private HListViewOneAdapter hl_adapter;
     private ArrayList<ArrayList<String>> gridlists = new ArrayList<ArrayList<String>>();
@@ -95,7 +85,15 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
 
     public void initView() {
         getSupportActionBar().setTitle(getString(R.string.crmmain_business));
-        ViewUtils.inject(this);
+
+        bt_qiang = (Button) findViewById(R.id.bt_qiang);
+        bt_create = (Button) findViewById(R.id.bt_create);
+        bt_manage = (Button) findViewById(R.id.bt_manage);
+        bt_go = (Button) findViewById(R.id.bt_go);
+        layout = (HorizontalScrollView) findViewById(R.id.layout);
+        lv_grid_dispaly = (ListViewInScroller) findViewById(R.id.lv_grid_dispaly);
+        sv_funnel = (ScrollView) findViewById(R.id.sv_funnel);
+        funnelView = (FunnelView) findViewById(R.id.funnelview);
     }
 
     private void initListener() {
@@ -126,36 +124,27 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.crm_data_find:
-                View view = getWindow().findViewById(item.getItemId());
-                showPopupWindow(view);
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
-
+        if (item.getItemId() == R.id.crm_data_find){
+            View view = getWindow().findViewById(item.getItemId());
+            showPopupWindow(view);
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.bt_create:
-                if (OAConfig.canShowCrm2_0() && !CommonUtil.isBiteman())
-                    startActivity(new Intent(this, AddBusinessActivity.class));
-                else startActivity(new Intent(this, BusinessAddActivity.class));
-                break;
-            case R.id.bt_qiang:
-                startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 1));
-                break;
-            case R.id.bt_manage:
-                startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 2));
-                break;
-            case R.id.bt_go:
-                startActivity(new Intent(this, BusinessStateActivity.class).putExtra("bt_type", 0));
-                break;
+        if (v.getId() ==  R.id.bt_create){
+            if (OAConfig.canShowCrm2_0() && !CommonUtil.isBiteman())
+                startActivity(new Intent(this, AddBusinessActivity.class));
+            else startActivity(new Intent(this, BusinessAddActivity.class));
+        }else if (v.getId() == R.id.bt_qiang){
+            startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 1));
+        }else if (v.getId() == R.id.bt_manage){
+            startActivity(new Intent(this, BusinessDetailActivty.class).putExtra("bt_type", 2));
+        }else if (v.getId() == R.id.bt_go){
+            startActivity(new Intent(this, BusinessStateActivity.class).putExtra("bt_type", 0));
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/HListViewOneAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/HListViewOneAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.uas.appworks.CRM.erp.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,8 +14,8 @@ import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.utils.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/FunnelView.java → app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/view/FunnelView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view;
+package com.uas.appworks.CRM.erp.view;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;