合并代码

WeiChat/src/main/AndroidManifest.xml

@@ -220,6 +220,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
+            android:hardwareAccelerated="false"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <!-- 消息模块 -->
         <activity android:name=".ui.message.ChatActivity" />

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

@@ -1,7 +1,11 @@
 package com.xzjmyk.pm.activity.adapter;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Resources;
+import android.net.Uri;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -9,6 +13,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
@@ -87,63 +93,85 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         //ToDo 日报详情审批流过程显示，逻辑比较繁琐
 
         //获取 已审批节点数量 和总审批节点数
-        int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+        final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        if (im_ids != null && im_ids.get(position).equals("")) {
-            viewHolder.AppFlowPhoto.setImageResource(R.drawable.common_header_boy);
+        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
+        if (im_ids != null && im_ids.get(getCount() - position - 1).equals("")) {
+
+            Resources r = mContext.getResources();
+            String url = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+                    + r.getResourcePackageName(R.drawable.common_header_boy) + "://"
+                    + r.getResourceTypeName(R.drawable.common_header_boy) + "://"
+                    + r.getResourceEntryName(R.drawable.common_header_boy)).toString();
+            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
+            Log.i("imurl", url);
+
         } else {
-//            AvatarHelper.getInstance().displayAvatar(im_ids.get(position), viewHolder.AppFlowPhoto, false);
-            AvatarHelper.getInstance().display(im_ids.get(position),viewHolder.AppFlowPhoto,true,false);  //显示圆角图片
+//            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
+            AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1),viewHolder.AppFlowPhoto,true,false);//显示圆角图片
+
         }
 
+        // 审批流倒序排列
         if (nodesnum == 0) {
-            if (position == 0) {
+            if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
+                    .equals(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODENAME())) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             } else {
+                viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
             }
-        } else if ((nodesnum > 0 && position < nodesnum) || (nodesnum == 1 && datanum == 1)) {
-            if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")) {
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                viewHolder.AppFlowStatus.setText("已审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
-
-            } else if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("不同意")) {
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("不同意");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
-            }
-
-            //当有审批时判断有没有审批语
-            if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult() != null &&
-                    mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription() != null) {
-                viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
-                viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString() + " )");
-                viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
-                    //点击查看详细批语
-                    @Override
-                    public void onClick(View v) {
-                        new AlertDialog
-                                .Builder(mContext)
-                                .setTitle("审批语详情")
-                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString())
-                                .setPositiveButton("确定", null)
-                                .show();
+        } else {
+            if (position > (datanum - nodesnum - 1)) {
+                if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowStatus.setText("已审批");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+
+                    final int i = position - (datanum - nodesnum);
+                    //当有审批时判断有没有审批语
+                    if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult() != null &&
+                            mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription() != null) {
+                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                        viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription().toString() + " )");
+                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                            //点击查看详细批语
+                            @Override
+                            public void onClick(View v) {
+                                new AlertDialog
+                                        .Builder(mContext)
+                                        .setTitle("审批语详情")
+                                        .setMessage("\t" + mCommonApprovalFlowBean.getNodes().get(i).getJn_nodeDescription().toString())
+                                        .setPositiveButton("确定", null)
+                                        .show();
+                            }
+                        });
+                    }
+                } else if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("不同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    viewHolder.AppFlowStatus.setText("不同意");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+                }
+
+            }else {
+                if (position == (datanum - nodesnum)){
+                    if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")){
+                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                        viewHolder.AppFlowStatus.setText("待审批");
                     }
-                });
+                }else {
+                    viewHolder.AppFlowStatus.setText("");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowTime.setText("");
+                }
             }
-            //当审批节点为待审批时
-        }else if (nodesnum > 0 && nodesnum < datanum && position == nodesnum){
-            viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-            viewHolder.AppFlowStatus.setText("待审批");
         }
         return convertView;
     }

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

@@ -96,11 +96,11 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         //ToDo 日报详情审批流过程显示，逻辑比较繁琐
 
         //获取 已审批节点数量 和总审批节点数
-        int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+        final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        if (im_ids != null && im_ids.get(position).equals("")) {
+        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
+        if (im_ids != null && im_ids.get(getCount() - position - 1).equals("")) {
 
             Resources r = mContext.getResources();
             String url = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
@@ -112,19 +112,76 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
 
         } else {
 //            ImageLoader.getInstance().displayImage(url, viewHolder.AppFlowPhoto, MyApplication.mAvatarRoundImageOptions);
-            AvatarHelper.getInstance().display(im_ids.get(position),viewHolder.AppFlowPhoto,true,false);//显示圆角图片
+            AvatarHelper.getInstance().display(im_ids.get(getCount() - position - 1),viewHolder.AppFlowPhoto,true,false);//显示圆角图片
 
         }
 
+       // 审批流倒序排列
         if (nodesnum == 0) {
-            if (position == 0) {
+            if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
+                    .equals(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODENAME())) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             } else {
+                viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
             }
-        } else if ((nodesnum > 0 && position < nodesnum) || (nodesnum == 1 && datanum == 1)) {
+        } else {
+            if (position > (datanum - nodesnum - 1)) {
+                if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    viewHolder.AppFlowStatus.setText("已审批");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+
+                    final int i = position - (datanum - nodesnum);
+                    //当有审批时判断有没有审批语
+                    if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult() != null &&
+                            mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription() != null) {
+                        viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
+                        viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                        viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_nodeDescription().toString() + " )");
+                        viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
+                            //点击查看详细批语
+                            @Override
+                            public void onClick(View v) {
+                                new AlertDialog
+                                        .Builder(mContext)
+                                        .setTitle("审批语详情")
+                                        .setMessage("\t" + mCommonApprovalFlowBean.getNodes().get(i).getJn_nodeDescription().toString())
+                                        .setPositiveButton("确定", null)
+                                        .show();
+                            }
+                        });
+                    }
+                } else if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealResult().equals("不同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    viewHolder.AppFlowStatus.setText("不同意");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum)).getJn_dealTime());
+                }
+
+            }else {
+                if (position == (datanum - nodesnum)){
+                    if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")){
+                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                        viewHolder.AppFlowStatus.setText("待审批");
+                    }
+                }else {
+                    viewHolder.AppFlowStatus.setText("");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                    viewHolder.AppFlowTime.setText("");
+                }
+            }
+        }
+
+
+
+        /*
+        审批流顺序排列
+        if ((nodesnum > 0 && position > nodesnum-1 && position < datanum) || (nodesnum == 1 && datanum == 1)) {
             if (mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult().equals("同意")) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                 viewHolder.AppFlowStatus.setText("已审批");
@@ -136,6 +193,10 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                 viewHolder.AppFlowStatus.setText("不同意");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                 viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
+            }else {
+                viewHolder.AppFlowStatus.setText("");
+                viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                viewHolder.AppFlowTime.setText("");
             }
 
             //当有审批时判断有没有审批语
@@ -144,6 +205,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                 viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
                 viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                 viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString() + " )");
+                final int finalPosition = position;
                 viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
                     //点击查看详细批语
                     @Override
@@ -151,7 +213,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                         new AlertDialog
                                 .Builder(mContext)
                                 .setTitle("审批语详情")
-                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString())
+                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(finalPosition).getJn_nodeDescription().toString())
                                 .setPositiveButton("确定", null)
                                 .show();
                     }
@@ -162,7 +224,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
             viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
             viewHolder.AppFlowStatus.setText("待审批");
-        }
+        }*/
         return convertView;
     }
 

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

@@ -43,6 +43,8 @@ import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
 import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.HtmlUtils;
@@ -319,6 +321,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.praise_rl = (RelativeLayout) convertView.findViewById(R.id.praise_rl);
             viewHolder.img_praise_top = (ImageView) convertView.findViewById(R.id.img_praise_top);
             viewHolder.img_praise_line = convertView.findViewById(R.id.img_praise_line);
+            viewHolder.daily_share_tv = (TextView) convertView.findViewById(R.id.daily_share_tv);
             if (innerView != null) {
                 viewHolder.content_fl.addView(innerView);
             }
@@ -380,11 +383,19 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         boolean isForwarding = message.getSource() == PublicMessage.SOURCE_FORWARDING;
 
         // 设置body_tv
-        if (TextUtils.isEmpty(body.getText())) {
+        if (TextUtils.isEmpty(body.getText().toString())) {
             viewHolder.body_tv.setVisibility(View.GONE);
         } else {
             viewHolder.body_tv.setVisibility(View.VISIBLE);
+            if(body.getText().contains("我也去分享")){
+                viewHolder.daily_share_tv.setVisibility(View.VISIBLE);
+                viewHolder.daily_share_tv.setTextColor(mContext.getResources().getColor(R.color.approval));
+                viewHolder.daily_share_tv.setText("[来自:工作日报>工作心得分享]");
+            }else{
+                viewHolder.daily_share_tv.setVisibility(View.GONE);
+            }
             viewHolder.body_tv.setText(body.getText());
+
         }
         viewHolder.body_tv.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
@@ -393,6 +404,15 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
                 return true;
             }
         });
+        viewHolder.daily_share_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(finalHolder.body_tv.getText().toString().contains("(我也去分享)")){
+                    Intent intent = new Intent(mContext, WorkDailyAddActivity.class);
+                    mContext.startActivity(intent);
+                }
+            }
+        });
 
         // 设置发布时间
         viewHolder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(mContext, (int) message.getTime()));
@@ -626,6 +646,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         ImageView img_praise_top;
         View img_praise_line;
         TextView location_tv;//地理位置信息
+        TextView daily_share_tv; //分享
     }
 
     /* 普通的Text */

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -108,6 +108,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 
 //       ToastUtil.addEditTextNumChanged(SendShuoshuoActivity.this, mTextEdit, 200);//这里复制粘贴过多字数会在有些机型上出现bug
         mGridView.setAdapter(mAdapter);
+
+
         //判是否有从工作日报心得传来数据
         final  Intent intent = getIntent();
         dailyexperience = intent.getStringExtra("Experience");
@@ -235,7 +237,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         params.put("visible", "3");
 
         if(!TextUtils.isEmpty(dailyexperience)){
-            params.put("text", mTextEdit.getText().toString()+"\n\n[来自:工作日报>工作心得分享]");// 消息内容
+//            params.put("text", mTextEdit.getText().toString()+"\n\n[来自:工作日报>工作心得分享]");// 消息内容
+            params.put("text", mTextEdit.getText().toString()+"\t(我也去分享)\n\n");
         }else{
             params.put("text", mTextEdit.getText().toString());// 消息内容
         }
@@ -286,8 +289,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                     setResult(RESULT_OK, intent);
 
                     if(!TextUtils.isEmpty(dailyexperience)){
-                        //Toast.makeText(getApplication(),"工作心得分享成功，稍后可到工作圈查看",Toast.LENGTH_LONG).show();
-                        //ToastMessage("工作心得分享成功，稍后可到工作圈查看");
                        new AlertDialog
                                .Builder(mContext)
                                .setCancelable(false)  //设置点击对话框之外的对话框不消失

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
+import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
@@ -46,16 +47,19 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private TextView section_tv;
     private TextView status_tv;
     private MyListView appflow_lv;
-    private int mkeyValue;
-    private String mCaller;
     private int mNoc = 1;
     private final static int COMMON_DOC_AF_REQUEST = 1101;
     private final static int COMMON_DOC_MSG_REQUEST = 1102;
     private EmptyLayout mEmptyLayput_approvalflow;
     private CommonDocApprovalFlowAdapter mCommonDocApprovalFlowAdapter;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
+    private CommonDocAMBean mCommonDocAMBean;
     private DBManager manager;
     private List<String> im_ids;
+    private int mkeyValue;
+    private String mCaller;
+    private MyListView apply_msg;
+    private EmptyLayout mEmptyLayput_applymsg;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -72,12 +76,19 @@ public class CommonDocDetailsActivity extends BaseActivity {
         section_tv = (TextView) findViewById(R.id.common_docui_Section_tv);
         status_tv = (TextView) findViewById(R.id.common_docui_status_tv);
         appflow_lv = (MyListView) findViewById(R.id.common_docui_approval_flow_lv);
+        apply_msg = (MyListView) findViewById(R.id.common_docui_apply_msg_lv);
+
+        mEmptyLayput_applymsg = new EmptyLayout(this,apply_msg);
+        mEmptyLayput_applymsg.setShowEmptyButton(false);
+        mEmptyLayput_applymsg.setShowErrorButton(false);
+        mEmptyLayput_applymsg.setShowLoadingButton(false);
+        //加载申请信息适配器
 
-        //加载审批流的适配器
         mEmptyLayput_approvalflow = new EmptyLayout(this, appflow_lv);
         mEmptyLayput_approvalflow.setShowEmptyButton(false);
         mEmptyLayput_approvalflow.setShowErrorButton(false);
         mEmptyLayput_approvalflow.setShowLoadingButton(false);
+        //加载审批流的适配器
         mCommonApprovalFlowBean = new CommonApprovalFlowBean();
         mCommonDocApprovalFlowAdapter = new CommonDocApprovalFlowAdapter(this);
 
@@ -159,20 +170,28 @@ public class CommonDocDetailsActivity extends BaseActivity {
      * @param msg_result
      */
     public void AMshow(String msg_result){
+        try{
+            JSONObject amresultJsonObject = new JSONObject(msg_result);
+            if (amresultJsonObject == null){
 
+            }
+
+        }catch (JSONException e){
+            e.printStackTrace();
+        }
     }
     /**
      * 处理请求审批流url后获取到的数据并显示
-     * @param result
+     * @param af_result
      */
-    public void AFshow(String result){
+    public void AFshow(String af_result){
         try{
-            JSONObject resultJsonObject = new JSONObject(result);
+            JSONObject afresultJsonObject = new JSONObject(af_result);
             //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
-            if(resultJsonObject == null){
+            if(afresultJsonObject == null){
                 mEmptyLayput_approvalflow.showEmpty();
             }else{
-                mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
+                mCommonApprovalFlowBean = JSON.parseObject(afresultJsonObject.toString(), CommonApprovalFlowBean.class);
                 LogUtil.prinlnLongMsg("mCommonApprovalFlowBean",mCommonApprovalFlowBean.toString());
 
 
@@ -189,21 +208,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             im_ids.add("");
                             String str[] = emCode.split(",");
                             emCode = str[0];
-                            ToastMessage("审批流多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
-                            String[] selectionArgs = {emCode, whichsys};
-                            String selection = "em_code=? and whichsys=? ";
-                            //获取数据库数据
-                            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
-                            if (bean != null) {
-                                String imId = String.valueOf(bean.getEm_IMID());
-                                Log.i("todo", "imId=" + imId);
-                                im_ids.add(imId);
-                            }else {
-                                im_ids.add("");
-                                  ToastMessage("审批流头像获取异常，已显示为默认");
-                            }
-                        }else {
-
+                            ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
+                        }
                             String[] selectionArgs = {emCode, whichsys};
                             String selection = "em_code=? and whichsys=? ";
                             //获取数据库数据
@@ -216,9 +222,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 im_ids.add("");
                                   ToastMessage("审批流头像获取异常，已显示为默认");
                             }
-                        }
-
-
                     }
                 }
                 Log.i("imids",im_ids.toString());
@@ -232,6 +235,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         }
 
 
+
         //申请人头像、姓名、部门、审批状态信息显示 目前是从已审批url获取到的em_code
         if (mCommonApprovalFlowBean.getNodes().size() > 0){
             String em_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();   //申请人编号 从process获取

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

@@ -252,13 +252,13 @@ public class NewsTwoActivity extends BaseActivity {
                 model = (ItemModel) convertView.getTag();
             }
 
-            if (position % 2 == 0) {
+            /*if (position % 2 == 0) {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
 
             } else {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
 
-            }
+            }*/
 //			model.tv_title.setText(datas.get(position).getNE_THEME());
             model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
                     newsDataList.get(position).getNE_RELEASEDATE()));

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

@@ -187,11 +187,11 @@ public class NoticeMenuActivity extends BaseActivity {
             } else {
                 holder = (MViewHolder) view.getTag();
             }
-            if (i % 2 == 0) {
+            /*if (i % 2 == 0) {
                 view.setBackgroundColor(getResources().getColor(R.color.item_color1));
             } else {
                 view.setBackgroundColor(getResources().getColor(R.color.item_color2));
-            }
+            }*/
             holder.imgHead.setBackgroundResource(R.color.transparent);
             holder.tvTime.setText(bean.time);
             holder.tvTitle.setText(bean.title);

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

@@ -26,7 +26,6 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
-import com.xzjmyk.pm.activity.ui.erp.model.NoticeEntity;
 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;
@@ -267,11 +266,11 @@ public class NoticesActivity extends BaseActivity {
                 model = (ItemModel) convertView.getTag();
             }
 
-            if (position % 2 == 0) {
+          /*  if (position % 2 == 0) {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
             } else {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
-            }
+            }*/
 
            // List<NoticeData> noticeDataList = noticeDataList;
 //			model.tv_title.setText(datas.get(position).getNO_TITLE());

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

@@ -516,6 +516,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                                     cu_name = jsonObject.getString("JP_NAME") == null ? "" : jsonObject.getString("JP_NAME");
                                     time = jsonObject.getString("JN_DEALTIME") == null ? "" : jsonObject.getString("JN_DEALTIME");
                                     jn_dealresult = jsonObject.getString("JN_DEALRESULT") == null ? "" : jsonObject.getString("JN_DEALRESULT");
+                                    jp_launchername = jsonObject.getString("JP_LAUNCHERNAME") == null ? "" : jsonObject.getString("JP_LAUNCHERNAME");
                                     break;
                                 case 3:
                                     cu_name = jsonObject.getString("JP_NAME") == null ? "" : jsonObject.getString("JP_NAME");

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

@@ -62,8 +62,10 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         //TODO
 //        manage = new AlarmManage();
 //        manage.setSigninAlarm(ct);
-        tv_alar.setOnClickListener(this);
-        tv_ualar.setOnClickListener(this);
+//        tv_alar.setOnClickListener(this);
+//        tv_ualar.setOnClickListener(this);
+        alar_rl.setOnClickListener(this);
+        ualar_rl.setOnClickListener(this);
         isalarma_sw.setOnCheckedChangeListener(this);
         auto_signin_sw.setOnCheckedChangeListener(this);
         int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);
@@ -91,11 +93,11 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         String[] time = getResources().getStringArray(R.array.alarm_time);
         int requestCode = 0;
         switch (view.getId()) {
-            case R.id.tv_alar:
+            case R.id.alar_rl:
                 pre = "提前";
                 requestCode = 0x21;
                 break;
-            case R.id.tv_ualar:
+            case R.id.ualar_rl:
                 pre = "延迟";
                 requestCode = 0x22;
                 break;

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

@@ -157,6 +157,7 @@ public class DailydetailsActivity extends BaseActivity {
                 wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
             }
             wdd_status.setText(status);
+
             wdd_plan.setText(plan);
             wdd_experience.setText(experience);
         } else {
@@ -193,8 +194,7 @@ public class DailydetailsActivity extends BaseActivity {
                             mEmptyLayput_approvalflow.showEmpty();
                         }else{
                             mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
-                            LogUtil.prinlnLongMsg("mCommonApprovalFlowBean",mCommonApprovalFlowBean.toString());
-
+                            LogUtil.prinlnLongMsg("mCommonApprovalFlowBean", mCommonApprovalFlowBean.toString());
 
                             if(mCommonApprovalFlowBean.getData().size()<=0 ){
                                 mEmptyLayput_approvalflow.showEmpty();
@@ -210,20 +210,8 @@ public class DailydetailsActivity extends BaseActivity {
                                         String str[] = emCode.split(",");
                                         emCode = str[0];
                                         ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
-                                        String[] selectionArgs = {emCode, whichsys};
-                                        String selection = "em_code=? and whichsys=? ";
-                                        //获取数据库数据
-                                        EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
-                                        if (bean != null) {
-                                            String imId = String.valueOf(bean.getEm_IMID());
-                                            Log.i("todo", "imId=" + imId);
-                                            im_ids.add(imId);
-                                        }else {
-                                            im_ids.add("");
-                                            ToastMessage("头像获取异常，已显示为默认");
-                                        }
-                                    }else {
 
+                                    }
                                         String[] selectionArgs = {emCode, whichsys};
                                         String selection = "em_code=? and whichsys=? ";
                                         //获取数据库数据
@@ -234,20 +222,26 @@ public class DailydetailsActivity extends BaseActivity {
                                             im_ids.add(imId);
                                         }else {
                                             im_ids.add("");
-                                            ToastMessage("头像获取异常，已显示为默认");
+                                            ToastMessage("审批流头像获取异常，已显示为默认");
                                         }
-                                    }
-
-
                                 }
                             }
-                            Log.i("imids",im_ids.toString());
+                            Log.i("imids", im_ids.toString());
                             mDailyDetailsApprovalFlowAdapter.setIm_ids(im_ids);
 
                             //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中
                             mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
                             approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
 
+                            int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+                            int datanum = mCommonApprovalFlowBean.getData().size();
+                            if(nodesnum > 0 && datanum > 0 && nodesnum == datanum){
+                                if(mCommonApprovalFlowBean.getNodes().get(nodesnum-1).getJn_dealResult().equals("同意")){
+                                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
+                                    wdd_status.setText("已审批");
+                                }
+                            }
+
 
                         }
                     }catch (JSONException e){

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

@@ -403,6 +403,11 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             if (poi == null) return;
             location_tv.setText(poi.address == null ? "" : poi.address);
         }
+        if (requestCode == 0x20 && resultCode == 0x20){
+            PoiInfo poi = data.getParcelableExtra("resultName");
+            if (poi == null) return;
+            location_tv.setText(poi.address == null ? "" : poi.address);
+        }
 
     }
 }

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

@@ -11,12 +11,15 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -45,6 +48,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -80,6 +84,8 @@ public class OutSigninOKActivity extends BaseActivity {
     private boolean isSubmit = false;
     private String netDate;
     private File waterBitmapToFile = null;
+    private PopupWindow mPopupWindow;
+    private File mCurrentFile;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -160,13 +166,63 @@ public class OutSigninOKActivity extends BaseActivity {
 
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
+    private static final int REQUEST_CODE_CROP_PHOTO = 3;//裁剪
     private String path = null;
 
     private void showPopup() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
-        CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
-    }
+        View headSelectView = View.inflate(OutSigninOKActivity.this, R.layout.layout_select_head, null);
+
+        mPopupWindow = new PopupWindow(headSelectView,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        mPopupWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        mPopupWindow.setFocusable(true);
+        mPopupWindow.setOutsideTouchable(true);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
+        mPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closePopupWindow();
+            }
+        });
+        mPopupWindow.showAtLocation(View.inflate(this, R.layout.activity_base_info, null), Gravity.BOTTOM, 0, 0);
+        TextView takePicTv = (TextView) headSelectView.findViewById(R.id.head_take_picture);
+        TextView selectPicTv = (TextView) headSelectView.findViewById(R.id.head_select_photos);
+        TextView cancelTv = (TextView) headSelectView.findViewById(R.id.head_cancel);
+
+        takePicTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
+                CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+                closePopupWindow();
+            }
+        });
+
+        selectPicTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
+                CameraUtil.pickImageSimple(OutSigninOKActivity.this, REQUEST_CODE_PICK_PHOTO);
+                closePopupWindow();
+            }
+        });
+
+        cancelTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closePopupWindow();
+            }
+        });
 
+    }
+    private void closePopupWindow() {
+        if (mPopupWindow != null) {
+            mPopupWindow.dismiss();
+            mPopupWindow = null;
+            DisplayUtil.backgroundAlpha(this, 1f);
+        }
+    }
     private int getID(String chche) {
         if (StringUtils.isEmpty(chche)) return 0;
         Pattern p = Pattern.compile("(\\d+)");
@@ -252,39 +308,47 @@ public class OutSigninOKActivity extends BaseActivity {
         /*else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
             if (resultCode == Activity.RESULT_OK) {
                 if (data != null && data.getData() != null) {
+                    String path = CameraUtil.getImagePathFromUri(this, data.getData());
+                    Uri o = Uri.fromFile(new File(path));
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mCurrentFile = new File(mNewPhotoUri.getPath());
+                    CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
+                } else {
+                    ToastUtil.showToast(this, R.string.c_photo_album_failed);
+                }
+            }
+        }*/
+        else if (requestCode == REQUEST_CODE_PICK_PHOTO){
+            if (resultCode == Activity.RESULT_OK) {
+                if (data != null && data.getData() != null) {
+//                    path = mNewPhotoUri.getPath();
                     path = CameraUtil.getImagePathFromUri(ct, data.getData());
-                    final File waterBitmapToFile = ImageUtil.compressWaterBitmapToFile(path, 100, 300, 300
-                            , time_tv.getText().toString().trim(), addr_tv.getText().toString().trim(), 0);
+                    if (StringUtils.isEmpty(path)) return;
+                    progressDialog.show();
+                    CommonUtil.getNetTime(handler);
+
+                   /* waterBitmapToFile = ImageUtil.compressWaterBitmapToFile(path, 100, 300, 300
+                            , CommonUtil.getSharedPreferences(getApplicationContext(), "erp_emname")
+                            , netDate, addr_tv.getText().toString().trim(), 0);
                     if (StringUtils.isEmpty(path)) return;
                     ImageLoader.getInstance().displayImage(Uri.fromFile(waterBitmapToFile).toString(), image);
                     image.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            LayoutInflater inflater = LayoutInflater.from(OutSigninOKActivity.this);
-                            final View largeImageView = inflater.inflate(R.layout.layout_large_image, null);
-                            ImageView imageView = (ImageView) largeImageView.findViewById(R.id.large_image_iv);
-                            ImageLoader.getInstance().displayImage(Uri.fromFile(waterBitmapToFile).toString(), imageView);
-                            final PopupWindow largeImageWindow = new PopupWindow(largeImageView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
-                            largeImageWindow.setAnimationStyle(R.style.Animation_CustomPopup);
-                            largeImageWindow.setFocusable(true);
-                            largeImageWindow.setOutsideTouchable(true);
-                            largeImageWindow.showAtLocation(View.inflate(OutSigninOKActivity.this, R.layout.activity_out_signin_ok, null), Gravity.CENTER, 0, 0);
-
-                            imageView.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    if (largeImageWindow.isShowing()) {
-                                        largeImageWindow.dismiss();
-                                    }
-                                }
-                            });
+                            try {
+                                Intent intent = new Intent(OutSigninOKActivity.this, SingleImagePreviewActivity.class);
+                                intent.putExtra(AppConstant.EXTRA_IMAGE_URI, waterBitmapToFile.getCanonicalPath());
+                                startActivity(intent);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
                         }
-                    });
+                    });*/
                 } else {
                     ToastUtil.showToast(this, R.string.c_photo_album_failed);
                 }
             }
-        }*/
+        }
     }
 
 

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

@@ -264,7 +264,7 @@ public class UserSelectActivity extends BaseActivity {
             if (adapter.getUsers().get(i).isClick())
                 list.add(adapter.getUsers().get(i));
         }
-        if (list.size() > 1){
+        if (list.size() > 0){
             Intent intent = new Intent();
             intent.putExtra("data", list);
             setResult(0x11, intent);

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

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.andreabaccega.widget.FormEditText;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendShuoshuoActivity;
@@ -33,7 +34,7 @@ import java.util.Map;
  */
 public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchListener {
 
-    private EditText add_summary;
+    private FormEditText add_summary;
     private EditText add_plan;
     private EditText add_experience;
     private ImageView add_submit;
@@ -51,6 +52,7 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                         setResult(0x22, new Intent());
                         isSbmit = false;
 //                        finish();
+                        CleanAfterSubmmit();
                         startActivity(new Intent(activity, WorkDailyShowActivity.class));
                     }
                     break;
@@ -61,12 +63,14 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                             if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
                                 Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
 //                                finish();
+                                CleanAfterSubmmit();
                                 startActivity(new Intent(activity, WorkDailyShowActivity.class));
                                 erpOk = true;
                                 if (imOk) {
                                     isSbmit = false;
                                     setResult(0x22, new Intent());
 //                                    finish();
+                                    CleanAfterSubmmit();
                                     startActivity(new Intent(activity, WorkDailyShowActivity.class));
                                 }
                             } else {
@@ -85,7 +89,11 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
             }
         }
     };
-
+    public void CleanAfterSubmmit(){
+        add_summary.setText("");
+        add_plan.setText("");
+        add_experience.setText("");
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -109,7 +117,7 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
     public void initView() {
         setContentView(R.layout.activity_add_work_daily);
         getSupportActionBar().setTitle("工作日报");
-        add_summary = (EditText) findViewById(R.id.add_work_daily_summary_et);
+        add_summary = (FormEditText) findViewById(R.id.add_work_daily_summary_et);
         add_plan = (EditText) findViewById(R.id.add_work_daily_plan_et);
         add_experience = (EditText) findViewById(R.id.add_work_daily_experience_et);
         add_submit = (ImageView) findViewById(R.id.add_work_daily_submit_iv);
@@ -118,9 +126,9 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
         add_submit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //  if(add_summary.testValidity()){
-                sendAble();
-                //    }
+                if (add_summary.testValidity()) {
+                    sendAble();
+                }
             }
         });
         share_experience.setOnClickListener(new View.OnClickListener() {
@@ -138,10 +146,10 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
 //                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
 //                                @Override
 //                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent intent = new Intent(WorkDailyAddActivity.this, SendShuoshuoActivity.class);
-                                    intent.putExtra("Experience", add_experience.getText().toString());
-                                    intent.putExtra("type", 0);
-                                    startActivity(intent);
+                    Intent intent = new Intent(WorkDailyAddActivity.this, SendShuoshuoActivity.class);
+                    intent.putExtra("Experience", add_experience.getText().toString());
+                    intent.putExtra("type", 0);
+                    startActivity(intent);
 //                                }
 //                            }).show();
                 }
@@ -186,9 +194,9 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
     }
 
     private void sendWorkDailyByErp(String s1, String s2, String s3) {
-        s1= string2Json(s1);
-        s2= string2Json(s2);
-        s3= string2Json(s3);
+        s1 = string2Json(s1);
+        s2 = string2Json(s2);
+        s3 = string2Json(s3);
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/addWorkReport.action";
         Map<String, Object> formStoreMap = new HashMap<>();
         formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
@@ -221,14 +229,15 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
 
     /**
      * JSON字符串特殊字符处理，比如：“\A1;1300”
+     *
      * @param s
      * @return String
      */
     public String string2Json(String s) {
         StringBuffer sb = new StringBuffer();
-        for (int i=0; i<s.length(); i++) {
+        for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
-            switch (c){
+            switch (c) {
                 case '\"':
                     sb.append("\\\"");
                     break;

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

@@ -80,11 +80,12 @@ public class SchedultAdapter extends BaseAdapter {
             store = (Store) view.getTag();
         }
 
-        if (position % 2 == 0) {
-            view.setBackgroundColor(context.getResources().getColor(R.color.item_color1));
-        } else {
-            view.setBackgroundColor(context.getResources().getColor(R.color.item_color2));
-        }
+//        if (position % 2 == 0) {
+//            view.setBackgroundColor(context.getResources().getColor(R.color.item_color1));
+//        } else {
+//            view.setBackgroundColor(context.getResources().getColor(R.color.item_color2));
+//        }
+        view.setBackground(context.getResources().getDrawable(R.drawable.selector_me_menu_item_bg));
         if (fields_object.getTypecode().equals("pagingrelease")) {// 知会
             String pTextView3Str = "发起人：<font color='#990000'>"
                     + fields_object.getRecorder() + "</font>";

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

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -211,6 +212,8 @@ public class MessageFragment extends EasyFragment {
 
         mPullToRefreshListView = (PullToRefreshSlideListView) findViewById(R.id.pull_refresh_list);
         mPullToRefreshListView.setShowIndicator(false);
+        mPullToRefreshListView.getRefreshableView().setCacheColorHint(Color.parseColor("#000000"));
+        mPullToRefreshListView.getRefreshableView().setScrollingCacheEnabled(false);
         mPullToRefreshListView.setMode(Mode.PULL_FROM_START);
         mAdapter = new NearlyMessageAdapter(mActivity);
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/ImageUtil.java

@@ -230,7 +230,7 @@ public class ImageUtil {
             TextPaint paint = new TextPaint();
             paint.setAlpha(alpha);
             paint.setAntiAlias(true);
-            paint.setShadowLayer(2, 3, 3, Color.BLACK);
+            paint.setShadowLayer(2, 2, 2, Color.BLACK);
             paint.setColor(Color.WHITE);
             paint.setTypeface(Typeface.create("宋体", Typeface.NORMAL));
             //如果不用copy的方法，直接引用会对资源文件进行修改，而Android是不允许在代码里修改res文件里的图片

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+    xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_main"
@@ -40,10 +42,13 @@
                     android:paddingLeft="10dp"
                     android:layout_marginTop="8dp"
                     />
-                <EditText
+                <com.andreabaccega.widget.FormEditText
                     android:id="@+id/add_work_daily_summary_et"
                     style="@style/form_relative_right_text2"
-                    android:hint="请输入今日工作总结(必填)"
+                    android:hint="请输入今日工作总结(必填,限500字)"
+                    whatever:testType="regexp"
+                    whatever:customRegexp="^[\\s\\S]{0,500}$"
+                    whatever:testErrorString="字数超限500了喔,亲!"
                     />
                 <View
                     android:layout_width="match_parent"
@@ -79,7 +84,7 @@
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
+                    android:layout_marginRight="10dp"
                     >
 
                     <TextView
@@ -116,12 +121,10 @@
                 <ImageView
                     android:id="@+id/add_work_daily_submit_iv"
                     android:layout_gravity="center_horizontal"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="20dp"
+                    android:padding="20dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/wd_icon_tijiao_nor"
-                    android:paddingBottom="20dp"
                     />
             </LinearLayout>
         </LinearLayout>

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

@@ -115,7 +115,8 @@
 
         <RelativeLayout
             android:id="@+id/me_heard"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/me_heard_text"
@@ -156,7 +157,8 @@
 
         <RelativeLayout
             android:id="@+id/me_nickname"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/me_nickname_text"
@@ -193,7 +195,8 @@
 
         <RelativeLayout
             android:id="@+id/me_sex"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/me_sex_text"
@@ -231,7 +234,8 @@
 
         <RelativeLayout
             android:id="@+id/me_birthday"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/me_birthday_text"
@@ -268,7 +272,8 @@
             android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/me_address"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/me_address_text"

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

@@ -61,6 +61,7 @@
         android:id="@+id/alar_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:padding="10dp">
 
         <TextView
@@ -92,6 +93,7 @@
         android:id="@+id/ualar_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
         android:padding="10dp">
 
         <TextView

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

@@ -35,6 +35,9 @@
         android:id="@+id/pull_refresh_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#ebe9e9"
+        android:hardwareAccelerated="false"
+        android:layerType="software"
         app:ptrAnimationStyle="flip"
         app:ptrDrawableEnd="@drawable/default_ptr_rotate"
         app:ptrDrawableStart="@drawable/default_ptr_flip"

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/item_me_height"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:orientation="vertical">
     <!--<TextView-->
     <!--android:id="@+id/tv_title"-->

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:padding="5dp"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:gravity="center_vertical">
 
     <ImageView

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:padding="10dp"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:gravity="center_vertical">
 
     <ImageView

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

@@ -41,6 +41,16 @@
             android:text="ss"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
+        <TextView
+            android:id="@+id/daily_share_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/text_click_bg"
+            android:text="分享来自"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine"
+            android:visibility="gone"/>
 
         <FrameLayout
             android:id="@+id/content_fl"
@@ -66,6 +76,7 @@
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_min" />
 
+
             <TextView
                 android:id="@+id/delete_tv"
                 android:layout_width="wrap_content"

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

@@ -6,6 +6,7 @@
     android:minHeight="@dimen/item_height"
     android:paddingLeft="15dp"
     android:background="@drawable/selector_me_menu_item_bg"
+    android:hardwareAccelerated="false"
     android:paddingRight="15dp">
     <!--android:background="@color/item_color1"-->
     <FrameLayout

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

@@ -9,7 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/tv_dispaly_top"
-        android:divider="@null"
+        android:divider="@color/gray_light"
+        android:dividerPadding="1px"
         android:fadingEdge="none"
         android:scrollingCache="false"
         android:listSelector="#00000000"