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

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java

@@ -132,49 +132,45 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowStatus.setText("已审批");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
-
-                    //当已审批时判断有没有审批语
-                    if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                        viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
-                        final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
-                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-                            //点击查看详细批语
-                            @Override
-                            public void onClick(View v) {
-                                new AlertDialog
-                                        .Builder(mContext)
-                                        .setTitle("审批语详情")
-                                        .setMessage("\t" + des_msg)
-                                        .setPositiveButton("确定", null)
-                                        .show();
-                            }
-                        });
-                    } else {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
-                        viewHolder.AppFlowDescriptiontv.setText("");
-                    }
                 } else if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult().equals("不同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("不同意");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
                 }
-
+                //当已审批时判断有没有审批语
+                if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                    viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
+                    final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
+                    viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                        //点击查看详细批语
+                        @Override
+                        public void onClick(View v) {
+                            new AlertDialog
+                                    .Builder(mContext)
+                                    .setTitle("审批语详情")
+                                    .setMessage("\t" + des_msg)
+                                    .setPositiveButton("确定", null)
+                                    .show();
+                        }
+                    });
+                } else {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
+                    viewHolder.AppFlowDescriptiontv.setText("");
+                }
             } else if (position == (datanum - nodesnum - 1) ) { //当前待处理的节点（nodes里面将要统计的数据）
                 if (mCommonApprovalFlowBean.getNodes().get(datanum -position -2).getJn_dealResult().equals("同意")) {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("待审批");
-                    viewHolder.AppFlowTime.setText("");
-                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                 }else {
-                    if (position == datanum - nodesnum -1){
-                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-                        viewHolder.AppFlowStatus.setText("");
-                    }
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowStatus.setText("");
                 }
+                viewHolder.AppFlowTime.setText("");
+                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
             } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
                 viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -136,48 +136,45 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
 
-                    //当已审批时判断有没有审批语
-                    if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                        viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
-                        final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
-                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-                            //点击查看详细批语
-                            @Override
-                            public void onClick(View v) {
-                                new AlertDialog
-                                        .Builder(mContext)
-                                        .setTitle("审批语详情")
-                                        .setMessage("\t" + des_msg)
-                                        .setPositiveButton("确定", null)
-                                        .show();
-                            }
-                        });
-                    } else {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
-                        viewHolder.AppFlowDescriptiontv.setText("");
-                    }
                 } else if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult().equals("不同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("不同意");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
                 }
-
+                //当已审批时判断有没有审批语
+                if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                    viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
+                    final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
+                    viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                        //点击查看详细批语
+                        @Override
+                        public void onClick(View v) {
+                            new AlertDialog
+                                    .Builder(mContext)
+                                    .setTitle("审批语详情")
+                                    .setMessage("\t" + des_msg)
+                                    .setPositiveButton("确定", null)
+                                    .show();
+                        }
+                    });
+                } else {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
+                    viewHolder.AppFlowDescriptiontv.setText("");
+                }
             } else if (position == (datanum - nodesnum - 1) ) { //当前待处理的节点（nodes里面将要统计的数据）
                 if (mCommonApprovalFlowBean.getNodes().get(datanum -position -2).getJn_dealResult().equals("同意")) {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("待审批");
-                    viewHolder.AppFlowTime.setText("");
-                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                 }else {
-                    if (position == datanum - nodesnum -1){
-                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-                        viewHolder.AppFlowStatus.setText("");
-                    }
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowStatus.setText("");
                 }
+                viewHolder.AppFlowTime.setText("");
+                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
             } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
                 viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatComAfAdapter.java

@@ -132,56 +132,35 @@ public class PlatComAfAdapter extends BaseAdapter{
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
                     viewHolder.AppFlowTime.setText(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_dealTime());
 
-                    //当已审批时判断有没有审批语
-                    if (mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                        viewHolder.AppFlowDescriptiontv.setText("( " + mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
-                        final String des_msg = mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
-                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-                            //点击查看详细批语
-                            @Override
-                            public void onClick(View v) {
-                                new AlertDialog
-                                        .Builder(mContext)
-                                        .setTitle("审批语详情")
-                                        .setMessage("\t" + des_msg)
-                                        .setPositiveButton("确定", null)
-                                        .show();
-                            }
-                        });
-                    } else {
-                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
-                        viewHolder.AppFlowDescriptiontv.setText("");
-                    }
                 }else if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_result()) &&
                         mPlatComAfBean.getNodes().get(datanum -position -1).getJn_result().equals("不同意")){
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("不同意");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
                     viewHolder.AppFlowTime.setText(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_dealTime());
+                }
 
-//                    if (mPlatComAfBean.getNodes().get(datanum - position -1).getJn_nodeDescription() != null){
-//                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-//                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-//                        viewHolder.AppFlowDescriptiontv.setText("( " + mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
-//                        final String des_msg = mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
-//                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-//                            //点击查看详细批语
-//                            @Override
-//                            public void onClick(View v) {
-//                                new AlertDialog
-//                                        .Builder(mContext)
-//                                        .setTitle("审批语详情")
-//                                        .setMessage("\t" + des_msg)
-//                                        .setPositiveButton("确定", null)
-//                                        .show();
-//                            }
-//                        });
-//                    } else {
-//                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
-//                        viewHolder.AppFlowDescriptiontv.setText("");
-//                    }
+                //当已审批时判断有没有审批语
+                if (mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                    viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowDescriptiontv.setText("( " + mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
+                    final String des_msg = mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
+                    viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                        //点击查看详细批语
+                        @Override
+                        public void onClick(View v) {
+                            new AlertDialog
+                                    .Builder(mContext)
+                                    .setTitle("审批语详情")
+                                    .setMessage("\t" + des_msg)
+                                    .setPositiveButton("确定", null)
+                                    .show();
+                        }
+                    });
+                } else {
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
+                    viewHolder.AppFlowDescriptiontv.setText("");
                 }
             }else if (position == (datanum - nodesnum -1)){//当前待处理的节点（nodes里面将要统计的数据）
                 if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_result()) &&
@@ -189,14 +168,12 @@ public class PlatComAfAdapter extends BaseAdapter{
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("待审批");
-                    viewHolder.AppFlowTime.setText("");
-                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                 }else {
-                    if (position == datanum - nodesnum -1){
-                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-                        viewHolder.AppFlowStatus.setText("");
-                    }
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowStatus.setText("");
                 }
+                viewHolder.AppFlowTime.setText("");
+                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
             }else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
                 viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java

@@ -118,7 +118,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
             case R.id.me_QRcode:
                 ImageView imageView = new ImageView(ct);
                 imageView.setImageResource(R.drawable.ic_uu_scan_code);
-                MaterialDialog materialDialog = new MaterialDialog.Builder(ct)
+                new MaterialDialog.Builder(ct)
                         .title("UU互联最新版二维码\n长按可识别")
                         .customView(imageView, false)
                         .titleGravity(GravityEnum.CENTER)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -154,11 +154,10 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
                         ViewUtil.ShowMessageTitle(ct, "保存成功！");
-                        mhandler.postDelayed(new Runnable() {
-
+                        new Handler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                onBackPressed();
+                                finish();
                             }
                         }, 1000);
                     } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -669,7 +669,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == 0x17 || (requestCode == 0x20 && resultCode == 0x20)) {
-            refreshing();
+//            refreshing();
+            sendResquestForServer("", 2);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -301,7 +301,8 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                             "}";
                     String gridStore = "{\n" +
                             "\"taskid\":\"" + taskId + "\",\n" +//单据id
-                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+//                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname") + "\",\n" +//个人名字
                             "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
                             "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
                             "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU
@@ -325,7 +326,8 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                             "}";
                     String gridStore = "{\n" +
                             "\"taskid\":\"" + taskId + "\",\n" +//单据id
-                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+//                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname") + "\",\n" +//个人名字
                             "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
                             "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
                             "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU