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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UU5.5.1/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -0,0 +1,78 @@
+package com.xzjmyk.pm.activity.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.ApprovalFlowBean;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2016/11/4.
+ */
+public class DailyDetailsApprovalFlowAdapter extends BaseAdapter{
+    private List<ApprovalFlowBean> mApprovalFlowBeanList;
+    private Context mContext;
+
+    public DailyDetailsApprovalFlowAdapter (Context mContext){
+        this.mContext = mContext;
+    }
+    public List<ApprovalFlowBean> getmApprovalFlowBeanList(){
+        return mApprovalFlowBeanList;
+    }
+    public void setmApprovalFlowBeanList(List<ApprovalFlowBean> mApprovalFlowBeanList){
+        this.mApprovalFlowBeanList = mApprovalFlowBeanList;
+    }
+    public int getCount() {
+        return mApprovalFlowBeanList == null ? 0 : mApprovalFlowBeanList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mApprovalFlowBeanList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder = null;
+        if(convertView == null){
+            convertView = View.inflate(mContext, R.layout.item_daily_details_approval_flow,null);
+            viewHolder = new ViewHolder();
+            viewHolder.AppFlowNode = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_node_img);
+            viewHolder.AppFlowPhoto = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_photo_img);
+            viewHolder.AppFlowName = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_name_tv);
+            viewHolder.AppFlowStatus = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_status_tv);
+            viewHolder.AppFlowTime = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_time_tv);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+
+        //ToDo 节点，头像图片具体获取显示方式，根据接口数据决定
+        //
+        //
+//        viewHolder.AppFlowName.setText(mApprovalFlowBeanList.get(position).getAF_Name());
+//        viewHolder.AppFlowTime.setText(mApprovalFlowBeanList.get(position).getAF_Time());
+//        viewHolder.AppFlowStatus.setText(mApprovalFlowBeanList.get(position).getAF_Status());
+        return convertView;
+    }
+
+    class  ViewHolder{
+        ImageView AppFlowNode;
+        ImageView AppFlowPhoto;
+        TextView AppFlowName;
+        TextView AppFlowStatus;
+        TextView AppFlowTime;
+
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.xzjmyk.pm.activity.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.WorkTaskBean;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2016/11/5.
+ */
+public class DailyDetailsWorkTaskAdapter extends BaseAdapter {
+    private List<WorkTaskBean> mWorkTaskBeanList;
+    private Context mContext;
+
+    //获取上下文对象
+    public DailyDetailsWorkTaskAdapter(Context mContext){
+        this.mContext = mContext;
+    }
+
+    public List<WorkTaskBean> getmWorkTaskBeanList(){
+        return mWorkTaskBeanList;
+    }
+
+    public void setmWorkTaskBeanList(List<WorkTaskBean> mWorkTaskBean){
+        this.mWorkTaskBeanList = mWorkTaskBean;
+    }
+    @Override
+    public int getCount() {
+        return mWorkTaskBeanList == null ? 0 : mWorkTaskBeanList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mWorkTaskBeanList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder = null;
+        if(convertView == null){
+            convertView = View.inflate(mContext, R.layout.item_daily_details_task,null);
+            viewHolder = new ViewHolder();
+            viewHolder.TaskTitle = (TextView) convertView.findViewById(R.id.item_daily_details_task_title_tv);
+            viewHolder.Originator = (TextView) convertView.findViewById(R.id.item_daily_details_task_originator_tv);
+        }else{
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+
+        //将获取到数据给工作任务赋值
+//        viewHolder.TaskTitle.setText(mWorkTaskBeanList.get(position).getTASK_TITLE());
+//        viewHolder.Originator.setText(mWorkTaskBeanList.get(position).getORIGIBATOR());
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView TaskTitle;
+        TextView Originator;
+    }
+}

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

@@ -1,3 +1,4 @@
+
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
@@ -16,7 +17,7 @@ import java.util.List;
  * Created by FANGlh on 2016/11/1.
  */
 public class WorkDailyAdapter extends BaseAdapter {
-    private List<WorkDailyBean> mWorkDailyBean;
+    private List<WorkDailyBean> mWorkDailyBeanList;
     private Context mContext;
 
     //获取上下文对象
@@ -24,23 +25,23 @@ public class WorkDailyAdapter extends BaseAdapter {
         this.mContext = mContext;
     }
 
-    public List<WorkDailyBean> getmWorkDailyBean() {
-        return mWorkDailyBean;
+    public List<WorkDailyBean> getmWorkDailyBeanList() {
+        return mWorkDailyBeanList;
     }
 
-    public void setmWorkDailyBean(List<WorkDailyBean> mWorkDailyBeans) {
-        this.mWorkDailyBean = mWorkDailyBeans;
+    public void setmWorkDailyBeanList(List<WorkDailyBean> mWorkDailyBeans) {
+        this.mWorkDailyBeanList = mWorkDailyBeans;
     }
 
 
     @Override
     public int getCount() {
-        return mWorkDailyBean == null ? 0 : mWorkDailyBean.size();
+        return mWorkDailyBeanList == null ? 0 : mWorkDailyBeanList.size();
     }
 
     @Override
     public Object getItem(int position) {
-        return mWorkDailyBean.get(position);
+        return mWorkDailyBeanList.get(position);
     }
 
     @Override
@@ -63,13 +64,15 @@ public class WorkDailyAdapter extends BaseAdapter {
         }
 
     //时间返回为空时显示今日时间
-        if(mWorkDailyBean.get(position).getWD_DATE() == null){
+        if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
             viewHolder.WorkDailyDate.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
         }else{
-            viewHolder.WorkDailyDate.setText(mWorkDailyBean.get(position).getWD_DATE());
+            viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
         }
-        viewHolder.WorkDailyStatus.setText(mWorkDailyBean.get(position).getSTATUS());
-        viewHolder.WorkDailySummary.setText(mWorkDailyBean.get(position).getWD_COMMENT());
+
+        //为日报列表界面赋值（状态，总结）
+        viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
+        viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
         return convertView;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/ApprovalFlowBean.java

@@ -0,0 +1,52 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+/**
+ * Created by FANGlh on 2016/11/4.
+ */
+public class ApprovalFlowBean {
+    private String AF_Node; //审批节点
+    private String AF_Name; //审批人名字
+    private String AF_Photo; //审批人头像
+    private String AF_Status; //批语
+    private String AF_Time; //审批时间
+
+    public String getAF_Node() {
+        return AF_Node;
+    }
+
+    public void setAF_Node(String AF_Node) {
+        this.AF_Node = AF_Node;
+    }
+
+    public String getAF_Name() {
+        return AF_Name;
+    }
+
+    public void setAF_Name(String AF_Name) {
+        this.AF_Name = AF_Name;
+    }
+
+    public String getAF_Photo() {
+        return AF_Photo;
+    }
+
+    public void setAF_Photo(String AF_Photo) {
+        this.AF_Photo = AF_Photo;
+    }
+
+    public String getAF_Status() {
+        return AF_Status;
+    }
+
+    public void setAF_Status(String AF_Status) {
+        this.AF_Status = AF_Status;
+    }
+
+    public String getAF_Time() {
+        return AF_Time;
+    }
+
+    public void setAF_Time(String AF_Time) {
+        this.AF_Time = AF_Time;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/WorkTaskBean.java

@@ -0,0 +1,25 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+/**
+ * Created by FANGlh on 2016/11/5.
+ */
+public class WorkTaskBean {
+    private String TASK_TITLE; //工作任务
+    private String ORIGIBATOR; //发起人
+
+    public String getTASK_TITLE() {
+        return TASK_TITLE;
+    }
+
+    public void setTASK_TITLE(String TASK_TITLE) {
+        this.TASK_TITLE = TASK_TITLE;
+    }
+
+    public String getORIGIBATOR() {
+        return ORIGIBATOR;
+    }
+
+    public void setORIGIBATOR(String ORIGIBATOR) {
+        this.ORIGIBATOR = ORIGIBATOR;
+    }
+}

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

@@ -244,7 +244,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
 
     private void initTopTitleBar() {
         if (isMyBusiness()) {
-            getSupportActionBar().setTitle(R.string.my_business_circle);
+            getSupportActionBar().setTitle("我的工作圈");
         } else {
             if (isMySpace()) {
                 getSupportActionBar().setTitle(R.string.my_space);

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

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.ui.circle;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
+
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -19,6 +20,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
@@ -70,6 +72,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     public static final int LOCATION = 0x00a, DISPLAY = 0x00b;
 
     private int mType;
+    private String dailyexperience;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -96,6 +99,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         } else {
             getSupportActionBar().setTitle(R.string.send_image);
         }
+
+
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
         mSelectImgLayout = findViewById(R.id.select_img_layout);
@@ -103,6 +108,14 @@ 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");
+        if(!TextUtils.isEmpty(dailyexperience)){
+            mTextEdit.setText(dailyexperience);
+        }else{
+            return;
+        }
 
         if (mType == 0) {
             mSelectImagePromptTv.setVisibility(View.GONE);
@@ -204,7 +217,9 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         }
 
     }
-
+//public void senddailyshuoshuo(String experience){
+//
+//}
     // 发布一条说说
     public void sendShuoshuo() {
         Map<String, String> params = new HashMap<String, String>();
@@ -221,7 +236,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         params.put("flag", "3");
         // 消息隐私范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
         params.put("visible", "3");
-        params.put("text", mTextEdit.getText().toString());// 消息内容
+
+        params.put("text", mTextEdit.getText().toString()+"[来自:工作日报>工作心得分享]");// 消息内容
         if (!TextUtils.isEmpty(mImageData)) {
             params.put("images", mImageData);
         }
@@ -263,10 +279,36 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
             public void onResponse(ObjectResult<String> result) {
                 boolean parserResult = Result.defaultParser(SendShuoshuoActivity.this, result, true);
                 if (parserResult) {
-                    Intent intent = new Intent();
+                    final Intent intent = new Intent();
                     intent.putExtra(AppConstant.EXTRA_MSG_ID, result.getData());
                     setResult(RESULT_OK, intent);
-                    finish();
+
+                    if(!TextUtils.isEmpty(dailyexperience)){
+                        finish();
+                        Toast.makeText(getApplication(),"工作心得分享成功，稍后可到工作圈查看",Toast.LENGTH_LONG).show();
+                      /* new AlertDialog
+                               .Builder(mContext)
+                               .setCancelable(false)  //设置点击对话框之外的对话框不消失
+                               .setTitle("分享成功")
+                               .setMessage("是否立即进入朋友圈查看")
+                               .setNegativeButton("不了，返回日报详情", new DialogInterface.OnClickListener() {
+                                   @Override
+                                   public void onClick(DialogInterface dialog, int which) {
+                                       finish();
+                                   }
+                               })
+                               .setPositiveButton("立即进入", new DialogInterface.OnClickListener() {
+                                   @Override
+                                   public void onClick(DialogInterface dialog, int which) {
+                                       Intent intent1 = new Intent(ct,BusinessCircleActivity.class);
+                                       startActivity(intent1);
+                                   }
+                               }).show();*/
+                   }
+
+                   else{
+                       finish();
+                   }
                 }
                 ProgressDialogUtil.dismiss(mProgressDialog);
             }

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

@@ -46,6 +46,7 @@ public class NoticeMenuActivity extends BaseActivity {
     public void onBackPressed() {
         sendResult();
         super.onBackPressed();
+        overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
     }
 
     @Override
@@ -53,6 +54,7 @@ public class NoticeMenuActivity extends BaseActivity {
         if (item.getItemId() == android.R.id.home) {
             sendResult();
             finish();
+            overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
             return true;
         }
         return super.onOptionsItemSelected(item);

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

@@ -71,7 +71,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     mApplyButton.setEnabled(false);
                     Intent intent = new Intent();
                     intent.putExtra("status", mSubStatus);
-                    SubscribeDetailActivity.this.setResult(9, intent);
+                    setResult(9, intent);
                     break;
                 case REMOVE_MY_SUBSCRIPTION:
                     progressDialog.dismiss();

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

@@ -3,11 +3,23 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
+import com.xzjmyk.pm.activity.adapter.DailyDetailsWorkTaskAdapter;
+import com.xzjmyk.pm.activity.bean.oa.ApprovalFlowBean;
+import com.xzjmyk.pm.activity.bean.oa.WorkTaskBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.view.MyListView;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by FANGlh on 2016/11/1.
@@ -23,6 +35,18 @@ public class DailydetailsActivity extends BaseActivity{
     private String plan;
     private String experience;
     private String status;
+    private MyListView work_tasklv;
+    private MyListView approval_flowlv;
+    private LinearLayout plan_ll;
+    private LinearLayout experience_ll;
+    private DailyDetailsApprovalFlowAdapter mDailyDetailsApprovalFlowAdapter;
+    private DailyDetailsWorkTaskAdapter mDailyDetailsWorkTaskAdapter;
+    private List<ApprovalFlowBean> mApprovalFlowBeanList;
+    private List<WorkTaskBean> mWorkTaskBeanList;
+    private EmptyLayout mEmptyLayput_approvalflow;
+    private EmptyLayout mEmptyLayput_Task;
+    private TextView no_task;
+    private RelativeLayout task_rl;
 
 
     @Override
@@ -35,40 +59,83 @@ public class DailydetailsActivity extends BaseActivity{
     public void initView(){
         setContentView(R.layout.activity_workdaily_detail);
         getSupportActionBar().setTitle("日报详情");
+
         wdd_data = (TextView) findViewById(R.id.work_daily_detail_time_tv);
         wdd_summary = (TextView) findViewById(R.id.work_daily_detail_summary_et);
         wdd_plan = (TextView) findViewById(R.id.work_daily_detail_plan_tv);
         wdd_experience = (TextView) findViewById(R.id.work_daily_detail_experience_tv);
         wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
+        plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
+        experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
+        work_tasklv = (MyListView) findViewById(R.id.work_daily_detail_task_lv);
+        approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
+        no_task = (TextView) findViewById(R.id.work_daily_detail_no_task);
+        task_rl = (RelativeLayout) findViewById(R.id.work_daily_detail_task_rl);
+
+        //加载审批流的适配器
+        mEmptyLayput_approvalflow = new EmptyLayout(this,approval_flowlv);
+        mEmptyLayput_approvalflow.setShowEmptyButton(false);
+        mEmptyLayput_approvalflow.setShowErrorButton(false);
+        mEmptyLayput_approvalflow.setShowLoadingButton(false);
+
+        mApprovalFlowBeanList = new ArrayList<>();
+        mDailyDetailsApprovalFlowAdapter = new DailyDetailsApprovalFlowAdapter(this);
+        if(mApprovalFlowBeanList.isEmpty()){
+           // mEmptyLayput_approvalflow.showEmpty();
+        }else{
+            mDailyDetailsApprovalFlowAdapter.setmApprovalFlowBeanList(mApprovalFlowBeanList);
+            approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
+        }
 
+        //加载我的任务的适配器
+        mEmptyLayput_Task = new EmptyLayout(this,work_tasklv);
+        mEmptyLayput_Task.setShowEmptyButton(false);
+        mEmptyLayput_Task.setShowErrorButton(false);
+        mEmptyLayput_Task.setShowLoadingButton(false);
+        mWorkTaskBeanList = new ArrayList<>();
+        mDailyDetailsWorkTaskAdapter =new DailyDetailsWorkTaskAdapter(this);
+        if(mWorkTaskBeanList.isEmpty()){
+           //no_task.setVisibility(View.VISIBLE);
+            task_rl.setVisibility(View.GONE);
+        }else{
+            no_task.setVisibility(View.GONE);
+            task_rl.setVisibility(View.VISIBLE);
+            mDailyDetailsWorkTaskAdapter.setmWorkTaskBeanList(mWorkTaskBeanList);
+            work_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
+        }
+
+        //获取、处理、赋值从日报列表界面点击跳转传来的数据
+            final Intent intent = getIntent();
+            date = intent.getStringExtra("Date");
+            summary = intent.getStringExtra("Content");
+            status = intent.getStringExtra("Status");
+
+        if(!TextUtils.isEmpty(intent.getStringExtra("Plan"))){
+            plan = intent.getStringExtra("Plan");
+        }else{
+            plan_ll.setVisibility(View.GONE);
+        }
+        if(!TextUtils.isEmpty(intent.getStringExtra("Experience"))){
+            experience = intent.getStringExtra("Experience");
+        }else{
+            experience_ll.setVisibility(View.GONE);
+        }
 
-        Intent intent = getIntent();
-        date = intent.getStringExtra("Date");
-        summary = intent.getStringExtra("Content");
-        plan = intent.getStringExtra("Plan");
-        experience = intent.getStringExtra("Experience");
-        status = intent.getStringExtra("Status");
     }
     public void initData(){
-        if(!TextUtils.isEmpty(summary)&&!TextUtils.isEmpty(status)&&!TextUtils.isEmpty(date)){
+        // 这里在initdata 已经对数据进行处理了，如果数据出错则这里就不会执行
+        if(!TextUtils.isEmpty(summary)&&!TextUtils.isEmpty(status)&&!TextUtils.isEmpty(date)) {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
             wdd_status.setText(status);
-            if(TextUtils.isEmpty(plan)){
-                wdd_plan.setText("没有填写工作计划");
-            }else{
-                wdd_plan.setText(plan);
-            }
-            if (TextUtils.isEmpty(experience)){
-                wdd_experience.setText("没有填写工作心得");
-            }else{
-                wdd_experience.setText(experience);
-            }
-
+            wdd_plan.setText(plan);
+            wdd_experience.setText(experience);
         }else{
-            Toast.makeText(this, "数据异常,窗口即将关闭",Toast.LENGTH_LONG).show();
-            finish();
+            Toast.makeText(this, "数据异常",Toast.LENGTH_LONG).show();
+            finish();    //这里就是处理在后台错误情况下传回错的数据才会执行该finish语句，否则永不执行
         }
-
     }
+
 }
+
+

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

@@ -6,6 +6,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -19,6 +21,7 @@ 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;
 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.StringUtils;
@@ -110,18 +113,81 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        add_experience = (FormEditText) findViewById(R.id.add_work_daily_experience_et);
        add_submit = (Button) findViewById(R.id.add_work_daily_submitted_btn);
        share_experience = (ImageView) findViewById(R.id.add_work_daily_sharing_experience_im);
+/*
 
+       //工作总结不为空及字数限制提醒
+       add_summary.addTextChangedListener(new TextWatcher() {
+           @Override
+           public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+           }
+           @Override
+           public void onTextChanged(CharSequence s, int start, int before, int count) {
+               if(add_summary.getText().toString().length()>=500){
+                   ToastMessage("字数超过500了亲，");
+               }
+           }
+           @Override
+           public void afterTextChanged(Editable s) {
+
+           }
+       });
+       //工作计划字数限制提醒
+       add_plan.addTextChangedListener(new TextWatcher() {
+           @Override
+           public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+           }
+           @Override
+           public void onTextChanged(CharSequence s, int start, int before, int count) {
+           }
+           @Override
+           public void afterTextChanged(Editable s) {
+
+           }
+       });
+       //工作心得字数限制提醒
+       add_experience.addTextChangedListener(new TextWatcher() {
+           @Override
+           public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+           }
+           @Override
+           public void onTextChanged(CharSequence s, int start, int before, int count) {
+           }
+           @Override
+           public void afterTextChanged(Editable s) {
+           }
+       });
+*/
 
        add_submit.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-               showsubmitDialog();
+               if(add_summary.testValidity()){
+                   sendAble();
+               }
            }
        });
        share_experience.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-               ToastMessage("分享功能后续完善");
+               if(StringUtils.isEmpty(add_experience.getText().toString())){
+                   ToastMessage("请先填写工作心得再分享");
+               }else{
+                   new android.app.AlertDialog
+                           .Builder(mContext)
+                           .setTitle("温馨提示")
+                           .setMessage("你将进行工作心得分享至朋友圈操作，是否继续？")
+                           .setNegativeButton("取消",null)
+
+                           .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);
+                               }
+                           }).show();
+               }
            }
        });
 
@@ -136,7 +202,7 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                 .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        sendAble();
+                        sendWorkDailyByErp(add_summary.getText().toString(), add_plan.getText().toString(), add_experience.getText().toString());
                     }
                 }).show();
     }
@@ -154,11 +220,15 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
         if (!StringUtils.isEmpty(add_plan.getText().toString())) {
             builder.append("  工作计划:\n     " + add_plan.getText().toString() + "\n");
         }
+        /*else{
+            Crouton.makeText(ct, R.string.add_plan);
+            return;
+        }*/
         if (!StringUtils.isEmpty(add_experience.getText().toString())) {
             builder.append("  工作心得:\n     " + add_experience.getText().toString() + "\n");
         }
         isSbmit = true;
-        sendWorkDailyByErp(add_summary.getText().toString(),add_plan.getText().toString(),add_experience.getText().toString());
+        showsubmitDialog();
     }
 
     private void sendWorkDailyByErp(String s1,String s2,String s3) {
@@ -168,8 +238,7 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
         formStoreMap.put("wd_comment", s1);
         formStoreMap.put("wd_plan", s2);
         formStoreMap.put("wd_experience", s3);
-        String formStore = StringUtils.mapToJson(formStoreMap);
-        HashMap<String, Object> params = new HashMap<>();
+        String formStore = StringUtils.mapToJson(formStoreMap);        HashMap<String, Object> params = new HashMap<>();
         params.put("caller", "WorkDaily");
         params.put("formStore", formStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -62,16 +62,17 @@ public class WorkDailyShowActivity extends BaseActivity {
         mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
 
-        mWorkDailyList = new ArrayList<>();
-        mWorkDailyAdapter = new WorkDailyAdapter(this);
-        mWorkDailyAdapter.setmWorkDailyBean(mWorkDailyList);
-        mPullToRefreshListView.getRefreshableView().setAdapter(mWorkDailyAdapter);
-
         mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
 
+        mWorkDailyList = new ArrayList<>();
+        mWorkDailyAdapter = new WorkDailyAdapter(this);
+        mWorkDailyAdapter.setmWorkDailyBeanList(mWorkDailyList);
+        mPullToRefreshListView.getRefreshableView().setAdapter(mWorkDailyAdapter);
+
+
         mSearchEt.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -97,7 +98,7 @@ public class WorkDailyShowActivity extends BaseActivity {
                         chche.add(wd);
                     }
                 }
-                mWorkDailyAdapter.setmWorkDailyBean(chche);
+                mWorkDailyAdapter.setmWorkDailyBeanList(chche);
                 mWorkDailyAdapter.notifyDataSetChanged();
             }
         });
@@ -137,12 +138,10 @@ public class WorkDailyShowActivity extends BaseActivity {
     }
 
     public void initData() {
-        mPullToRefreshListView.setVisibility(View.GONE);
         String url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/getWorkDaily.action";
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(getApplicationContext(), "erp_username"));
         param.put("pageIndex", mCurrentPage);
-
         LinkedHashMap headers = new LinkedHashMap();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, WORK_DAILY_REQUEST, null, null, "post");
@@ -163,7 +162,6 @@ public class WorkDailyShowActivity extends BaseActivity {
                     String result = msg.getData().getString("result");
                     Log.i("handleMessage: ", result);
                     // TODO: 2016/11/1 json数据解析
-                    mPullToRefreshListView.setVisibility(View.VISIBLE);
                     mPullToRefreshListView.onRefreshComplete();
                     if (mSearchEt != null)
                         mSearchEt.setText("");

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

@@ -14,8 +14,6 @@ import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.SharedUtil;
 
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,21 +26,31 @@ public class AllRemovedSubsItemAdapter extends BaseAdapter {
     private Context mContext;
     private List<Object> keyStrings;
     private List<Object> cacheKeyStrings;
+    private List<String> allKeyStrings;
     private String currentMaster;//当前账套
     private String currentUser;//当前账号
     private DBManager mDbManager;
     private Handler mHandler;
+
     public AllRemovedSubsItemAdapter(List<SubscriptionNumber> mSubscriptionNumbers, Context mContext, Handler mHandler) {
         this.mSubscriptionNumbers = mSubscriptionNumbers;
         this.mContext = mContext;
         this.mHandler = mHandler;
         keyStrings = new ArrayList<>();
         cacheKeyStrings = new ArrayList<>();
+        allKeyStrings = new ArrayList<>();
         mDbManager = new DBManager(mContext);
         currentMaster = CommonUtil.getSharedPreferences(mContext, "erp_master");
         currentUser = CommonUtil.getSharedPreferences(mContext, "erp_username");
 
         String cacheKeys = SharedUtil.getString(currentMaster + currentUser + "subs");
+        String allCacheKeys = SharedUtil.getString(currentMaster + currentUser + "allsubs");
+        if (allCacheKeys != null){
+            String[] allCacheKeysArray = allCacheKeys.split(",");
+            for (int i = 0; i < allCacheKeysArray.length; i++) {
+                allKeyStrings.add(allCacheKeysArray[i]);
+            }
+        }
         if (cacheKeys != null) {
             String[] cacheKeysArray = cacheKeys.split(",");
             for (int i = 0; i < cacheKeysArray.length; i++) {
@@ -104,11 +112,23 @@ public class AllRemovedSubsItemAdapter extends BaseAdapter {
 
 
     private void initKeyStrings() {
+        List<String> finalKeys = new ArrayList<>();
+        if (allKeyStrings.size() != 0){
+            for (int i = 0; i < allKeyStrings.size(); i++) {
+                String key = allKeyStrings.get(i);
+                for (int j = 0; j < keyStrings.size(); j++) {
+                    if (key.equals(keyStrings.get(j))){
+                        finalKeys.add(keyStrings.get(j).toString());
+                    }
+                }
+            }
+        }
+
         StringBuilder keyStringBuilder = null;
-        if (keyStrings.size() != 0) {
+        if (finalKeys.size() != 0) {
             keyStringBuilder = new StringBuilder();
-            for (int i = 0; i < keyStrings.size(); i++) {
-                keyStringBuilder.append("," + keyStrings.get(i));
+            for (int i = 0; i < finalKeys.size(); i++) {
+                keyStringBuilder.append("," + finalKeys.get(i));
             }
             if (keyStringBuilder.length() > 2) {
                 keyStringBuilder.delete(0, 1);

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

@@ -53,6 +53,7 @@ public class SubscriptionAllFragment extends BaseFragment {
     private EmptyLayout mEmptyLayout;
     private int rbPos = 0;
     private List<String> keyStrings = new ArrayList<>();//当前显示的订阅类
+    private List<String> mAllKeyStrings = new ArrayList<>();//所有订阅类
     private final static int SUBSCRIBE_DETAIL_REQUEST = 33;
     private static int mClickedPos = -1;
     private String currentMaster;//当前账套
@@ -73,6 +74,7 @@ public class SubscriptionAllFragment extends BaseFragment {
     private List<AllSubscriptonKindMessage> mNetAllSubscriptonKindMessages;
     private List<SubscriptionNumber> mNetSubscriptionNumbers;
 
+    private String mBufferKey = null;
     @Override
     protected int getLayout() {
         return R.layout.fragment_all_subscription;
@@ -112,7 +114,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
                     mAllSubscriptonKindMessages.clear();
-                    rbPos = 0;
+//                    rbPos = 0;
                     sendAllSubscriptionRequest();
                 }else {
                     if (mPullToRefreshListView.isRefreshing()){
@@ -169,7 +171,6 @@ public class SubscriptionAllFragment extends BaseFragment {
                             keyStrings.remove(rbPos);
                             if (keyStrings.size() == 0) {
                                 mSubsTypeAdapter.notifyDataSetChanged();
-                                initKeyStrings();
                                 mTypeListView.setVisibility(View.GONE);
                                 mEmptyLayout.showEmpty();
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
@@ -178,14 +179,12 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 rbPos = 0;
                                 mTypeListView.setVisibility(View.VISIBLE);
                                 mSubsTypeAdapter.notifyDataSetChanged();
-                                initKeyStrings();
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                                 mAllSubscriptionAdapter.notifyDataSetChanged();
-//                                mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-//                                mPullToRefreshListView.getRefreshableView().setAdapter(mAllSubscriptionAdapter);
-
                             }
+                            initKeyStrings();
+
                         }
                         closeDeletePopupWindow();
                     }
@@ -213,6 +212,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mSubsTypeAdapter.setSelectItem(position);
                 mSubsTypeAdapter.notifyDataSetChanged();
+                mBufferKey = keyStrings.get(position);
                 rbPos = position;
                 if (mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers().size() != 0) {
                     mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
@@ -239,7 +239,6 @@ public class SubscriptionAllFragment extends BaseFragment {
                         keyStrings.remove(position);
                         if (keyStrings.size() == 0) {
                             mSubsTypeAdapter.notifyDataSetChanged();
-                            initKeyStrings();
                             mTypeListView.setVisibility(View.GONE);
                             mEmptyLayout.showEmpty();
                             mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
@@ -248,12 +247,12 @@ public class SubscriptionAllFragment extends BaseFragment {
                             rbPos = 0;
                             mTypeListView.setVisibility(View.VISIBLE);
                             mSubsTypeAdapter.notifyDataSetChanged();
-                            initKeyStrings();
 
                             mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                             mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                             mAllSubscriptionAdapter.notifyDataSetChanged();
                         }
+                        initKeyStrings();
                         closeDeletePopupWindow();
                     }
                 });
@@ -276,6 +275,18 @@ public class SubscriptionAllFragment extends BaseFragment {
         });
     }
 
+    @Override
+    protected void initDatas() {
+        if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
+            //每次初始化页面都需要访问网络数据用来更新本地缓存
+            sendAllSubscriptionRequest();
+        }else {
+            //没有网络时，取本地数据库数据
+            getDbSubsData();
+        }
+
+    }
+
     private void initKeyStrings() {
         StringBuilder keyStringBuilder = null;
         if (keyStrings.size() != 0) {
@@ -308,18 +319,6 @@ public class SubscriptionAllFragment extends BaseFragment {
 
     }
 
-    @Override
-    protected void initDatas() {
-        if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
-            //每次初始化页面都需要访问网络数据用来更新本地缓存
-            sendAllSubscriptionRequest();
-        }else {
-            //没有网络时，取本地数据库数据
-            getDbSubsData();
-        }
-
-    }
-
     /**
      * 获取本地数据库全部订阅
      */
@@ -341,7 +340,6 @@ public class SubscriptionAllFragment extends BaseFragment {
         } else {
             if (keyStrings.size() == 0) {
                 mSubsTypeAdapter.notifyDataSetChanged();
-                initKeyStrings();
                 mTypeListView.setVisibility(View.GONE);
                 mEmptyLayout.showEmpty();
                 mSubscriptionNumbers.clear();
@@ -349,7 +347,6 @@ public class SubscriptionAllFragment extends BaseFragment {
             } else {
                 mTypeListView.setVisibility(View.VISIBLE);
                 mSubsTypeAdapter.notifyDataSetChanged();
-                initKeyStrings();
                 for (int i = 0; i < keyStrings.size(); i++) {
                     AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
                     List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
@@ -365,12 +362,16 @@ public class SubscriptionAllFragment extends BaseFragment {
                     tempSubscriptonKindMessage.setSubscriptionKind(currentKey);
                     tempSubscriptonKindMessage.setSubscriptionNumbers(tempSubscriptionNumbers);
                     mAllSubscriptonKindMessages.add(tempSubscriptonKindMessage);
+                    if (mBufferKey != null && mBufferKey.equals(keyStrings.get(i))){
+                        rbPos = i;
+                    }
                 }
                 mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                 mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                 Log.d("allsubscription:", mSubscriptionNumbers.toString());
                 mAllSubscriptionAdapter.notifyDataSetChanged();
             }
+            initKeyStrings();
         }
     }
 
@@ -408,22 +409,27 @@ public class SubscriptionAllFragment extends BaseFragment {
                         JSONArray datasArray = resultObject.getJSONArray("datas");
                         JSONObject datasObject = datasArray.getJSONObject(0);
                         Iterator<String> iterator = datasObject.keys();
+                        keyStrings.clear();
+                        mAllKeyStrings.clear();
                         if (!iterator.hasNext()) {
+                            SharedUtil.putString(currentMaster + currentUser + "subs", null);
+                            SharedUtil.putString(currentMaster + currentUser + "allsubs", null);
+                            mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+                            mAllSubscriptionAdapter.notifyDataSetChanged();
                             mEmptyLayout.showEmpty();
                             if (mPullToRefreshListView.isRefreshing()) {
                                 mPullToRefreshListView.onRefreshComplete();
                                 Crouton.makeText(getActivity(), "没有未订阅数据", 0xff99cc00, 1500).show();
                             }
-                            keyStrings.clear();
                             mSubsTypeAdapter.notifyDataSetChanged();
                             mTypeListView.setVisibility(View.GONE);
                             return;
                         }
 
-                        keyStrings.clear();
                         while (iterator.hasNext()) {
                             String key = iterator.next().toString();
                             Log.d("allsubskeys: ", key);
+                            mAllKeyStrings.add(key);
                             AllSubscriptonKindMessage subscriptonKindMessage = new AllSubscriptonKindMessage();
                             subscriptonKindMessage.setSubscriptionKind(key);
                             mNetSubscriptionNumbers = new ArrayList<>();
@@ -484,21 +490,39 @@ public class SubscriptionAllFragment extends BaseFragment {
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
+                    if (mAllKeyStrings.size() == 0){
+                        SharedUtil.putString(currentMaster + currentUser + "allsubs", null);
+                    }else {
+                        StringBuilder allKeyString = new StringBuilder();
+                        for (int i = 0; i < mAllKeyStrings.size(); i++) {
+                            allKeyString.append("," + mAllKeyStrings.get(i));
+                        }
+                        if (allKeyString.length() > 2) {
+                            allKeyString.delete(0, 1);
+                        }
+                        SharedUtil.putString(currentMaster + currentUser + "allsubs", allKeyString.toString());
+                    }
                     if (keyStrings.size() == 0) {
                         mTypeListView.setVisibility(View.GONE);
-                        initKeyStrings();
                         mEmptyLayout.showEmpty();
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     } else {
+                        if (mBufferKey != null){
+                            for (int i = 0; i < keyStrings.size(); i++) {
+                                if (mBufferKey.equals(keyStrings.get(i))){
+                                    rbPos = i;
+                                }
+                            }
+                        }
                         mTypeListView.setVisibility(View.VISIBLE);
                         mSubsTypeAdapter.notifyDataSetChanged();
-                        initKeyStrings();
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                         Log.d("allsubscription:", mAllSubscriptionAdapter.getmSubscriptionNumbers().toString());
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     }
+                    initKeyStrings();
 
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete();
@@ -518,6 +542,7 @@ public class SubscriptionAllFragment extends BaseFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBSCRIBE_DETAIL_REQUEST && resultCode == 9 && data != null) {
             int statu = data.getIntExtra("status", 0);
             if (mClickedPos != -1) {

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

@@ -45,8 +45,8 @@
                     android:layout_marginTop="1dp"
                     android:gravity="top"
                     android:minHeight="120dp"
-                    android:maxHeight="600dp"
                     android:padding="5dp"
+                    android:maxHeight="1000dp"
                     />
                 <View
                     android:layout_width="match_parent"
@@ -67,8 +67,8 @@
                     android:hint="请输入明日工作计划(非必填)"
                     android:layout_marginTop="1dp"
                     android:minHeight="120dp"
-                    android:maxHeight="600dp"
-                    android:padding="5dp" />
+                    android:padding="5dp"
+                    android:maxHeight="1000dp"/>
 
                 <View
                     android:layout_width="match_parent"
@@ -89,14 +89,14 @@
                         />
                     <ImageButton
                         android:id="@+id/add_work_daily_sharing_experience_im"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
                         android:src="@drawable/icon_app_share"
                         android:layout_alignParentRight="true"
                         android:layout_marginTop="1dp"
                         android:layout_marginRight="20dp"
                         android:background="#7191F7"
-                        android:visibility="gone"
+                        android:visibility="visible"
                         />
                 </RelativeLayout>
                 <com.andreabaccega.widget.FormEditText
@@ -104,9 +104,9 @@
                     style="@style/form_relative_right_text"
                     android:layout_marginLeft="20dp"
                     android:gravity="top"
-                    android:hint="请输入工作心得(非必填)"
+                    android:hint="点击分享按钮可将工作心得分享到工作圈(非必填)"
                     android:minHeight="120dp"
-                    android:maxHeight="600dp"
+                    android:maxHeight="1000dp"
                     android:layout_marginTop="1dp"
                     android:padding="5dp" />
 
@@ -126,8 +126,4 @@
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 
-
-
-    <include layout="@layout/item_work_view" />
-
 </LinearLayout>

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

@@ -42,20 +42,6 @@
         android:dividerHeight="2px"
         android:scrollbars="none" />
 
-    <!--<com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout-->
-    <!--android:id="@+id/root_view"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:layout_below="@id/seach_top">-->
-
-    <!--<ListView-->
-    <!--android:id="@+id/context_rv"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:divider="@color/item_line"-->
-    <!--android:dividerHeight="2px" />-->
-    <!--</com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>-->
-
     <com.xzjmyk.pm.activity.view.PMsgBottomView
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"

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

@@ -3,16 +3,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
-    android:orientation="vertical">
+    android:orientation="vertical"
+   >
 
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:fillViewport="true"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="5dp"
         android:layout_marginRight="10dp"
         android:layout_marginLeft="10dp"
+        android:layout_weight="1"
+        android:fillViewport="true"
         android:scrollbars="none">
 
         <LinearLayout
@@ -26,7 +27,8 @@
                 android:id="@+id/ly_head_display"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:layout_marginBottom="10dp">
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -39,7 +41,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="left|top"
                         android:text="2016-11-02"
-                        android:textColor="@color/text_hine"
+                        android:textColor="#000000"
                         android:layout_marginLeft="5dp"
                         android:layout_marginTop="5dp"
                         android:layout_marginBottom="0dp"
@@ -61,6 +63,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
                     android:layout_marginTop="8dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
                     android:background="@color/item_line" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -68,53 +72,54 @@
                     android:textSize="18sp"
                     android:text="工作总结"
                     android:paddingLeft="5dp"
+                    android:textColor="#575757"
                     android:layout_marginTop="5dp"
                     />
                 <TextView
                     android:id="@+id/work_daily_detail_summary_et"
-                    style="@style/form_relative_right_text"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="1dp"
-                    android:gravity="top"
-                    android:minHeight="120dp"
-                    android:maxHeight="1000dp"
-                    android:padding="5dp"
+                    style="@style/form_relative_right_text1"
+                    android:textColor="#575757"
                     />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/item_line"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"/>
+                <LinearLayout
+                    android:id="@+id/work_daily_detail_plan_ll"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="visible">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作计划"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"/>
+                    android:layout_marginTop="1dp"
+                    android:textColor="#575757"
+                    />
                 <TextView
                     android:id="@+id/work_daily_detail_plan_tv"
-                    style="@style/form_relative_right_text"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:gravity="top"
-                    android:hint="没有填写工作计划"
-                    android:layout_marginTop="1dp"
-                    android:minHeight="120dp"
-                    android:maxHeight="1000dp"
-                    android:padding="5dp" />
+                    style="@style/form_relative_right_text1"
+                    android:textColor="#575757"/>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/item_line"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"/>
+                </LinearLayout>
 
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    >
+                <LinearLayout
+                    android:id="@+id/work_daily_detail_experience_ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="visible">
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -122,38 +127,93 @@
                         android:paddingLeft="5dp"
                         android:layout_marginTop="1dp"
                         android:textSize="18sp"
+                        android:textColor="#575757"
                         />
-                    <ImageButton
-                        android:id="@+id/add_work_daily_sharing_experience_im"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@drawable/icon_app_share"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginTop="1dp"
-                        android:layout_marginRight="20dp"
-                        android:background="#7191F7"
-                        android:visibility="gone"
-                        />
-                </RelativeLayout>
+
                 <TextView
                     android:id="@+id/work_daily_detail_experience_tv"
-                    style="@style/form_relative_right_text"
+                    style="@style/form_relative_right_text1"
+                    android:textColor="#575757"
+                    />
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/line"
+                            android:background="@color/item_line"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"/>
+                 </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:gravity="top"
-                    android:hint="没有填写工作心得"
-                    android:minHeight="120dp"
-                    android:maxHeight="1000dp"
+                    android:text="工作任务"
+                    android:paddingLeft="5dp"
                     android:layout_marginTop="1dp"
-                    android:padding="5dp" />
+                    android:textSize="18sp"
+                    android:textColor="#575757"
+                    android:visibility="gone"
+                    />
+                <TextView
+                    android:id="@+id/work_daily_detail_no_task"
+                    style="@style/form_relative_right_text1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="今天暂无分配工作任务"
+                    android:textColor="#575757"
+                    android:visibility="gone"/>
 
-            </LinearLayout>
+                <RelativeLayout
+                    android:id="@+id/work_daily_detail_task_rl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    >
 
-        </LinearLayout>
-    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="标  题"
+                        android:textColor="@color/text_hine"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="5dp"
+                        android:textSize="@dimen/text_hine" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="发起人"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="15dp"
+                        android:layout_marginTop="5dp"
+                        android:textSize="@dimen/text_hine"/>
+                </RelativeLayout>
+
+
+            </LinearLayout>
+
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/work_daily_detail_task_lv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#f6f5f5"
+                android:visibility="gone">
+            </com.xzjmyk.pm.activity.view.MyListView>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="5dp"
+                    android:background="#EBE9E9"
+                    android:layout_marginTop="2dp"
+                    android:visibility="gone"/>
 
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/work_daily_detail_approval_flow_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    >
+                </com.xzjmyk.pm.activity.view.MyListView>
+        </LinearLayout>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 
 </LinearLayout>

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

@@ -206,7 +206,7 @@
                 android:drawableLeft="@drawable/set_fans_u"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="我的朋友圈"
+                android:text="我的工作圈"
                 android:textColor="@color/text_main"
                 android:textSize="14sp" />
 

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

@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:gravity="left|top"
             android:text="2016-11-02"
-            android:textColor="@color/text_hine"
+            android:textColor="#000000"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="0dp"
@@ -83,7 +83,9 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="0dp"
-        android:textSize="@dimen/text_main"/>
+        android:textSize="@dimen/text_main"
+        android:textColor="#575757"
+        />
     <TextView
         android:id="@+id/item_activity_workdaily_summary_tv"
         android:layout_width="match_parent"
@@ -96,6 +98,7 @@
         android:layout_marginRight="15dp"
         android:paddingBottom="5dp"
         android:textSize="@dimen/text_hine"
+        android:textColor="#575757"
         />
 
     <View
@@ -104,108 +107,4 @@
         android:background="#EBE9E9"
         android:layout_marginTop="2dp"/>
 
-
-
-
-
-
-
-
-
-
-
-
-
-    <!--以下布局被gone-->
-                    <RelativeLayout
-                        android:id="@+id/client_tag_rl"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/content_tv"
-                        android:layout_marginTop="20dp"
-                        android:background="@color/item_color1"
-                        android:gravity="center_vertical"
-                        android:padding="5dp"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/client_tag_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:drawableLeft="@drawable/oa_client"
-                            android:gravity="center_vertical"
-                            android:text="关联客户(3):"
-                            android:textColor="@color/text_hine"
-                            android:textSize="@dimen/text_hine" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignTop="@+id/client_tag_tv"
-                            android:layout_marginLeft="3dp"
-                            android:layout_marginTop="3dp"
-                            android:layout_toRightOf="@+id/client_tag_tv"
-                            android:maxLines="1"
-                            android:text="背景灌灌灌灌灌灌灌灌"
-                            android:textColor="@color/text_hine"
-                            android:textSize="@dimen/text_hine" />
-
-                    </RelativeLayout>
-    <LinearLayout
-        android:id="@+id/comment_tag"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/client_tag_rl"
-        android:layout_marginTop="5dp"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/oa_rb_pass"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="以下为直属领导的点评:"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine"
-            />
-
-        <com.xzjmyk.pm.activity.view.MyListView
-            android:id="@+id/command_lv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-    </LinearLayout>
-    <RelativeLayout
-        android:id="@+id/operate_tag"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/comment_tag"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/like_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="50dp"
-            android:drawableLeft="@drawable/likes"
-            android:gravity="center"
-            android:padding="10dp"
-            android:text="0" />
-
-        <TextView
-            android:id="@+id/command_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="50dp"
-            android:drawableLeft="@drawable/operate_more"
-            android:padding="10dp"
-            android:text="0" />
-    </RelativeLayout>
-
-
 </LinearLayout>

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/item_color2"
+    android:orientation="vertical"
+    android:layout_marginTop="20dp"
+    >
+
+
+         <ImageView
+            android:id="@+id/item_daily_details_approval_flow_node_img"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@drawable/avatar_normal"
+            android:contentDescription="@string/app_name"
+            android:layout_marginLeft="40px" />
+
+        <ImageView
+            android:id="@+id/item_daily_details_approval_flow_photo_img"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@drawable/avatar_normal"
+            android:contentDescription="@string/app_name"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/item_daily_details_approval_flow_node_img"/>
+
+        <TextView
+            android:id="@+id/item_daily_details_approval_flow_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
+            android:text="方龙海"
+            android:textColor="#575757"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            android:id="@+id/item_daily_details_approval_flow_status_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
+            android:layout_below="@id/item_daily_details_approval_flow_name_tv"
+            android:text="待审批"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/item_daily_details_approval_flow_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="40dp"
+            android:text="2016-11-4 19:40"
+            android:textColor="#9F9595"
+            android:textSize="@dimen/text_main" />
+
+</RelativeLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#f6f5f5">
+
+    <TextView
+        android:id="@+id/item_daily_details_task_title_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="15dp"
+        android:text="标题1标题1标题1标题1"
+        android:textSize="15sp"
+        />
+
+    <TextView
+        android:id="@+id/item_daily_details_task_originator_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="15dp"
+        android:text="发起人"
+        android:textSize="15sp"
+        />
+
+</RelativeLayout>

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

@@ -327,6 +327,22 @@
         <item name="android:textSize">15sp</item>
     </style>
 
+    <!-- 日报详情总结、计划、心得内容显示样式-->
+    <style name="form_relative_right_text1">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:gravity">top</item>
+        <item name="android:minHeight">20dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:width">160dp</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textColorHint">@color/white</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
     <!--按钮样式-->
     <style name="button_style_one">
         <item name="android:layout_width">match_parent</item>