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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

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

@@ -269,13 +269,14 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                 switch (tab_type) {
                     case 1:
                         title = "待审批";
-                        if ("transferprocess".equals(model.typecode)||"process".equals(model.typecode) || "".equals(model.typecode)) {
-                            url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID;
-                        } else if ("procand".equals(model.typecode)) {
-                            url = "jsps/mobile/jprocand.jsp?nodeId=" + model.JP_NODEID;
-                        } else if ("unprocess".equals(model.typecode)) {
-                            url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID + "%26_do=1";
-                        }
+                        String codeValue=model.codeValue;
+//                        if ("transferprocess".equals(model.typecode)||"process".equals(model.typecode) || "".equals(model.typecode)) {
+//                            url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID;
+//                        } else if ("procand".equals(model.typecode)) {
+//                            url = "jsps/mobile/jprocand.jsp?nodeId=" + model.JP_NODEID;
+//                        } else if ("unprocess".equals(model.typecode)) {
+//                            url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID + "%26_do=1";
+//                        }
 
                         break;
                     case 2:
@@ -376,22 +377,20 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
 
 
     private void loadProcessToDo(int page) {
-//        progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getAuditTodo;
         Map<String, Object> params = new HashMap<>();
-        params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),""));
-        params.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),""));
+        params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu"));
+        params.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"companyEnUu"));
         params.put("count", "10");
         params.put("page", "1");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie",ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, SUSSCESS_un, null, null, "get");
 
     }
 
 
     private void loadProcesstoAlreadyDo(int page) {
-        //       progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/process/alreadyDo.action";
         Map<String, Object> params = new HashMap<>();
         params.put("count", String.valueOf(page*30));
@@ -405,7 +404,6 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     }
 
     private void loadProcessAlreadyLaunch(int page) {
-        //      progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/process/alreadyLaunch.action";
         Map<String, Object> params = new HashMap<>();
         params.put("count", String.valueOf(page*30));
@@ -480,19 +478,24 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
 
             switch (tab_type) {
                 case 1:
-                    //JP_LAUNCHERNAME
-                    //JP_NAME
-                    //JP_STATUS
-                    //JP_LAUNCHTIME
-                    String jp_launchername = jsonArray.getJSONObject(position).getString("JP_LAUNCHERNAME");
-                    String jp_name = jsonArray.getJSONObject(position).getString("JP_NAME");
+//                    "jp_codevalue":109,
+//                        "jp_id":32,
+//                        "jp_launcherid":1000009169,
+//                        "jp_launchtime":1489739755313,
+//                        "jp_name":"请假单",
+//                        "jp_nodedealman":1000002802,
+//                        "jp_nodeid":181,
+//                        "jp_nodename":"移动测试员审批节点",
+//                        "typecode":"ENTERING"
+                    String jp_launchername = jsonArray.getJSONObject(position).getString("jp_launcherid");
+                    String jp_name = jsonArray.getJSONObject(position).getString("jp_name");
                     String JP_NODEID = jsonArray.getJSONObject(position).getString("JP_NODEID");
                     if (!StringUtils.isEmpty(jp_name)) jp_name = jp_name.replace("流程", "");
-                    Long jp_launchtime = jsonArray.getJSONObject(position).getLong("JP_LAUNCHTIME");
-                    String jp_status = jsonArray.getJSONObject(position).getString("JP_STATUS");
-                    String jp_typecode = jsonArray.getJSONObject(position).getString("TYPECODE");
+                    Long jp_launchtime = jsonArray.getJSONObject(position).getLong("jp_launchtime");
+                    String jp_status = "待审批";
+                    String jp_typecode = jsonArray.getJSONObject(position).getString("typecode");
                     String jp_master=jsonArray.getJSONObject(position).getString("CURRENTMASTER");
-
+                    String codevalue=jsonArray.getJSONObject(position).getString("jp_codevalue");
 
                     model.name.setText(jp_launchername + "的" + jp_name);
                     if (jp_launchtime != null) {
@@ -505,7 +508,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     model.JP_NODEID = JP_NODEID;
                     model.typecode = jp_typecode;
                     model.master=jp_master;
-
+                    model.codeValue=codevalue;
                     break;
                 case 2:
                     //JN_DEALMANNAME
@@ -658,6 +661,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
         }
 
         class ViewModel {
+            String codeValue;
             TextView name;
             TextView date;
             TextView status;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -58,6 +58,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.NoticeMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessB2BActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MsgsSecondCommonActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
@@ -87,6 +88,8 @@ import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -399,8 +402,11 @@ public class MessageFragment extends EasyFragment implements RecognizerDialogLis
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.schedule_rl:
-                    // startActivity(new Intent(mActivity, ScheduleActivity.class));
-                    startActivity(new Intent(mActivity, ProcessMsgActivity.class));
+                    if (ApiUtils.getApiModel() instanceof ApiPlatform){
+                        startActivity(new Intent(mActivity, ProcessB2BActivity.class));
+                    }else{
+                        startActivity(new Intent(mActivity, ProcessMsgActivity.class));
+                    }
                     break;
                 case R.id.task_rl:
                     startActivity(new Intent(mActivity, TaskActivity.class));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/NewMessageFragment.java

@@ -30,6 +30,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.NoticeMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessB2BActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MessageAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
@@ -260,7 +261,11 @@ public class NewMessageFragment extends EasyFragment implements IMessageView, Re
                 startActivity(new Intent(Settings.ACTION_SETTINGS));
                 break;
             case R.id.schedule_rl://审批流
-                startActivity(new Intent(mContext, ProcessMsgActivity.class));
+                if (ApiUtils.getApiModel() instanceof ApiPlatform){
+                    startActivity(new Intent(mContext, ProcessB2BActivity.class));
+                }else{
+                    startActivity(new Intent(mContext, ProcessMsgActivity.class));
+                }
                 break;
             case R.id.waitting_work_rl://待办工作
                 startActivity(new Intent(mContext, TaskActivity.class));