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

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="70"
-    android:versionName="5.5.6.0">
+    android:versionCode="71"
+    android:versionName="5.5.6">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -598,7 +598,7 @@
             android:label="地点微调" />
         <activity
             android:name=".ui.erp.activity.oa.AlarmaActivity"
-            android:label="签到提醒"
+            android:label="签到设置"
             android:theme="@style/OAThemeSignin" />
         <activity
             android:name=".ui.erp.activity.oa.MeetingActivity"

WeiChat/src/main/java/com/ipaulpro/afilechooser/FileChooserActivity.java

@@ -153,7 +153,7 @@ public class FileChooserActivity extends FragmentActivity implements
     private void addFragment() {
         FileListFragment fragment = FileListFragment.newInstance(mPath);
         mFragmentManager.beginTransaction()
-                .add(android.R.id.content, fragment).commit();
+                .add(android.R.id.content, fragment).commitAllowingStateLoss();
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -4,13 +4,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -36,8 +33,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

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/SigninBean.java

@@ -8,9 +8,9 @@ import android.os.Parcelable;
  */
 
 public class SigninBean implements Parcelable {
-    private String workSignin;//上班签到时间  yyyyMMdd HH:mm:ss
+    private String workSignin;//上班签到时间   HH:mm
     private String workTime;//上班时间  HH:mm
-    private String offSignin;//下班签到时间  yyyyMMdd HH:mm:ss
+    private String offSignin;//下班签到时间  HH:mm
     private String offTime;//下班时间  HH:mm
     private String startTime;//上班可签到时间  HH:mm
     private String endTime;//下班可签到时间  HH:mm

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/db/dao/SigninDao.java

@@ -5,12 +5,14 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
 
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,8 +62,16 @@ public class SigninDao {
                 values.put("master", master);
                 values.put("workTime", e.getWorkTime());
                 values.put("offTime", e.getOffTime());
-                values.put("workSignin", e.getWorkSignin());
-                values.put("offSignin", e.getOffSignin());
+                if (StringUtils.isEmpty(e.getWorkSignin()) || e.getWorkSignin().compareTo(e.getWorkTime()) > 0) {
+                    values.put("workSignin", "");
+                } else {
+                    values.put("workSignin", e.getWorkSignin());
+                }
+                if (StringUtils.isEmpty(e.getOffSignin()) || e.getOffSignin().compareTo(e.getOffTime()) < 0) {
+                    values.put("workSignin", "");
+                } else {
+                    values.put("offSignin", e.getOffSignin());
+                }
                 values.put("startTime", e.getStartTime());
                 values.put("endTime", e.getEndTime());
                 i = db.insert(titleName, nullColumn, values);
@@ -202,4 +212,8 @@ public class SigninDao {
         return beans == null ? new ArrayList<SigninBean>() : beans;
     }
 
+    private void testShow(String tag, String message) {
+        if (StringUtils.isEmpty(tag)) return;
+        Log.i("gongpengming", tag + ":" + message);
+    }
 }

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/MyFriendActivity.java

@@ -95,7 +95,7 @@ public class MyFriendActivity extends BaseActivity {
         if (isPeculiar)
             getSupportActionBar().setTitle("常用联系人");
         else
-            getSupportActionBar().setTitle("我的好友");
+            getSupportActionBar().setTitle("UU好友");
         mSortFriends = new ArrayList<>();
         allFriends = new ArrayList<>();
         mBaseComparator = new BaseComparator<Friend>();
@@ -164,7 +164,7 @@ public class MyFriendActivity extends BaseActivity {
         mTextDialog = (TextView) findViewById(R.id.text_dialog);
         mSideBar = (SideBar) findViewById(R.id.sidebar);
         mSideBar.setTextView(mTextDialog);
-        mPullToRefreshListView.setEmptyView(R.layout.view_empty);
+//        mPullToRefreshListView.setEmptyView(R.layout.view_empty);
         mSideBar.setOnTouchingLetterChangedListener(new SideBar.OnTouchingLetterChangedListener() {
             @Override
             public void onTouchingLetterChanged(String s) {
@@ -221,7 +221,7 @@ public class MyFriendActivity extends BaseActivity {
                     intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
                     intent.putExtra("friend", friend);
                 }
-                startActivity(intent);
+                startActivityForResult(intent,0x20);
             }
         });
         mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {

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

@@ -106,9 +106,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 } else if (setData == type) {
                     bean.unReNun = NES_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条新闻未阅读";
+                        bean.subTitle = "您有新的新闻未阅读!";
                     } else {
-                        bean.subTitle = "您暂无未阅读新闻消息";
+                        bean.subTitle = "您暂无未阅读的新闻消息!";
                     }
                     bean.time = "刚刚";
                     bean.title = "新闻";
@@ -121,9 +121,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 else if (setData == type) {
                     bean.unReNun = NOTICE_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条通知未阅读";
+                        bean.subTitle = "您有新的通知未阅读!";
                     } else {
-                        bean.subTitle = "您无未阅读通知内容";
+                        bean.subTitle = "您暂无未阅读的通知!";
                     }
                     bean.time = "刚刚";
                     bean.title = "通知";
@@ -135,9 +135,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 else if (setData == type) {
                     bean.unReNun = GONGGAO_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条公告未阅读";
+                        bean.subTitle = "您有新的公告未阅读!";
                     } else {
-                        bean.subTitle = "您暂无未阅读公告消息";
+                        bean.subTitle = "您暂无未阅读的公告!";
                     }
                     bean.time = "刚刚";
                     bean.title = "公告";

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

@@ -101,9 +101,7 @@ public class TaskActivity extends BaseActivity {
                         process.setRecorder(item.getString("recorder"));//发起人
                         process.setStatus(item.getString("ra_status"));//状态
                         process.setMainname(item.getString("ra_status"));//状态
-
                         process.setTaskname(item.getString("ra_taskname"));//名称
-
                         process.setDatetime(item.getDate("ra_startdate"));//发起时间
                         process.setLink(task_url + item.get("ra_id"));
                         process.setTypecode(item.getString("ra_type"));
@@ -132,7 +130,6 @@ public class TaskActivity extends BaseActivity {
                     listview_main.onRefreshComplete();
                 }
             }
-
             if (msg.what == LOAD_EM_NAME) {
                 String result = msg.getData().getString("result");
                 Log.i("Task", result);
@@ -162,12 +159,9 @@ public class TaskActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.task_listview);
-
         context = TaskActivity.this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的任务");
-
-
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_TASK);
@@ -204,7 +198,6 @@ public class TaskActivity extends BaseActivity {
                 intent.putExtra("status", store.tv_task_status.getText().toString());
                 intent.putExtra("taskid", store.pTextView3.getText().toString());//编号
                 intent.putExtra("taskname", store.pTextView4.getText().toString());//名称
-
                 intent.putExtra("taskemcode", store.pTextView1.getText().toString());//发起人
                 intent.putExtra("tasktime", store.pTextView2.getText().toString());//发起时间
                 intent.putExtra("performer", store.tv_task_performer);//处理人
@@ -213,7 +206,7 @@ public class TaskActivity extends BaseActivity {
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
                 intent.putExtra("endtime", store.tv_task_duration);
-                startActivity(intent);
+                startActivityForResult(intent, 0x20);
             }
 
             /**
@@ -249,32 +242,7 @@ public class TaskActivity extends BaseActivity {
         listview_main.setOnRefreshListener(new OnRefreshListener<ListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-                if (state_all == null || state_finish == null
-                        || state_start == null || state_taskforme == null
-                        || state_unconfirmed == null) {
-                    mEmptyLayout.showLoading();
-                    listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
-                    sendResquestForServer("START", 2);
-                    return;
-                }
-                if (state_all.isSelected()) {
-                    mEmptyLayout.showLoading();
-                    listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
-                    new Thread(new getallprocess_run()).start();
-                }
-                if (state_finish.isSelected()) {
-                    sendResquestForServer("FINISHED", 2);
-                }
-                if (state_start.isSelected()) {
-                    sendResquestForServer("START", 2);
-                }
-                if (state_unconfirmed.isSelected()) {
-                    sendResquestForServer("UNCONFIRMED", 2);
-                }
-                if (state_taskforme.isSelected()) {
-                    sendResquestForServerOther(2);
-                }
-
+                refreshing();
             }
         });
     }
@@ -285,6 +253,35 @@ public class TaskActivity extends BaseActivity {
         getEmNameForServer();//网络请求
     }
 
+
+    private void refreshing() {
+        if (state_all == null || state_finish == null
+                || state_start == null || state_taskforme == null
+                || state_unconfirmed == null) {
+            mEmptyLayout.showLoading();
+            listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
+            sendResquestForServer("START", 2);
+            return;
+        }
+        if (state_all.isSelected()) {
+            mEmptyLayout.showLoading();
+            listview_main.getLoadingLayoutProxy().setPullLabel("下拉更新");
+            new Thread(new getallprocess_run()).start();
+        }
+        if (state_finish.isSelected()) {
+            sendResquestForServer("FINISHED", 2);
+        }
+        if (state_start.isSelected()) {
+            sendResquestForServer("START", 2);
+        }
+        if (state_unconfirmed.isSelected()) {
+            sendResquestForServer("UNCONFIRMED", 2);
+        }
+        if (state_taskforme.isSelected()) {
+            sendResquestForServerOther(2);
+        }
+    }
+
     @SuppressWarnings("unchecked")
     private void loadData() {
         hClient = new HttpClient();
@@ -620,5 +617,11 @@ public class TaskActivity extends BaseActivity {
         return super.onOptionsItemSelected(item);
     }
 
-
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        if (requestCode == 0x20 && resultCode == 0x20) {
+            refreshing();
+        }
+    }
 }

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

@@ -37,10 +37,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     private boolean isAlarm;//判断是否为提醒
     private boolean isAuto;//判断是否为自动
 
-
-    public static String KEY_ALAR_TIME = "KEY_ALAR_TIME";//上班提醒时间
-    public static String KEY_UALAR_TIME = "KEY_UALAR_TIME";//下班时间
-
     private AlarmManage manage;
 
     @Override

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/net/ViewUtil.java

@@ -19,6 +19,7 @@ import com.afollestad.materialdialogs.MaterialDialog.ButtonCallback;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.DataDownloadActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
@@ -95,6 +96,7 @@ public class ViewUtil {
     private static String oldMsg2;
     private static long time2;
 
+
     /**
      * 弹出Toast消息
      * 间隔时间不超过三秒的重复信息不会反复弹出
@@ -388,7 +390,12 @@ public class ViewUtil {
                         ToastMessage(MyApplication.getInstance(),
                                 JSON.parseObject(msg.getData().getString("result")).getString("exception"), Style.holoRedLight, 3000);
                     } else {
-                        ToastMessage(MyApplication.getInstance(), "系统内部错误！", Style.holoRedLight, 3000);
+                        
+                        boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
+                        if (isNetHas)
+                            ToastMessage(MyApplication.getInstance(), "系统内部错误！", Style.holoRedLight, 3000);
+                        else
+                            ToastMessage(MyApplication.getInstance(), MyApplication.getInstance().getResources().getString(R.string.networks_out));
                     }
                     break;
                 default:
@@ -515,23 +522,23 @@ public class ViewUtil {
 //                                        for (int j2 = 0; j2 < erpEntities.size(); j2++) {
 //                                            if (text.toString().equals(
 //                                                    erpEntities.get(j2).getName())) {
-
-                                        LoginEntity entity = erpEntities
-                                                .get(which);
-                                        erp_phone = phone;
-                                        erp_password = password;
-                                        erp_username = entity.getAccount();
-                                        erp_master = entity.getMaster();
-                                        erp_baseurl = entity.getWebsite();
-                                        erp_company = entity.getName();
-                                        erp_uu = String.valueOf(entity
-                                                .getEnuu());
-                                        erp_masterId = String.valueOf(entity.getMasterId());
-                                        LoginERPTask(entity.getWebsite(),
-                                                entity.getMaster(), phone, password);
-                                        //清除账套列表缓存
-                                        CommonUtil.clearSharedPreferences(ct, "erp_masterlist");
-
+                                             
+                                                LoginEntity entity = erpEntities
+                                                        .get(which);
+                                                erp_phone = phone;
+                                                erp_password = password;
+                                                erp_username = entity.getAccount();
+                                                erp_master = entity.getMaster();
+                                                erp_baseurl = entity.getWebsite();
+                                                erp_company = entity.getName();
+                                                erp_uu = String.valueOf(entity
+                                                        .getEnuu());
+                                                erp_masterId = String.valueOf(entity.getMasterId());
+                                                LoginERPTask(entity.getWebsite(),
+                                                        entity.getMaster(), phone, password);
+                                                //清除账套列表缓存
+                                                CommonUtil.clearSharedPreferences(ct, "erp_masterlist");
+                                                
 //                                            }
 //                                        }
                                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmManage.java

@@ -4,12 +4,12 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.widget.Toast;
 
-import com.xzjmyk.pm.activity.AppConfig;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
@@ -33,11 +33,18 @@ public class AlarmManage {
     public void setSigninAlarm(Context ct) {
         boolean isAlarm = CommonUtil.getSharedPreferencesBoolean(ct, ALARMA_CLICK, false);//是否自动打卡
         boolean isAuto = CommonUtil.getSharedPreferencesBoolean(ct, AUTO_SIGNIN, false);//是否提醒
+        List<SigninBean> beans = SigninDao.getInstance(ct).queryByEmcode();
+        if (ListUtils.isEmpty(beans)) return;
+        if (isAuto)
+            setAutoSignin(ct, beans);
+        else if (isAlarm) {//当不自动打卡只是签到时候
+            setAlarm(ct, beans);
+        }
+        if (true) return;
         if (!isAlarm && !isAuto) {
             unArmmanager(ct);
             return;
         }
-        List<SigninBean> beans = SigninDao.getInstance(ct).queryByEmcode();
         int u = CommonUtil.getSharedPreferencesInt(ct, "ALARM_WORK_TIME", 5);//上班提前xx分钟
         int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);//下班延迟xx分钟
         boolean isToday = false;
@@ -87,6 +94,146 @@ public class AlarmManage {
         }
     }
 
+    private void setAlarm(Context ct, List<SigninBean> beans) {
+        for (SigninBean e : beans) {
+            boolean isOK = alarmBySigninBean(ct, e);
+            if (isOK) {//不在该班次
+                break;
+            }
+        }
+        //TODO 当天时间没有   先不理
+    }
+
+    private void setAutoSignin(Context ct, List<SigninBean> beans) {
+        long time = -1;
+        for (SigninBean e : beans) {
+            time = autoBySigninBean(e);
+            if (time != -1) {//不在该班次
+                setNextAlarm(ct, AUTO_SIGNIN_ACTION, time);
+                break;
+            }
+        }
+        //TODO 当天时间没有   先不理
+    }
+
+    private boolean alarmBySigninBean(Context ct, SigninBean e) {
+        long workTime = 0;
+        int u = CommonUtil.getSharedPreferencesInt(ct, "ALARM_WORK_TIME", 5);//上班提前xx分钟
+        workTime = getTimeByHHmm(e.getWorkTime()) - u * 60 * 1000;
+        if (System.currentTimeMillis() < workTime) {//符合提醒时间
+            setNextAlarm(MyApplication.getInstance(), WORK_ALARM_ACTION, workTime);
+            return true;
+        }
+        int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);//下班延迟xx分钟
+        workTime = getTimeByHHmm(e.getOffTime()) + d * 60 * 1000;
+        if (System.currentTimeMillis() < workTime) {
+            setNextAlarm(MyApplication.getInstance(), OFFWORK_ALARM_ACTION, workTime);
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * 只计算当天不计算第二天，只计算自动打卡
+     *
+     * @param e
+     * @return
+     */
+    private long autoBySigninBean(SigninBean e) {
+        long time = -1;
+        long workTime = 0;
+        //***************先上班后下班***************************
+        //***************上班开始***************************
+        /*x:当前时间  自动打卡满足   上班前10分钟 < x < 上班时间  */
+        //当前时间处于上班前时间
+        if (!isWorked(true, e)) {
+            //递归判断   10分钟  每2分钟进行判断、
+            time = recursiveByWork(workTime);
+            if (time != 1) {//符合自动打卡
+                return time;
+            } else {//不符合  下一分自动打卡
+                return System.currentTimeMillis() + 1000 * 60;
+            }
+        }
+        workTime = getTimeByHHmm(e.getOffTime());
+        //当前时间处于下班前时间
+        if (!isWorked(true, e)) {
+            //递归判断   10分钟  每2分钟进行判断、
+            time = recursiveByOffic(2, workTime);
+            if (time != 0) {//符合自动打卡
+                return time;
+            } else {//不符合  下一秒自动打卡
+                return System.currentTimeMillis() + 1000 * 5 * 60;
+            }
+        }
+        //当前时间不处于该班次可打卡范围
+        return -1;
+    }
+
+
+    /**
+     * 判断是否在可打卡范围   1.时间提醒之前  2.没有签成功
+     *
+     * @param isWork
+     * @param e
+     * @return
+     */
+    private boolean isWorked(boolean isWork, SigninBean e) {
+        long workTime;
+        if (isWork) {//上班
+            workTime = getTimeByHHmm(e.getWorkTime());
+            if (System.currentTimeMillis() < workTime && StringUtils.isEmpty(e.getWorkSignin())) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {//下班
+            workTime = getTimeByHHmm(e.getOffSignin());
+            if (System.currentTimeMillis() < workTime && StringUtils.isEmpty(e.getOffSignin())) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+    }
+
+    /**
+     * 判断当前时间的前10秒
+     *
+     * @param workTime 当天上班时间戳
+     * @return
+     */
+    private long recursiveByWork(long workTime) {
+        int[] times = {10, 8, 6, 4, 2, 0};
+        for (int e : times) {
+            long time = workTime - e * 1000 * 60;
+            if (System.currentTimeMillis() < time) {//当前时间小于 该时间点（上班前 2、4、6、8、10 分）
+                return time;
+            }
+        }
+        return -1;
+
+    }
+
+    /**
+     * 递归判断当前时间的前10秒
+     *
+     * @param times    2、4、6、8、10
+     * @param workTime 当天下班时间戳
+     * @return
+     */
+    private long recursiveByOffic(int times, long workTime) {
+        if (times == 10) return 0;
+        long time = workTime + times * 1000 * 60;
+        if (System.currentTimeMillis() < time) {//当前时间小于 该时间点（上班前 2、4、6、8、10 分）
+            return time;
+        } else {
+            recursiveByOffic(times + 2, workTime);
+        }
+        return 0;
+    }
+
     private long getTimeByHHmm(String time) {
         String che = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + time + ":00";//当天下班时间
         return TimeUtils.f_str_2_long(che);
@@ -94,16 +241,16 @@ public class AlarmManage {
 
 
     private void setNextAlarm(Context ct, String action, long time) {
-        String str = TimeUtils.f_long_2_str(time);
         if (time < System.currentTimeMillis()) return;
-        if (AppConfig.DEBUG)
-            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
+//        String str = TimeUtils.f_long_2_str(time);
+//        if (AppConfig.DEBUG)
+//            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
         Intent intent = new Intent(ct, AlarmReceiver.class);
         intent.setAction(StringUtils.isEmpty(action) ? WORK_ALARM_ACTION : action);
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ALARM_SERVICE);
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(time);
-        alarm.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(ct, intent));
+        alarm.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(ct, intent));
     }
 
     //清空提醒

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmReceiver.java

@@ -7,6 +7,8 @@ import android.database.SQLException;
 import android.os.Handler;
 import android.os.Message;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
@@ -25,6 +27,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.alibaba.fastjson.JSON.parseObject;
+import static com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ct;
+
 
 /**
  * Created by pengminggong on 2016/10/26.
@@ -130,18 +135,69 @@ public class AlarmReceiver extends BroadcastReceiver {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "get");
     }
 
+    //获取打卡记录 date:yyyy-MM-dd
+    private void loadLog() {
+        String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
+        //获取网络数据
+        String url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl") + "mobile/oa/workdata.action";
+        Map<String, Object> param = new HashMap<>();
+        String code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
+        param.put("currentMaster", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+        param.put("page", 1);
+        param.put("pageSize", 1000);
+        param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
+        param.put("caller", "CardLog");
+        param.put("emcode", code);
+        param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+        param.put("sessionUser", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
+        param.put("sessionId", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(MyApplication.getInstance(), url, param, handler, headers, 0x12, null, null, "get");
+    }
+
+
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
+            String message = msg.getData().getString("result");
             switch (msg.what) {
                 case 0x11:
+                    loadLog();
 //                    Toast.makeText(MyApplication.getInstance(), R.string.auto_signin, Toast.LENGTH_SHORT).show();
                     NotificationManage notificationManage = new NotificationManage();
                     notificationManage.sendNotification(MyApplication.getInstance(), "系统已为你自动打卡成功", SigninActivity.class);
                     break;
+                case 0x12:
+                    if (parseObject(message).containsKey("listdata")) {
+                        setDataByLogs(parseObject(message).getJSONArray("listdata"));
+                    }
+                    break;
                 default:
                     break;
             }
         }
     };
+
+    //处理数据，获取到用户签到列表
+    public void setDataByLogs(JSONArray array) {
+        List<SigninBean> beans = SigninDao.getInstance(ct).queryByEmcode();
+        if (ListUtils.isEmpty(beans)) return;
+        //取最后一个
+        JSONObject object = array.getJSONObject(array.size() - 1);
+        String time = object.getString("cl_time");
+        if (!StringUtils.isEmpty(time)) {
+            time = clearDay(time);
+            for (SigninBean e : beans) {
+
+            }
+        } else {
+
+        }
+    }
+
+    //获取打卡时间列表去除年月日和秒
+    private String clearDay(String time) {
+        return TimeUtils.long2str(TimeUtils.f_str_2_long(time), "HH:mm");
+    }
 }

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

@@ -752,11 +752,11 @@ public class MessageFragment extends EasyFragment {
                     if (num > 0) {
                         num_tv.setText(num + "");
                         num_tv.setVisibility(View.VISIBLE);
-                        content_tv.setText("您有" + num + "条订阅消息");
+                        content_tv.setText("您有新的订阅消息!");
                         time_tv.setText("刚刚");
                     } else {
                         num_tv.setVisibility(View.GONE);
-                        content_tv.setText("您暂无订阅消息");
+                        content_tv.setText("您暂无新的订阅消息!");
                     }
                     break;
                 case Constants.SUCCESS_LOGIN://公告
@@ -786,11 +786,11 @@ public class MessageFragment extends EasyFragment {
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
                         task_num_tv.setVisibility(View.VISIBLE);
-                        task_content_tv.setText("您有" + TASK_count + "条任务");
+                        task_content_tv.setText("您有新的任务!");
                         task_time_tv.setText("刚刚");
                     } else {
                         task_num_tv.setVisibility(View.GONE);
-                        task_content_tv.setText("您暂无任务");
+                        task_content_tv.setText("您暂无新的任务!");
                     }
                     break;
                 case DAIBAN_MSG:
@@ -798,11 +798,11 @@ public class MessageFragment extends EasyFragment {
                     if (DAIBAN_count > 0) {
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
-                        schedule_content_tv.setText("您有" + DAIBAN_count + "条待审批流程");
+                        schedule_content_tv.setText("您有新的待审批流程!");
                         schedule_time_tv.setText("刚刚");
                     } else {
                         schedule_num_tv.setVisibility(View.GONE);
-                        schedule_content_tv.setText("您暂无审批流程");
+                        schedule_content_tv.setText("您暂无新的审批流程!");
                     }
                     break;
             }
@@ -815,11 +815,11 @@ public class MessageFragment extends EasyFragment {
         if (count > 0) {
             notice_num_tv.setText(count + "");
             notice_num_tv.setVisibility(View.VISIBLE);
-            notice_content_tv.setText("您有" + count + "条通知");
+            notice_content_tv.setText("您有新的通知公告!");
             notice_time_tv.setText("刚刚");
         } else {
             notice_num_tv.setVisibility(View.GONE);
-            notice_content_tv.setText("您暂无通知");
+            notice_content_tv.setText("您暂无新的通知公告!");
         }
     }
 

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

@@ -29,8 +29,8 @@ import com.xzjmyk.pm.activity.ui.erp.activity.SubcribeManageActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
 import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -48,7 +48,6 @@ import java.util.Map;
  */
 public class SubscriptionActivity extends BaseActivity {
     private static final int LOAD_NET = 0x15;
-    private int requestCode = 0x01;
     private String emCode;
     private String baseUrl;
     private PullToRefreshListView listView;
@@ -88,14 +87,6 @@ public class SubscriptionActivity extends BaseActivity {
                         ToastUtil.showToast(ct, message == null ? "" : message);
                     }
                     break;
-                case RESULT_OK:
-                    if (adapter == null) {
-                        adapter = new SubscriptionAdapter();
-                        listView.getRefreshableView().setAdapter(adapter);
-                    } else {
-                        notifyAdapter();
-                    }
-                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     ToastUtil.showToast(ct, "系统内部错误");
                     break;
@@ -133,6 +124,7 @@ public class SubscriptionActivity extends BaseActivity {
         super.onBackPressed();
         finish();
     }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -156,6 +148,7 @@ public class SubscriptionActivity extends BaseActivity {
                 calendar.set(Calendar.MINUTE, 0);
                 calendar.set(Calendar.SECOND, 0);
                 newlong = calendar.getTimeInMillis();
+                oldTime=newlong;
                 loadNetData(newlong);//获取当天的网络数据
             }
 
@@ -169,11 +162,17 @@ public class SubscriptionActivity extends BaseActivity {
                     newlong = oldTime - daylong;
                 }
                 oldTime = newlong;
-                SubscriptionMessages = SubscriptionDao.getInstance().findByDate(newlong , (daylong + newlong) , emCode);//获取数据库
-                if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) {//数据库中没有数据
+                SubscriptionMessages = SubscriptionDao.getInstance().findByDate(newlong, (daylong + newlong), emCode);//获取数据库
+                if (ListUtils.isEmpty(SubscriptionMessages)) {//数据库中没有数据
                     loadNetData(newlong);
                 } else {//数据库中有数据
                     loadMore();
+                    listView.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            listView.onRefreshComplete();
+                        }
+                    }, 500);
                 }
             }
         });
@@ -189,83 +188,86 @@ public class SubscriptionActivity extends BaseActivity {
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         newlong = calendar.getTimeInMillis();
-        SubscriptionMessages = SubscriptionDao.getInstance().findByDate(newlong , newlong + daylong, emCode);
+        SubscriptionMessages = SubscriptionDao.getInstance().findByDate(newlong, newlong + daylong, emCode);
         if (SubscriptionMessages != null && SubscriptionMessages.size() > 0) {//当天数据库有数据
             loadMore();
         } else {//当天数据库没有数据
             loadNetData(newlong);
         }
-
     }
 
     private void refresh() {
-        ThreadPool.getThreadPool().addTask(new Runnable() {
-            @Override
-            public void run() {
-                SortSubsrciprion sortSubsrciprion = null;
-                for (int i = 0; i < SubscriptionMessages.size(); i++) {
-                    sortSubsrciprion = new SortSubsrciprion();
-                    sortSubsrciprion.tiem = Long.parseLong(SubscriptionMessages.get(i).getCREATEDATE_());
-                    sortSubsrciprion.time = TimeUtils.s_long_2_str(sortSubsrciprion.tiem);
-                    sortSubsrciprion.beans = new ArrayList<>();
-                    sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
-                    if (sortSubsrciprions.size() > 0) {
-                        for (int j = 0; j < sortSubsrciprions.size(); j++) {
-                            if (sortSubsrciprion.time.equals(sortSubsrciprions.get(j).time)) {//如果相同
-                                sortSubsrciprions.get(j).beans.add(SubscriptionMessages.get(i));
-                                break;
-                            } else if (j == (sortSubsrciprions.size() - 1)) {//如果到最后一个都不相同
-                                sortSubsrciprions.add(sortSubsrciprion);
-                                break;
-                            }
-                        }
-                    } else {
+        SortSubsrciprion sortSubsrciprion = null;
+        for (int i = 0; i < SubscriptionMessages.size(); i++) {
+            sortSubsrciprion = new SortSubsrciprion();
+            sortSubsrciprion.tiem = Long.parseLong(SubscriptionMessages.get(i).getCREATEDATE_());
+            sortSubsrciprion.time = TimeUtils.s_long_2_str(sortSubsrciprion.tiem);
+            sortSubsrciprion.beans = new ArrayList<>();
+            sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
+            if (sortSubsrciprions.size() > 0) {
+                for (int j = 0; j < sortSubsrciprions.size(); j++) {
+                    if (sortSubsrciprion.time.equals(sortSubsrciprions.get(j).time)) {//如果相同
+                        sortSubsrciprions.get(j).beans.add(SubscriptionMessages.get(i));
+                        break;
+                    } else if (j == (sortSubsrciprions.size() - 1)) {//如果到最后一个都不相同
                         sortSubsrciprions.add(sortSubsrciprion);
+                        break;
                     }
                 }
-                handler.sendEmptyMessage(RESULT_OK);
+            } else {
+                sortSubsrciprions.add(sortSubsrciprion);
             }
-        });
+        }
+        doVistOk();
+    }
 
+    private void doVistOk() {
+        if (adapter == null) {
+            adapter = new SubscriptionAdapter();
+            adapter.setSortSubsrciprions(sortSubsrciprions);
+            listView.getRefreshableView().setAdapter(adapter);
+        } else {
+            notifyAdapter();
+        }
     }
 
     private void loadMore() {
-        ThreadPool.getThreadPool().addTask(new Runnable() {
-            @Override
-            public void run() {
-                if (sortSubsrciprions == null)
-                    sortSubsrciprions = new ArrayList<>();
-                ArrayList<SortSubsrciprion> chche = new ArrayList<>();
-                SortSubsrciprion sortSubsrciprion = null;
-                for (int i = 0; i < SubscriptionMessages.size(); i++) {
-                    sortSubsrciprion = new SortSubsrciprion();
-                    sortSubsrciprion.tiem = Long.parseLong(SubscriptionMessages.get(i).getCREATEDATE_());
-                    sortSubsrciprion.time = TimeUtils.s_long_2_str(sortSubsrciprion.tiem);
-                    sortSubsrciprion.beans = new ArrayList<>();
-                    sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
-                    if (chche.size() > 0) {
-                        for (int j = 0; j < chche.size(); j++) {
-                            if (sortSubsrciprion.time.equals(chche.get(j).time)) {//如果相同
-                                chche.get(j).beans.add(SubscriptionMessages.get(i));
-                                break;
-                            } else if (j == (chche.size() - 1)) {//如果到最后一个都不相同
-                                chche.add(sortSubsrciprion);
-                                break;
-                            }
-                        }
-                    } else {
+        if (sortSubsrciprions == null)
+            sortSubsrciprions = new ArrayList<>();
+        ArrayList<SortSubsrciprion> chche = new ArrayList<>();
+        SortSubsrciprion sortSubsrciprion = null;
+        for (int i = 0; i < SubscriptionMessages.size(); i++) {
+            sortSubsrciprion = new SortSubsrciprion();
+            sortSubsrciprion.tiem = Long.parseLong(SubscriptionMessages.get(i).getCREATEDATE_());
+            sortSubsrciprion.time = TimeUtils.s_long_2_str(sortSubsrciprion.tiem);
+            sortSubsrciprion.beans = new ArrayList<>();
+            sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
+            if (chche.size() > 0) {
+                for (int j = 0; j < chche.size(); j++) {
+                    if (sortSubsrciprion.time.equals(chche.get(j).time)) {//如果相同
+                        chche.get(j).beans.add(SubscriptionMessages.get(i));
+                        break;
+                    } else if (j == (chche.size() - 1)) {//如果到最后一个都不相同
                         chche.add(sortSubsrciprion);
+                        break;
                     }
                 }
-                sortSubsrciprions.addAll(chche);
-                handler.sendEmptyMessage(RESULT_OK);
+            } else {
+                chche.add(sortSubsrciprion);
             }
-        });
+        }
+        sortSubsrciprions.addAll(chche);
+        doVistOk();
     }
 
     private void notifyAdapter() {
         if (adapter != null)
-            adapter.notifyDataSetChanged();
+            adapter.setSortSubsrciprions(sortSubsrciprions);
+        else {
+            adapter = new SubscriptionAdapter();
+            adapter.setSortSubsrciprions(sortSubsrciprions);
+            listView.setAdapter(adapter);
+        }
     }
 
     private void setData() {//网络获取数据时候
@@ -288,7 +290,7 @@ public class SubscriptionActivity extends BaseActivity {
     }
 
     private void clearDataToDB(long newlong, long date) {
-         SubscriptionDao.getInstance().deleteMessage(newlong, date, emCode);
+        SubscriptionDao.getInstance().deleteMessage(newlong, date, emCode);
     }
 
     private void saveDataToDB(List<SubscriptionMessage> subscriptionMessages) {
@@ -312,6 +314,7 @@ public class SubscriptionActivity extends BaseActivity {
                 }).create().show();
     }
 
+    //获取数据
     public void loadNetData(long date) {
         //获取网络数据
         String url = baseUrl + "common/desktop/subs/getSubs.action";
@@ -326,11 +329,22 @@ public class SubscriptionActivity extends BaseActivity {
 
     //外层list
     class SubscriptionAdapter extends BaseAdapter {
+        List<SortSubsrciprion> sortSubsrciprions;
+
+        public List<SortSubsrciprion> getSortSubsrciprions() {
+            return sortSubsrciprions;
+        }
+
+        public void setSortSubsrciprions(List<SortSubsrciprion> sortSubsrciprions) {
+            this.sortSubsrciprions = sortSubsrciprions;
+            notifyDataSetChanged();
+        }
+
         private ListAdapter listAdapter = null;
 
         @Override
         public int getCount() {
-            return sortSubsrciprions.size();
+            return ListUtils.isEmpty(sortSubsrciprions) ? 0 : sortSubsrciprions.size();
         }
 
         @Override

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
@@ -106,7 +106,7 @@
                     android:gravity="top"
                     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_client.xml

@@ -485,6 +485,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_one"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -515,6 +516,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_two"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -545,6 +547,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_three"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -889,6 +892,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_customer_lost"
+                android:visibility="gone"
                 style="@style/LinearLayout_vertical">
 
                 <TextView

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

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
+        android:visibility="gone"
         android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">
 
@@ -61,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:text="上班时间提醒"
+            android:text="上班打卡提醒"
             android:textSize="@dimen/text_main" />
 
         <!--<ImageView-->
@@ -96,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:text="下班时间提醒"
+            android:text="下班打卡提醒"
             android:textSize="@dimen/text_main" />
 
         <!--<ImageView-->

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/layout/message_header.xml

@@ -59,7 +59,7 @@
                 android:layout_toLeftOf="@+id/schedule_time_tv"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="待审批流"
+                android:text="待审批流程"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
 
@@ -311,7 +311,7 @@
                 android:layout_toLeftOf="@+id/time_tv"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="订阅号"
+                android:text="我的订阅"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
 

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>

pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java

@@ -54,7 +54,7 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 
 	static final String LOG_TAG = "PullToRefresh";
 
-	static final float FRICTION = 4.0f;
+	static final float FRICTION = 5.0f;
 
 	public static final int SMOOTH_SCROLL_DURATION_MS = 200;
 	public static final int SMOOTH_SCROLL_LONG_DURATION_MS = 325;