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

# Conflicts:
#	WeiChat/build.gradle

WeiChat/src/main/AndroidManifest.xml

@@ -782,6 +782,8 @@
         <activity android:name=".ui.erp.activity.form.DataFormFieldActivity" />
         <activity
             android:name=".ui.erp.activity.form.FormListSelectActivity"
+            android:hardwareAccelerated="false"
+            android:windowSoftInputMode="adjustPan"
             android:launchMode="singleTask" />
         <activity
             android:name=".ui.erp.activity.oa.WorkActivity"

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

@@ -292,7 +292,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-//                    Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
+                    Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
                     if(!TextUtils.isEmpty(real_status) && real_status.equals("已审核")){
                         commondoc_sv.setVisibility(View.VISIBLE);
                         resanddel_ll.setVisibility(View.GONE);

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

@@ -372,9 +372,9 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                         "\"bc_desc4\":\"" + bc_depart + "\"," +
                         "\"bc_desc6\":\"" + bc_linecse + "\"," +
                         "\"bc_code\":\"" + et_business_no.getText().toString() + "\"," +   //商机名称
-                        "\"bc_status\":\"" + "在录入" + "\"," +
+                        "\"bc_status\":\"" + "已审核" + "\"," +
                         "\"bc_domancode\":\"" + enterCode + "\"," +
-                        "\"bc_statuscode\":\"" + "ENTERING" + "\"," +
+                        "\"bc_statuscode\":\"" + "AUDITED" + "\"," +
                         "\"bc_description\":\"" + name + "\"," +   //商机名称
                         "\"bc_from\":\"" + from + "\"," +          //商机来源
                         "\"bc_nichehouse\":\"" + bc_nichehouse + "\"," +      //商机库

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

@@ -37,10 +37,12 @@ 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.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,14 +78,23 @@ public class BusinessDetailActivty extends BaseActivity {
         setContentView(R.layout.activity_business_qiang_activty);
         initView();
         initListener();
+        LogUtil.d("onCreate()");
+       
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        LogUtil.d("onResume()");
         initData();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtil.d("onDestroy()");
+    }
+
     private void initView() {
         ViewUtils.inject(this);
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
@@ -136,7 +147,6 @@ public class BusinessDetailActivty extends BaseActivity {
 
             @Override
             public void afterTextChanged(Editable s) {
-
                 if (mAdapter==null){
                     Toast.makeText(getApplication(), "网络异常，请稍后重试", Toast.LENGTH_SHORT).show();
                 }else{
@@ -265,7 +275,7 @@ public class BusinessDetailActivty extends BaseActivity {
                         progressDialog.show();
                         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
                         Map<String, Object> stringMap = new HashMap<String, Object>();
-                        stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+                        stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_emname"));
 
                         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
                         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -358,7 +368,7 @@ public class BusinessDetailActivty extends BaseActivity {
             switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                   // LogUtil.d(TAG, "handleMessage:" + msg.getData().getString("result"));
                     formCondition = JSON.parseObject(msg.getData().getString("result")).getString("keyField");
                     gridCondition = JSON.parseObject(msg.getData().getString("result")).getString("pfField");
                     if (StringUtils.isEmpty(formCondition)) formCondition = "bc_id";
@@ -383,9 +393,9 @@ public class BusinessDetailActivty extends BaseActivity {
                     } else {
                         mEmptyLayout.showEmpty();
                         if (page == 1) {
-                            Crouton.makeText(activity, 30, "暂时没有数据!", getResources().getColor(R.color.light_green), 3000).show();
+                            Crouton.makeText(activity, 30, "暂时没有数据!", Style.holoGreenLight, 3000).show();
                         } else {
-                            Crouton.makeText(activity, 30, "数据加载完成!", getResources().getColor(R.color.light_green), 3000).show();
+                            Crouton.makeText(activity, 30, "数据加载完成!", Style.holoGreenLight, 3000).show();
                         }
 
                     }
@@ -397,40 +407,48 @@ public class BusinessDetailActivty extends BaseActivity {
                     mlist.onRefreshComplete();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    mlist.onRefreshComplete();
+                    Crouton.cancelAllCroutons();
+                   final String m= msg.getData().getString("result");
+                    LogUtil.d(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            ViewUtil.ToastMessage(mContext, m,
+                                    Style.holoRedLight,
+                                    3000);
+                        }
+                    },500);
                     break;
                 case BUSINESS_QIANG:
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    LogUtil.d(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
                     Crouton.makeText(BusinessDetailActivty.this, 45, "成功抢得此商机，\n" +
                                     "请到商机跟进中查看商机!\n",
-                            getResources().getColor(R.color.light_green),
+                            Style.holoGreenLight,
                             5000).show();
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
                     Crouton.makeText(BusinessDetailActivty.this, 45, "成功分配商机！",
-                            getResources().getColor(R.color.light_green),
+                            Style.holoGreenLight,
                             5000).show();
-                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
+       
                     break;
                 case CAN_QIANG_NOT:
                     JSONObject result = JSON.parseObject(msg.getData().getString("result"));
                     String isok = result.getString("isok");
                     if (!new JsonValidator().validate(msg.getData().getString("result"))){
-                        Crouton.makeText(BusinessDetailActivty.this, msg.getData().getString("result"), 0xffff4444, 2000).show();
+                        Crouton.makeText(BusinessDetailActivty.this, msg.getData().getString("result"), Style.holoGreenLight, 2000).show();
                     }
                     if ("0".equals(isok)) {
                         Log.i("qiang", isok);
-                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, MyApplication.getInstance().mLoginUser.getNickName(),
+                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, CommonUtil.getSharedPreferences(ct, "erp_emname"),
                                 CommonUtil.getSharedPreferences(ct, "erp_username"));
                     } else if ("1".equals(isok)) {
                         Log.i("qiang", isok);
                         progressDialog.dismiss();
-                        Crouton.makeText(BusinessDetailActivty.this, "您已超出最大获取商机数！", 0xffff4444, 2000).show();
+                        Crouton.makeText(BusinessDetailActivty.this, "您已超出最大获取商机数！", Style.holoGreenLight, 2000).show();
                     }
                 case 12://admin ?
                    result = JSON.parseObject(msg.getData().getString("result"));
@@ -462,20 +480,12 @@ public class BusinessDetailActivty extends BaseActivity {
             params.put("pageSize", 10);
             params.put("caller", "BusinessChance");
             if (type == 1) {//抢
-                params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and  bc_nichehouse in (select  bd_name from BusinessDataBase where bd_prop='公有')");
+                params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and  bc_nichehouse in (select  bd_name from BusinessDataBase where bd_prop='可领取可分配')");
             } else if (type == 2) {//分配
                 params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and bc_nichehouse in (select bd_name from BusinessDataBase where bd_admincode=" +
-                        "'" + CommonUtil.getSharedPreferences(ct, "erp_username") + "')");
+                        "'" + CommonUtil.getSharedPreferences(ct, "erp_username") +  "' and bd_prop='管理员分配') ");
             } else if (type == 3) {//商机列表
-              /*  if (isAdmin==1){
-                    params.put("condition", "bc_currentprocess='" + business_steps + "' and "+currentdate);
-                }else{
-                    params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='" +
-                            CommonUtil.getSharedPreferences(ct, "erp_username") + "' and "+currentdate);
-                }*/
-                
                 url= Constants.getAppBaseUrl(ct) +"mobile/crm/getBusinessChancebyMonthAndProcess.action";
-                //emcode=U0730&currentprocess=合同签约&currentdate=to_char(bc_recorddate,’yyyymm’)=’201609’&page=1&pageSize=5
                 params.clear();
                 params.put("emcode",  CommonUtil.getSharedPreferences(ct, "erp_username"));
                 params.put("currentprocess",business_steps);

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

@@ -40,6 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
 import com.xzjmyk.pm.activity.view.stickylistheaders.StickyListHeadersListView;
 
@@ -50,7 +51,6 @@ import java.util.List;
 import java.util.Map;
 
 
-
 /**
  * @功能:商机详情
  * @author:Arisono
@@ -59,8 +59,8 @@ import java.util.Map;
  */
 public class BusinessDetailInfoActivity extends BaseActivity implements View.OnClickListener {
 
-    private static final int LOAD_JIEDUAN =0x21 ;
-    private static final int LOAD_STAGEPOINT =0x22 ;
+    private static final int LOAD_JIEDUAN = 0x21;
+    private static final int LOAD_STAGEPOINT = 0x22;
     @ViewInject(R.id.bt_fenpei)
     private Button bt_fenpei;
     @ViewInject(R.id.bt_qiang)
@@ -116,21 +116,22 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     @ViewInject(R.id.stepsView)
     private StepsView mStepsView;
-    
-    @ViewInject(R.id. lv_business)
+
+    @ViewInject(R.id.lv_business)
     private StickyListHeadersListView mList;
-    
+
     private StickyListAdapter mAapter;
-    
+
     private int type = 0;
     private String formCondition;
     private String gridCondition;
     private String en_code;
 
-    private  String[] labels;
+    private String[] labels;
 
     private final static int BUSINESS_FAILURE_REQUEST = 99;
     private final static int BUSINESS_FOLLOW_REQUEST = 100;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -199,7 +200,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 //            }
 //        mAapter=new StickyListAdapter(mContext,hasHeaderIdList);
 //        mList.setAdapter(mAapter);
-        
+
     }
 
     private void initListener() {
@@ -222,7 +223,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 showPopupWindow(v.findViewById(R.id.bt_manage_go));
                 break;
             case R.id.bt_manage_date:
-                isEnableClick(bt_code,5);
+                isEnableClick(bt_code, 5);
                 break;
             case R.id.bt_qiang:
                 progressDialog.show();
@@ -290,14 +291,14 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                                     .putExtra("type", 1)
                                     .putExtra("code", bt_code)
                                     .putExtra("process", bt_process)
-                                    .putExtra("doman", bt_doman),BUSINESS_FAILURE_REQUEST);
+                                    .putExtra("doman", bt_doman), BUSINESS_FAILURE_REQUEST);
                             break;
                         case 3:
                             startActivityForResult(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class)
                                     .putExtra("type", 2)
                                     .putExtra("code", bt_code)
                                     .putExtra("process", bt_process)
-                                    .putExtra("doman", bt_doman),BUSINESS_FOLLOW_REQUEST);
+                                    .putExtra("doman", bt_doman), BUSINESS_FOLLOW_REQUEST);
                             break;
                       /*  case 4:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessTransferActivity.class)
@@ -305,19 +306,22 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                             break;*/
                         case 4:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, CustomerAddActivity.class)
-                                    .putExtra("companyname",bc_custname.getText().toString().trim())
-                                    .putExtra("companyaddress",bc_address.getText().toString().trim())
-                                    .putExtra("contact",bc_contact.getText().toString().trim())
-                                    .putExtra("position",bc_position.getText().toString().trim())
-                                    .putExtra("bc_code", bt_code)
-                                    .putExtra("telephone", bt_tel.getText().toString().trim())
-                                    
-                                    
+                                            .putExtra("companyname", bc_custname.getText().toString().trim())
+                                            .putExtra("companyaddress", bc_address.getText().toString().trim())
+                                            .putExtra("contact", bc_contact.getText().toString().trim())
+                                            .putExtra("position", bc_position.getText().toString().trim())
+                                            .putExtra("bc_code", bt_code)
+                                            .putExtra("telephone", bt_tel.getText().toString().trim())
+
+
                             );
                             break;
                         case 5:
-                            startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessSelectCustomerActivity.class)
-                                    .putExtra("code", bt_code));
+                            startActivity(new Intent(BusinessDetailInfoActivity.this,
+                                            BusinessSelectCustomerActivity.class)
+                                            .putExtra("code", bt_code)
+//                                   
+                            );
                             break;
                     }
                 }
@@ -403,9 +407,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         bt_doman = root.getString("bc_doman");
                         bt_code = root.getString("bc_code");
                         bt_process = root.getString("bc_currentprocess");
-                    
-                        
-                        
+
+
                     }
                     loadJieDuan();
                     loadStagePoints();
@@ -413,29 +416,29 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 case BUSINESS_QIANG:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
-                    Crouton.makeText(activity,45,"成功抢得此商机，\n" +
+                    Crouton.makeText(activity, 45, "成功抢得此商机，\n" +
                                     "请到商机跟进中查看商机!\n",
-                            getResources().getColor(R.color.light_green),
+                            Style.holoGreenLight,
                             5000).show();
-                   new Handler().postDelayed(new Runnable() {
-                      @Override
-                      public void run() {
-                          finish();
-                      }
-                  },5000);
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            finish();
+                        }
+                    }, 5000);
 //                    startActivity(new Intent(ct, BusinessDetailActivty.class).putExtra("bt_type",1));
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
-                    ToastMessage("分配商机成功！");
+                    Crouton.makeText(BusinessDetailInfoActivity.this, "分配商机成功！", Style.holoGreenLight ,3000).show();
                     crm_ll_followup.setVisibility(View.GONE);
                     crm_ll_qiang.setVisibility(View.GONE);
                     crm_ll_manage.setVisibility(View.GONE);
- //                   finish();
+                    //                   finish();
 //                    startActivity(new Intent(ct, BusinessDetailActivty.class).putExtra("bt_type",2));
                     break;
                 case BUSINESS_RELEASE:
-                    ToastMessage("商机释放成功！");
+                    Crouton.makeText(BusinessDetailInfoActivity.this, "商机释放成功！", Style.holoGreenLight, 3000).show();
                     progressDialog.dismiss();
                     popupWindow.dismiss();
                     jumpToStateActivity();
@@ -449,29 +452,38 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     } else if ("1".equals(isok)) {
                         Log.i("qiang", isok);
                         progressDialog.dismiss();
-                        Crouton.makeText(BusinessDetailInfoActivity.this, "您已超出最大获取商机数！", 0xffff4444, 2000).show();
+                        Crouton.makeText(BusinessDetailInfoActivity.this, "您已超出最大获取商机数！", Style.holoRedLight, 2000).show();
                     }
                 case 5:
                     progressDialog.dismiss();
-                     result = JSON.parseObject(msg.getData().getString("result"));
-                    JSONArray items=result.getJSONArray("result");
-                    if (items!=null){
-                        if (items.size()>0){
-                            Crouton.makeText(BusinessDetailInfoActivity.this, "不能重复添加到日程！", 0xffff4444, 2000).show();
-                        }else{
+                    result = JSON.parseObject(msg.getData().getString("result"));
+                    JSONArray items = result.getJSONArray("result");
+                    if (items != null) {
+                        if (items.size() > 0) {
+                            Crouton.makeText(BusinessDetailInfoActivity.this, "不能重复添加到日程！", Style.holoRedLight, 2000).show();
+                        } else {
                             Intent intent = new Intent(ct, TaskAddActivity.class);
                             intent.putExtra("type", 1);
-                            intent.putExtra("from","BusinessDetailInfo");
+                            intent.putExtra("from", "BusinessDetailInfo");
                             intent.putExtra("data", bt_code);
+                            intent.putExtra("bc_doman", bt_doman);
+                            intent.putExtra("bc_custname", bc_description.getText().toString());
                             startActivityForResult(intent, 0x11);
                         }
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    Crouton.makeText(BusinessDetailInfoActivity.this, msg.getData().getString("result"),
-                            0xffff4444, 2000).show();
+                    Crouton.cancelAllCroutons();
+                    final String m= msg.getData().getString("result");
+                    LogUtil.d(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            ViewUtil.ToastMessage(mContext, m,
+                                    Style.holoRedLight,
+                                    3000);
+                        }
+                    }, 1000);
                     break;
                 case LOAD_JIEDUAN:
                     progressDialog.dismiss();
@@ -479,25 +491,25 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     String json = msg.getData().getString("result");
                     try {
                         JSONArray array = JSON.parseObject(json).getJSONArray("stages");
-                        labels=new String[array.size()];
+                        labels = new String[array.size()];
                         if (!array.isEmpty()) {
                             for (int i = 0; i < array.size(); i++) {
-                              //  lists.add(array.getJSONObject(i).getString("BS_NAME"));
-                                labels[i]=array.getJSONObject(i).getString("BS_NAME");
+                                //  lists.add(array.getJSONObject(i).getString("BS_NAME"));
+                                labels[i] = array.getJSONObject(i).getString("BS_NAME");
                             }
                         }
 
-                        if (labels!=null){
-                            int position=0;
-                            for (int i=0;i<labels.length;i++){
-                                if (labels[i].equals(bc_currentprocess.getText().toString())){
-                                    position=i;
+                        if (labels != null) {
+                            int position = 0;
+                            for (int i = 0; i < labels.length; i++) {
+                                if (labels[i].equals(bc_currentprocess.getText().toString())) {
+                                    position = i;
                                 }
                             }
                             LogUtil.d(JSON.toJSONString(labels));
                             LogUtil.d(JSON.toJSONString(position));
                             LogUtil.d(bc_currentprocess.getText().toString());
-                            mStepsView.setCompletedPosition(position%labels.length)
+                            mStepsView.setCompletedPosition(position % labels.length)
                                     .setLabels(labels)
                                     .setBarColorIndicator(
                                             ct.getResources().getColor(R.color.light_gray))
@@ -507,22 +519,22 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         }
                     } catch (Resources.NotFoundException e) {
                         e.printStackTrace();
-                      ToastMessage("扔出异常！");
+                        ToastMessage("扔出异常！");
                     }
                     break;
                 case LOAD_STAGEPOINT:
-                     progressDialog.dismiss();
-                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                     json = msg.getData().getString("result");
-                     LogUtil.d(JSON.toJSONString(json));
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    json = msg.getData().getString("result");
+                    LogUtil.d(JSON.toJSONString(json));
                     try {
-                        JSONArray data=JSON.parseObject(json).getJSONArray("data");
-                        int size=data.size();
-                        List<SimpleData> simpleDatas=new ArrayList<>();
-                        JSONArray value=data.getJSONObject(0).getJSONArray("value");
-                        for (int j=0;j<value.size();j++){
-                            for(int i=0;i<data.size();i++){
-                                SimpleData simpleData=new SimpleData();
+                        JSONArray data = JSON.parseObject(json).getJSONArray("data");
+                        int size = data.size();
+                        List<SimpleData> simpleDatas = new ArrayList<>();
+                        JSONArray value = data.getJSONObject(0).getJSONArray("value");
+                        for (int j = 0; j < value.size(); j++) {
+                            for (int i = 0; i < data.size(); i++) {
+                                SimpleData simpleData = new SimpleData();
                                 simpleData.setLeft(data.getJSONObject(i).getString("caption"));
                                 simpleData.setRight(data.getJSONObject(i).getJSONArray("value").get(j).toString());
                                 simpleData.setGroupId(j);
@@ -530,7 +542,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                             }
                         }
 
-                        mAapter=new StickyListAdapter(mContext,simpleDatas);
+                        mAapter = new StickyListAdapter(mContext, simpleDatas);
                         mList.setAdapter(mAapter);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -570,7 +582,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         if (StringUtils.isEmpty(emname)) {
             emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
         }
-        params.put("bc_doman",emname);
+        params.put("bc_doman", emname);
         params.put("bc_domancode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -593,7 +605,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     }
 
-    public void isEnableClick(String bt_code,int what){
+    public void isEnableClick(String bt_code, int what) {
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getSchedule.action";
         progressDialog.show();
         Map<String, Object> params = new HashMap<>();
@@ -607,7 +619,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
-    
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -620,13 +632,13 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 sendHttpBusinessFenpei(BUSINESS_FENPEI, bt_code, bt_doman, en_code);
                 break;
             case BUSINESS_FAILURE_REQUEST:
-                if (data == null){
+                if (data == null) {
                     return;
                 }
                 this.finish();
                 break;
             case BUSINESS_FOLLOW_REQUEST:
-                if (data == null){
+                if (data == null) {
                     return;
                 }
                 this.finish();
@@ -652,8 +664,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     }
 
 
-
-
     /**
      * @desc:加载阶段
      * @author：Arison on 2016/7/20
@@ -667,16 +677,16 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_JIEDUAN, null, null, "post");
     }
-    
-    
-    public void loadStagePoints(){
+
+
+    public void loadStagePoints() {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getStagePoints.action";
         Map<String, Object> params = new HashMap<>();
-        params.put("bccode", "2016120035");
-        params.put("currentStep", "testpoints");
-        params.put("master", CommonUtil.getSharedPreferences(mContext,"erp_master"));
-      
+        params.put("bccode", bc_code.getText().toString());
+        params.put("currentStep", bc_currentprocess.getText().toString());
+        params.put("master", CommonUtil.getSharedPreferences(mContext, "erp_master"));
+
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_STAGEPOINT, null, null, "post");

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

@@ -34,6 +34,7 @@ import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.ArrayList;
@@ -55,6 +56,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     private LinearLayout ll_moment;
     @ViewInject(R.id.ll_leader)
     private LinearLayout ll_leader;
+    @ViewInject(R.id.ll_date)
+    private LinearLayout ll_date;
 
     @ViewInject(R.id.et_remark)
     private EditText et_remark;
@@ -129,12 +132,14 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 getSupportActionBar().setTitle("商机失效");
                 ll_leader.setVisibility(View.VISIBLE);
                 ll_moment.setVisibility(View.GONE);
+                ll_date.setVisibility(View.VISIBLE);
                 break;
             case 2:
                 getSupportActionBar().setTitle("继续跟进");
-                tv_business_state.setText(process);
+                //tv_business_state.setText(process);
                 ll_leader.setVisibility(View.GONE);
                 ll_moment.setVisibility(View.VISIBLE);
+                ll_date.setVisibility(View.GONE);
                 break;
         }
     }
@@ -198,8 +203,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
             switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    Crouton.makeText(activity, 30, "操作成功!", getResources().getColor(R.color.light_green), 2000).show();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result")+" type:"+type);
+                    Crouton.makeText(activity, 30, "操作成功!", Style.holoGreenLight, 2000).show();
                     if (type == 2) {
                         updataSchedule(0x16);
                     } else {
@@ -212,13 +217,19 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                     }
                     break;
                 case 0x16:
-                    jumpToStateActivity();
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            jumpToStateActivity();
+                        }
+                    }, 2000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    Crouton.makeText(activity, 30, msg.getData().getString("result"),
-                            getResources().getColor(R.color.red), 2000).show();
+//                    Crouton.makeText(activity,35, msg.getData().getString("result"),
+//                            Style.holoRedLight, 2000).show();
+                    ViewUtil.ToastMessage(mContext, msg.getData().getString("result"),Style.holoRedLight,3000);
                     break;
                 case 2:
                     progressDialog.dismiss();
@@ -279,6 +290,11 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         if (StringUtils.isEmpty(emname)) {
             emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
         }
+        if(StringUtils.isEmpty(tv_business_state.getText().toString())&&type==2){
+            progressDialog.dismiss();
+            ToastMessage("商机阶段为必填项");
+            return;
+        }
         String gridSore = gridSoreData +
                 "\"bcd_bccode\":\"" + code + "\",\n" +
                 "\"bcd_remark\":\"" + remark + "\",\n" +

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

@@ -75,6 +75,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         getSupportActionBar().setTitle("选择客户");
         if (getIntent()!=null){
             code=getIntent().getStringExtra("code");
+       
         }
 
     }

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

@@ -181,7 +181,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                         mAdapter.getFilter().filter("");
                     }
                 }
-                mlist.setAdapter(mAdapter);
+                //mlist.setAdapter(mAdapter);
             }
         });
     }
@@ -214,24 +214,28 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                 updateTabSelectState((TextView) v.findViewById(R.id.tv_unmanger));
                 business_state = 0;
                 page = 1;
+              //  mAdapter=null;
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
                 break;
             case R.id.tv_manged:
                 updateTabSelectState((TextView) v.findViewById(R.id.tv_manged));
                 business_state = 1;
                 page = 1;
+               // mAdapter=null;
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
                 break;
             case R.id.tv_timeout:
                 updateTabSelectState((TextView) v.findViewById(R.id.tv_timeout));
                 business_state = 2;
                 page = 1;
+               // mAdapter=null;
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
                 break;
             case R.id.tv_transtered:
                 updateTabSelectState((TextView) v.findViewById(R.id.tv_transtered));
                 business_state = 3;
                 page = 1;
+               // mAdapter=null;
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
                 break;
         }
@@ -399,11 +403,12 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             @Override
             protected void publishResults(CharSequence constraint, FilterResults results) {
                 mdata = (ArrayList<Business>) results.values;
-                if (mAdapter.getCount() > 0) {
-                    notifyDataSetChanged();
-                } else {
-                    notifyDataSetInvalidated();
-                }
+                mData=mdata;
+//                if (mAdapter.getCount() > 0) {
+                notifyDataSetChanged();
+//                } else {
+//                    notifyDataSetInvalidated();
+//                }
             }
         }
 

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

@@ -195,8 +195,9 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
         if (cu_code != null) {
             et_cu_code.setText(cu_code);
+            et_cu_code.setEnabled(false);
         } else {
-            getCodeByNet();
+           // getCodeByNet();
         }
         loadParams(FORM_TYPE);//判断预录入
     }
@@ -226,7 +227,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 ll_infomal.setVisibility(View.VISIBLE);
                 getSupportActionBar().setTitle("正式客户");
                 if (StringUtils.isEmpty(cu_code)) {
-
+                    et_cu_code.setText("");
+                    et_cu_code.setEnabled(true);
                 } else {
                     initCustomerData(INITCUSTOMER, cu_code);   //初始化数据
                 }
@@ -645,7 +647,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void setDatas(com.alibaba.fastjson.JSONObject jsonArray) {
-        cu_code = jsonArray.getString("cu_code") == null ? "" : jsonArray.getString("cu_code").trim();
+        //cu_code = jsonArray.getString("cu_code") == null ? "" : jsonArray.getString("cu_code").trim();
         mCompanyName = jsonArray.getString("cu_name") == null ? "" : jsonArray.getString("cu_name").trim();
         mShortName = jsonArray.getString("cu_shortname") == null ? "" : jsonArray.getString("cu_shortname").trim();
         mCompanyAddress = jsonArray.getString("cu_add1") == null ? "" : jsonArray.getString("cu_add1").trim();

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

@@ -86,6 +86,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         type = getIntent().getIntExtra("type", 0);
         code = getIntent().getStringExtra("data");
         form = getIntent().getStringExtra("from");
+        String  bc_doman=getIntent().getStringExtra("bc_doman");
+        String  bc_custname=getIntent().getStringExtra("bc_custname");
         isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
             getSupportActionBar().setTitle("创建任务");
@@ -93,6 +95,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         } else if (type == 1) {
             getSupportActionBar().setTitle("创建日程");
             tv_type.setText("日程");
+            tv_name.setText(bc_custname);
+            tv_executive.setText(bc_doman);
         } else if (type == 2) {
             getSupportActionBar().setTitle("创建会议任务");
             tv_type.setText("会议任务");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java

@@ -207,12 +207,12 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             @Override
             public void onPullDownToRefresh(
                     PullToRefreshBase<ListView> refreshView) {
-                rMap.clear();
+                if (rMap!=null){rMap.clear();}
                 cur = 1;
                 mlistview.setMode(PullToRefreshBase.Mode.BOTH);
-                if (adapter != null) {
-                    adapter.notifyDataSetChanged();
-                }
+//                if (adapter != null) {
+//                    adapter.notifyDataSetChanged();
+//                }
                 mEmptyLayout.showLoading();
                 String where = CommonUtil.getSharedPreferences(
                         FormListSelectActivity.this, "where");
@@ -301,7 +301,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
             @Override
             public void afterTextChanged(Editable s) {
-
                 if (adapter==null) {
                     Toast.makeText(getApplication(),"网络异常，请稍后重试",Toast.LENGTH_SHORT).show();
                 }else{
@@ -309,12 +308,12 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                         mlistview.setMode(PullToRefreshBase.Mode.PULL_FROM_END);
                         adapter.getFilter().filter(etSearch.getText().toString());
                     } else {
-                        adapter.getFilter().filter("");
                         mlistview.setMode(PullToRefreshBase.Mode.BOTH);
+                        adapter.getFilter().filter("");
+                        adapter.notifyDataSetChanged();
                     }
                 }
-                mlistview.setAdapter(adapter);
-
+              //  mlistview.setAdapter(adapter);
             }
         });
 
@@ -706,7 +705,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                             nView.setBackgroundDrawable(getResources().getDrawable(
                                     R.drawable.skin_icon_blue_circle));
                             nView.setLayoutParams(nParams);
-                            nView.setGravity(Gravity.CENTER);
+                            nView.setGravity(Gravity.CENTER_HORIZONTAL);
                             nView.setText((position + 1) + "");
                             nView.setVisibility(View.GONE);
                             rLayout.addView(nView);
@@ -724,17 +723,19 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                         RelativeLayout.LayoutParams tv = new RelativeLayout.LayoutParams(
                                 RelativeLayout.LayoutParams.WRAP_CONTENT,
                                 RelativeLayout.LayoutParams.WRAP_CONTENT);
-                        tv.addRule(RelativeLayout.CENTER_VERTICAL);
+                        tv.addRule(RelativeLayout.ALIGN_PARENT_TOP);
 
                         tView.setWidth(CommonUtil.dip2px(ct, 90));
                         tView.setMaxWidth(CommonUtil.dip2px(ct, 100));
                         tView.getPaint().setFakeBoldText(true);//加粗
-                        tv.leftMargin = 10;
+                        tv.leftMargin = 30;
                         tv.rightMargin = 10;
                         tv.topMargin = 7;
                         tv.bottomMargin = 7;
                         tView.setTextSize(16);
-                        tView.setGravity(Gravity.RIGHT);
+                        tView.setGravity(Gravity.LEFT|Gravity.TOP);
+                        
+                        
                         tView.setText(map.get("caption").toString() + "");
                         tView.setLayoutParams(tv);
                         rLayout.addView(tView);
@@ -760,15 +761,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
                         rLayout.setLayoutParams(l);
                         ly.addView(rLayout);
-
-//						View line = new View(ct);
-//						LayoutParams v = new LayoutParams(
-//								LayoutParams.MATCH_PARENT, CommonUtil.dip2px(
-//										ct, 1));
-//						line.setLayoutParams(v);
-//						line.setBackgroundColor(getResources().getColor(
-//								R.color.lightgray));
-//						ly.addView(line);
+                        
 
                         ly.setBackgroundDrawable(ct.getResources().getDrawable(
                                 R.drawable.shape_linear_detail));
@@ -863,13 +856,13 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 protected void publishResults(CharSequence constraint,
                                               FilterResults results) {
                     data = (Map<String, Object>) results.values;
-                   // LogUtil.d("after:"+JSON.toJSONString(data));
                     rMap = data;
                     if (adapter.getCount() == 0) {
                         mEmptyLayout.showEmpty();
                     }
                     notifyDataSetChanged();
                     mlistview.getRefreshableView().setSelection(0);
+                    notifyDataSetChanged();
                 }
 
             };
@@ -881,133 +874,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     public void onClick(View v) {
     }
 
-    @SuppressWarnings("unchecked")
-//    public void clearRightMenuStatus() {
-//        for (int i = 0; i < rdata.size(); i++) {
-//            @SuppressWarnings("rawtypes")
-//            Iterator iter = rdata.get(i).entrySet().iterator();
-//            while (iter.hasNext()) {
-//                @SuppressWarnings("rawtypes")
-//                Map.Entry entry = (Map.Entry) iter.next();
-//                String key = (String) entry.getKey();
-//                if (key.equals("selected")) {
-//                    entry.setValue("所有");
-//                }
-//                if (key.equals("value")) {
-//                    entry.setValue(null);
-//                }
-//            }
-//        }
-//        if (radapter != null) {
-//            radapter.notifyDataSetChanged();
-//        }
-//    }
-
-//    public class CheckedChangeEvent implements CompoundButton.OnCheckedChangeListener {
-//
-//        @Override
-//        public void onCheckedChanged(CompoundButton buttonView,
-//                                     boolean isChecked) {
-//            switch (buttonView.getId()) {
-////			case R.id.cb_remember_condition:
-////				isCheckedRightMenu(isChecked);
-////				break;
-//                default:
-//                    break;
-//            }
-//        }
-//
-//    }
-
 
-    /**
-     * @注释：日期选择监听
-     */
-//    DatePickerDialog.OnDateSetListener DateSet = new DatePickerDialog.OnDateSetListener() {
-//
-//        @Override
-//        public void onDateSet(DatePicker view, int year, int monthOfYear,
-//                              int dayOfMonth) {
-//            // 每次保存设置的日期
-//            calendar.set(Calendar.YEAR, year);
-//            calendar.set(Calendar.MONTH, monthOfYear);
-//            calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-//            String date = new SimpleDateFormat("yyyy-MM-dd").format(calendar
-//                    .getTime());
-//            // String str = year + "-" + (monthOfYear + 1) + "-" + dayOfMonth;
-//            // ViewUtil.ToastMessage(getApplicationContext(), str+":"+date);
-//            for (int i = 0; i < rdata.size(); i++) {
-//                if (rdata.get(i).get("type").equals("condatefield")) {
-//                    rdata.get(i).put("selected", date);
-//                    rdata.get(i).put("value", date);
-//                }
-//            }
-//            radapter.notifyDataSetChanged();
-//        }
-//
-//    };
-
-//    public String getConditionForMap() {
-//        StringBuffer sBuffer = new StringBuffer();
-//        int size = 0;
-//        for (int j = 0; j < rdata.size(); j++) {
-//            if (rdata.get(j).get("value") != null) {
-//                if (!rdata.get(j).get("value").equals("所有")) {
-//                    size++;
-//                }
-//            }
-//        }
-//        int count = 0;
-//        for (int i = 0; i < rdata.size(); i++) {
-//            if (!"所有".equals(rdata.get(i).get("value"))
-//                    && rdata.get(i).get("value") != null) {
-//                /** @注释：想想为什么用size=count来判断是否属于最后一项 */
-//                count++;
-//                if (size == count) {
-//                    if (rdata.get(i).get("type").equals("condatefield")) {
-//                        /** @注释：日期格式 外面没有单引号 */
-//                        sBuffer.append("to_char(" + rdata.get(i).get("dbfield")
-//                                + ",'yyyy-mm-dd') =");
-//                        sBuffer.append("'" + rdata.get(i).get("value") + "'");
-//                    } else {
-//                        sBuffer.append(rdata.get(i).get("dbfield") + "=");
-//                        sBuffer.append("'" + rdata.get(i).get("value") + "'");
-//                    }
-//
-//                } else {
-//                    if (rdata.get(i).get("type").equals("condatefield")) {
-//                        /** @注释：日期格式 外面没有单引号 */
-//                        sBuffer.append("to_char(" + rdata.get(i).get("dbfield")
-//                                + ",'yyyy-mm-dd') =");
-//                        sBuffer.append("'" + rdata.get(i).get("value") + "'"
-//                                + " and ");
-//                    } else {
-//                        sBuffer.append(rdata.get(i).get("dbfield") + "=");
-//                        sBuffer.append("'" + rdata.get(i).get("value") + "'"
-//                                + " and ");
-//                    }
-//                }
-//
-//            }
-//        }
-//        System.out.println("筛选字段：" + sBuffer.toString());
-//        return sBuffer.toString();
-//    }
-//
-//    public Map<String, Object> getConditionKeyMap() {
-//        Map<String, Object> vMap = new HashMap<String, Object>();
-//        for (int i = 0; i < rdata.size(); i++) {
-//            if (!"所有".equals(rdata.get(i).get("value"))
-//                    && rdata.get(i).get("value") != null) {
-//                /** @注释：想想为什么用size=count来判断是否属于最后一项 */
-//                vMap.put(rdata.get(i).get("dbfield").toString(), rdata.get(i)
-//                        .get("value"));
-//
-//            }
-//        }
-//        return vMap;
-//    }
-//    
 
 
     public class StateBroadcast extends BroadcastReceiver {

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

@@ -114,8 +114,8 @@ public class ChangeMobileActivity extends BaseActivity {
         int actionTitle;
         if (type == 2) {
             actionTitle = R.string.supple_signin;
-            title = "补卡班次";
-            sumTag = "补卡理由";
+            title = "申诉班次";
+            sumTag = "申诉理由";
         } else {
             actionTitle = R.string.change_mobile;
             title = "手机mac地址";
@@ -146,7 +146,7 @@ public class ChangeMobileActivity extends BaseActivity {
         });
     }
 
-    /*申请补卡*/
+    /*申请申诉*/
     private void suppleSignin(String message) {
         progressDialog.show();
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/oa/saveAndSubmitMobileSignCard.action";
@@ -166,7 +166,7 @@ public class ChangeMobileActivity extends BaseActivity {
         params.put("ms_mobile", MyApplication.getInstance().mLoginUser.getTelephone());//手机号
         //班次时间:
 
-        params.put("ms_signtime", getTime(tag));//补卡时间
+        params.put("ms_signtime", getTime(tag));//申诉时间
         String formStore = StringUtils.mapToJson(params);
         param.put("formStore", formStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -6,6 +6,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 /**
  * @author :LiuJie 时间: 2015年3月10日 上午10:29:40
@@ -47,8 +48,29 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         }
     }
 
+
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        LogUtil.d("onUpgrade()");
+        db.execSQL("DROP TABLE IF EXISTS HRORGS");
+        db.execSQL("DROP TABLE IF EXISTS EMPLOYEES");
+        db.execSQL("DROP TABLE IF EXISTS empdate");
+        db.execSQL("DROP TABLE IF EXISTS B2BMSG");
+        db.execSQL("DROP TABLE IF EXISTS Signin");
+        db.execSQL("DROP TABLE IF EXISTS SubscriptionMessage");
+        db.execSQL("DROP TABLE IF EXISTS submessage");
+        db.execSQL("DROP TABLE IF EXISTS AllSubs");
+        db.execSQL("DROP TABLE IF EXISTS MySubs");
+        db.execSQL("DROP TABLE IF EXISTS mission");
+        db.execSQL("DROP TABLE IF EXISTS error_mag");
+        db.execSQL("DROP TABLE IF EXISTS Signin");
+        db.execSQL("DROP TABLE IF EXISTS signing");
+        db.execSQL("DROP TABLE IF EXISTS workdata");
+        onCreate(db);
+    }
+    @Override
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        LogUtil.d("onDowngrade()");
         db.execSQL("DROP TABLE IF EXISTS HRORGS");
         db.execSQL("DROP TABLE IF EXISTS EMPLOYEES");
         db.execSQL("DROP TABLE IF EXISTS empdate");
@@ -65,7 +87,6 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS workdata");
         onCreate(db);
     }
-
 
     /**
      * 删除数据库

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

@@ -408,19 +408,24 @@ public class ViewUtil {
                     break;
                 case Constants.SUCCESS_ERP:
                     String result = msg.getData().getString("result");
-                    if (new JsonValidator().validate(result)) {
-                        boolean success = JSON.parseObject(result).getBoolean("success");
-                        if (success) {
-                            Intent intent = new Intent("com.app.home.update");
-                            intent.putExtra("falg", "home");
-                            ct.sendBroadcast(intent);
-                            ChangeStatusERP(msg.getData().getString("result"));
+                    try {
+                        if (new JsonValidator().validate(result)&&result!=null) {
+                            boolean success = JSON.parseObject(result).getBoolean("success");
+                            if (success) {
+                                Intent intent = new Intent("com.app.home.update");
+                                intent.putExtra("falg", "home");
+                                ct.sendBroadcast(intent);
+                                ChangeStatusERP(msg.getData().getString("result"));
+                            } else {
+                                String reason = JSON.parseObject(result).getString("reason");
+                                ToastMessage(ct, reason, Style.holoGreenLight, 3000);
+                            }
                         } else {
-                            String reason = JSON.parseObject(result).getString("reason");
-                            ToastMessage(ct, reason, Style.holoGreenLight, 3000);
+                            ToastMessage(ct, "接口数据非法！", Style.holoRedLight, 3000);
                         }
-                    } else {
-                        ToastMessage(ct, "接口数据非法！", Style.holoRedLight, 3000);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        ToastMessage(ct, "登录失败，请重新登录！", Style.holoRedLight, 3000);
                     }
                     break;
                 case Constants.SUCCESS_B2B:

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/crouton/Crouton.java

@@ -182,11 +182,11 @@ public final class Crouton {
     }
 
     public static void makeText(Context ct, int id) {
-        makeText((Activity) ct, id, ct.getResources().getColor(R.color.light_green), 1000).show();
+        makeText((Activity) ct, id, Style.holoGreenLight, 1000).show();
     }
 
     public static void makeText(Context ct, int id, int time) {
-        makeText((Activity) ct, id, ct.getResources().getColor(R.color.light_green), time).show();
+        makeText((Activity) ct, id, Style.holoGreenLight, time).show();
     }
 
     public static void showToast(Context ct, int id, int color) {
@@ -201,7 +201,7 @@ public final class Crouton {
 
     public static void makeText(Context ct, String message) {
         try {
-            makeText((Activity) ct, message, ct.getResources().getColor(R.color.light_green), 1000).show();
+            makeText((Activity) ct, message, Style.holoGreenLight, 1000).show();
         } catch (Exception e) {
 
         }
@@ -209,7 +209,7 @@ public final class Crouton {
 
     public static void makeText(Context ct, String message, int time) {
         makeText((Activity) ct, message,
-                ct.getResources().getColor(R.color.light_green), time).show();
+                Style.holoGreenLight, time).show();
     }
 
     /**

WeiChat/src/main/res/layout/act_sale_select_list.xml

@@ -99,7 +99,8 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_sale_list"
         style="@style/ListViewdoc"
-       
+        android:scrollingCache="false"
+        android:layerType="software"
         android:background="@color/Transpant"
         android:layout_below="@id/view_v1"/>
 

WeiChat/src/main/res/layout/activity_business_detail_info.xml

@@ -353,7 +353,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" 
+                android:padding="10dp"
+                android:text="阶段要求"
+                android:textColor="@color/black"/>
             <com.xzjmyk.pm.activity.view.stickylistheaders.StickyListHeadersListView
                 android:id="@+id/lv_business"
                 android:layout_width="match_parent"

WeiChat/src/main/res/layout/activity_business_less.xml

@@ -50,7 +50,10 @@
                 android:padding="5dp" />
         </LinearLayout>
 
-        <LinearLayout style="@style/LinearLayout_horizontal">
+        <LinearLayout 
+            android:id="@+id/ll_date"
+            android:visibility="gone"
+            style="@style/LinearLayout_horizontal">
 
             <TextView
                 style="@style/TextView_Basic"
@@ -84,7 +87,7 @@
                 android:background="@drawable/shape_from_edit"
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:padding="5dp"
-                android:text="未分配" />
+                android:hint="请选择(必填)" />
         </LinearLayout>
         
         <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -37,8 +37,6 @@
                 android:id="@+id/et_cu_code"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                android:focusable="false"
-                android:focusableInTouchMode="false"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 

WeiChat/src/main/res/layout/activity_data_form_detail.xml

@@ -16,8 +16,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:dividerHeight="0.1dp"
-                android:scrollingCache="false"
-                android:layerType="software"
                 android:listSelector="@color/transparent"
                 android:divider="@color/item_line"/>
             <LinearLayout

WeiChat/src/main/res/layout/listitem_businessless_edit.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-   
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-  
     <LinearLayout
         android:id="@+id/ll_moment"
         android:background="@color/white"
+        android:layout_height="50dp"
+        android:maxHeight="80dp"
         style="@style/LinearLayout_horizontal">
-
         <TextView
             android:id="@+id/tv_less_key"
             style="@style/TextView_Basic"
@@ -25,13 +24,14 @@
             style="@style/TextView_Basic"
             android:maxWidth="260dp"
             android:minWidth="240dp"
+            android:maxHeight="80dp"
+            android:layout_height="match_parent"
             android:textSize="16sp"
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
-            android:layout_margin="10dp"
             android:background="@null"
-            android:padding="4dp"
-            android:gravity="right"
+            android:gravity="right|center"
+            android:padding="10dp"
             android:hint="必填" />
     </LinearLayout>
 </LinearLayout>

WeiChat/src/main/res/menu/menu_signin_set.xml

@@ -1,33 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
     <item
         android:id="@+id/oa_signin_set"
         android:title="编辑模板"
         app:showAsAction="always" />
     <item
         android:id="@+id/oa_leave"
-        android:title="列表"
+        android:title=""
         android:icon="@drawable/xlist"
         app:showAsAction="ifRoom"  />
-<!--    <item
-        android:id="@+id/oa_leave0"
-        android:title="请假单"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/oa_leave1"
-        android:title="出差单"
-        app:showAsAction="never" />
 
-    <item
-        android:id="@+id/oa_leave2"
-        android:title="加班单"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/oa_leave3"
-        android:title="特殊考勤"
-        app:showAsAction="never"/>-->
 </menu>

WeiChat/src/main/res/values/strings.xml

@@ -55,7 +55,7 @@
     <string name="submit">提交</string>
     <string name="unoffice"><u>地点微调</u></string>
     <string name="change_mobile">打卡设备变更单</string>
-    <string name="supple_signin">补卡申请</string>
+    <string name="supple_signin">申诉申请</string>
     <string name="play_phone">拨打电话</string>
     <string name="send_mail">发送短信</string>
     <string name="add_plan">请添加工作计划!</string>