2016/8/1

WeiChat/src/main/AndroidManifest.xml

@@ -441,7 +441,9 @@
         <activity android:name=".ui.erp.activity.crm.BusinessAddActivity" />
         <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity" />
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
-        <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.WorkLogsActivity"
+            android:label="工作日志" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" />
@@ -473,10 +475,10 @@
             android:name=".ui.erp.activity.oa.OutofficeSetActivity"
             android:label="签到设置" />
         <activity android:name=".ui.erp.activity.oa.TestActivity"></activity>
-        <activity android:name=".ui.erp.activity.oa.OutSigninOKActivity"
-            android:label="签到"/>
-        <activity android:name=".ui.erp.activity.crm.ContactManAddActivity" >
-        </activity>
+        <activity
+            android:name=".ui.erp.activity.oa.OutSigninOKActivity"
+            android:label="签到" />
+        <activity android:name=".ui.erp.activity.crm.ContactManAddActivity"></activity>
         <activity android:name=".ui.erp.activity.oa.TestActivity" />
         <activity
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"

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

@@ -0,0 +1,91 @@
+package com.xzjmyk.pm.activity.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+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.circle.PublicMessage;
+import com.xzjmyk.pm.activity.view.MyListView;
+
+import java.util.List;
+
+/**
+ * Created by gongpm on 2016/8/1.
+ */
+public class WorkLogAdapter extends BaseAdapter {
+    private List<PublicMessage> messages;
+    private Context context;
+
+    public WorkLogAdapter(Context context) {
+        this.context = context;
+    }
+
+    public void setData(List<PublicMessage> messages) {
+        this.messages = messages;
+    }
+
+
+    @Override
+    public int getCount() {
+        return messages == null ? 0 : messages.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return messages.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        ViewHolder holder;
+        if (view == null) {
+            holder = new ViewHolder();
+            LayoutInflater.from(context).inflate(R.layout.p_msg_item_main_body, null);
+            holder.avatar_img = (ImageView) view.findViewById(R.id.avatar_img);
+            holder.operation_more_img = (ImageView) view.findViewById(R.id.operation_more_img);
+
+            holder.nick_name_tv = (TextView) view.findViewById(R.id.nick_name_tv);
+            holder.body_tv = (TextView) view.findViewById(R.id.body_tv);
+            holder.time_tv = (TextView) view.findViewById(R.id.time_tv);
+            holder.delete_tv = (TextView) view.findViewById(R.id.delete_tv);
+            holder.location_tv = (TextView) view.findViewById(R.id.location_tv);
+            holder.multi_praise_tv = (TextView) view.findViewById(R.id.multi_praise_tv);
+            holder.img_praise_line = view.findViewById(R.id.img_praise_line);
+            holder.command_listView = (MyListView) view.findViewById(R.id.command_listView);
+            view.setTag(holder);
+        } else {
+            holder = (ViewHolder) view.getTag();
+        }
+        bindData(holder, i);
+        return view;
+    }
+
+    private void bindData(ViewHolder holder, int i) {
+        PublicMessage message = messages.get(i);
+
+
+    }
+
+    class ViewHolder {
+        ImageView avatar_img, //头像
+                operation_more_img;//弹出点赞框
+        TextView nick_name_tv,//名字
+                body_tv,//内容
+                time_tv, //发表时间
+                delete_tv, //删除按钮
+                location_tv;//地址
+        TextView multi_praise_tv;//点赞
+        View img_praise_line;//线
+        MyListView command_listView;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/PublicMessage.java

@@ -6,7 +6,6 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 
  * @项目名称: SkWeiChat-Baidu
  * @包名: com.xzjmyk.pm.activity.bean.circle
  * @作者:王阳
@@ -18,545 +17,554 @@ import java.util.List;
  * @修改的内容: TODO
  */
 public class PublicMessage implements Serializable {
-	private static final long serialVersionUID = -2853687308018351618L;
+    private static final long serialVersionUID = -2853687308018351618L;
 
-	public static class Resource implements Serializable {
-		private static final long serialVersionUID = 1665607875044805022L;
+    public static class Resource implements Serializable {
+        private static final long serialVersionUID = 1665607875044805022L;
 
-		@JSONField(name = "oUrl")
-		private String originalUrl;
+        @JSONField(name = "oUrl")
+        private String originalUrl;
 
-		@JSONField(name = "tUrl")
-		private String thumbnailUrl;
+        @JSONField(name = "tUrl")
+        private String thumbnailUrl;
 
-		private long size;
-		private long length;
+        private long size;
+        private long length;
 
-		public String getOriginalUrl() {
-			return originalUrl;
-		}
+        public String getOriginalUrl() {
+            return originalUrl;
+        }
 
-		public void setOriginalUrl(String originalUrl) {
-			this.originalUrl = originalUrl;
-		}
+        public void setOriginalUrl(String originalUrl) {
+            this.originalUrl = originalUrl;
+        }
 
-		public String getThumbnailUrl() {
-			return thumbnailUrl;
-		}
+        public String getThumbnailUrl() {
+            return thumbnailUrl;
+        }
 
-		public void setThumbnailUrl(String thumbnailUrl) {
-			this.thumbnailUrl = thumbnailUrl;
-		}
+        public void setThumbnailUrl(String thumbnailUrl) {
+            this.thumbnailUrl = thumbnailUrl;
+        }
 
-		public long getSize() {
-			return size;
-		}
+        public long getSize() {
+            return size;
+        }
 
-		public void setSize(long size) {
-			this.size = size;
-		}
+        public void setSize(long size) {
+            this.size = size;
+        }
 
-		public long getLength() {
-			return length;
-		}
+        public long getLength() {
+            return length;
+        }
 
-		public void setLength(long length) {
-			this.length = length;
-		}
+        public void setLength(long length) {
+            this.length = length;
+        }
 
-	}
-
-	public static class Body implements Serializable {
-		private static final long serialVersionUID = -7082197369330985229L;
-		private int type;
-		private String title;// 标题
-		private String text;// 文字
-		private List<Resource> images;
-		private List<Resource> audios;
-		private List<Resource> videos;
-		private long time;// 时间
-		private String address;// 地址
-		private String remark;// 备注
-
-		public int getType() {
-			return type;
-		}
-
-		public void setType(int type) {
-			this.type = type;
-		}
-
-		public String getText() {
-			return text;
-		}
-
-		public void setText(String text) {
-			this.text = text;
-		}
-
-		public String getTitle() {
-			return title;
-		}
-
-		public void setTitle(String title) {
-			this.title = title;
-		}
-
-		public List<Resource> getImages() {
-			return images;
-		}
-
-		public void setImages(List<Resource> images) {
-			this.images = images;
-		}
-
-		public List<Resource> getAudios() {
-			return audios;
-		}
-
-		public void setAudios(List<Resource> audios) {
-			this.audios = audios;
-		}
-
-		public List<Resource> getVideos() {
-			return videos;
-		}
-
-		public void setVideos(List<Resource> videos) {
-			this.videos = videos;
-		}
-
-		public long getTime() {
-			return time;
-		}
-
-		public void setTime(long time) {
-			this.time = time;
-		}
-
-		public String getAddress() {
-			return address;
-		}
-
-		public void setAddress(String address) {
-			this.address = address;
-		}
-
-		public String getRemark() {
-			return remark;
-		}
-
-		public void setRemark(String remark) {
-			this.remark = remark;
-		}
-
-	}
-
-	public static class Count implements Serializable {
-		private static final long serialVersionUID = 5424006468612181115L;
-
-		private int play;// 播放次数
-		private int forward;// 转载次数
-		private int share;// 分享次数
-		private int collect;// 收藏次数
-		private int praise;// 赞次数
-		private int commnet;// 评论数
-		private int money;// 金钱树
-		private int total;// 上面所有值加起来的值
-
-		public int getPlay() {
-			return play;
-		}
-
-		public void setPlay(int play) {
-			this.play = play;
-		}
+    }
+
+    public static class Body implements Serializable {
+        private static final long serialVersionUID = -7082197369330985229L;
+        private int type;
+        private String title;// 标题
+        private String text;// 文字
+        private List<Resource> images;
+        private List<Resource> audios;
+        private List<Resource> videos;
+        private long time;// 时间
+        private String address;// 地址
+        private String remark;// 备注
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public List<Resource> getImages() {
+            return images;
+        }
+
+        public void setImages(List<Resource> images) {
+            this.images = images;
+        }
+
+        public List<Resource> getAudios() {
+            return audios;
+        }
+
+        public void setAudios(List<Resource> audios) {
+            this.audios = audios;
+        }
+
+        public List<Resource> getVideos() {
+            return videos;
+        }
+
+        public void setVideos(List<Resource> videos) {
+            this.videos = videos;
+        }
+
+        public long getTime() {
+            return time;
+        }
+
+        public void setTime(long time) {
+            this.time = time;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+    }
+
+    public static class Count implements Serializable {
+        private static final long serialVersionUID = 5424006468612181115L;
+
+        private int play;// 播放次数
+        private int forward;// 转载次数
+        private int share;// 分享次数
+        private int collect;// 收藏次数
+        private int praise;// 赞次数
+        private int commnet;// 评论数
+        private int money;// 金钱树
+        private int total;// 上面所有值加起来的值
+
+        public int getPlay() {
+            return play;
+        }
+
+        public void setPlay(int play) {
+            this.play = play;
+        }
+
+        public int getForward() {
+            return forward;
+        }
+
+        public void setForward(int forward) {
+            this.forward = forward;
+        }
+
+        public int getShare() {
+            return share;
+        }
+
+        public void setShare(int share) {
+            this.share = share;
+        }
 
-		public int getForward() {
-			return forward;
-		}
+        public int getCollect() {
+            return collect;
+        }
 
-		public void setForward(int forward) {
-			this.forward = forward;
-		}
+        public void setCollect(int collect) {
+            this.collect = collect;
+        }
+
+        public int getPraise() {
+            return praise;
+        }
+
+        public void setPraise(int praise) {
+            this.praise = praise;
+        }
+
+        public int getCommnet() {
+            return commnet;
+        }
+
+        public void setCommnet(int commnet) {
+            this.commnet = commnet;
+        }
+
+        public int getMoney() {
+            return money;
+        }
+
+        public void setMoney(int money) {
+            this.money = money;
+        }
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+    }
 
-		public int getShare() {
-			return share;
-		}
+    /**
+     * 消息类型
+     */
+    public static final int TYPE_TEXT = 1;// 文字类型
+    public static final int TYPE_IMG = 2;// 图片类型
+    public static final int TYPE_VOICE = 3;// 语音
+    public static final int TYPE_VIDEO = 4;// 视频
 
-		public void setShare(int share) {
-			this.share = share;
-		}
+    /**
+     * 消息来源
+     */
+    public static final int SOURCE_SELF = 0;// 0＝自己的
+    public static final int SOURCE_FORWARDING = 1;// 1=转载的
+
+    /**
+     * 消息标志
+     */
+    public static final int FLAG_APPLY_JOB = 1;// 1 求职
+    public static final int FLAG_RECRUIT = 2;// 2招聘
+    public static final int FLAG_NORMAL = 3;// 3 普通
+    public static final int FLAG_WORK_LOG = 0;// 0 工作日志
+
+    /**
+     * 消息可见范围
+     */
+    public static final int VISIBLE_NO = 0;// 0 不可见
+    public static final int VISIBLE_FRIEND = 1;// 1朋友可见
+    public static final int VISIBLE_FANS = 2;// 2 粉丝可见
+    public static final int VISIBLE_ALL = 3;// 3 广场可见（所有人可见）
+
+    @JSONField(name = "msgId")
+    private String messageId;// 公共消息Id
 
-		public int getCollect() {
-			return collect;
-		}
+    private String userId;// 发消息的人Id
 
-		public void setCollect(int collect) {
-			this.collect = collect;
-		}
+    @JSONField(name = "nickname")
+    private String nickName;// 发消息的人的昵称
 
-		public int getPraise() {
-			return praise;
-		}
+    /**
+     * 消息标志 {@link #FLAG_APPLY_JOB}{@link #FLAG_RECRUIT}{@link #FLAG_NORMAL}
+     */
+    private int flag;
 
-		public void setPraise(int praise) {
-			this.praise = praise;
-		}
+    private int visible;// 可见范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
 
-		public int getCommnet() {
-			return commnet;
-		}
+    private Body body;// 消息的内容
 
-		public void setCommnet(int commnet) {
-			this.commnet = commnet;
-		}
+    private Count count;// 次数节点
 
-		public int getMoney() {
-			return money;
-		}
+    private long time;// 发布的时间
 
-		public void setMoney(int money) {
-			this.money = money;
-		}
+    private String model;// 手机设备信息
+    private double latitude;// 发布的经纬度
+    private double longitude;// 发布的经纬度
+    private String location;// 发这条消息是在什么位置
 
-		public int getTotal() {
-			return total;
-		}
+    private int isPraise;// 0没赞过 1赞过
 
-		public void setTotal(int total) {
-			this.total = total;
-		}
+    private List<Comment> comments;// 回复数组
+    private List<Praise> praises;// 赞的列表
+    private List<Gift> gifts;// 收到的礼物列表
 
-	}
+    /**
+     * 消息来源 {@link #SOURCE_SELF}{@link #SOURCE_FORWARDING}
+     */
+    private int source;
 
-	/** 消息类型 */
-	public static final int TYPE_TEXT = 1;// 文字类型
-	public static final int TYPE_IMG = 2;// 图片类型
-	public static final int TYPE_VOICE = 3;// 语音
-	public static final int TYPE_VIDEO = 4;// 视频
+    private String fowardText;// 转载的附加Text
+    private String fowardUserId;
+    private String fowardNickname;
 
-	/** 消息来源 */
-	public static final int SOURCE_SELF = 0;// 0＝自己的
-	public static final int SOURCE_FORWARDING = 1;// 1=转载的
+    public String getFowardText() {
+        return fowardText;
+    }
 
-	/** 消息标志 */
-	public static final int FLAG_APPLY_JOB = 1;// 1 求职
-	public static final int FLAG_RECRUIT = 2;// 2招聘
-	public static final int FLAG_NORMAL = 3;// 3 普通
+    public void setFowardText(String fowardText) {
+        this.fowardText = fowardText;
+    }
 
-	/** 消息可见范围 */
-	public static final int VISIBLE_NO = 0;// 0 不可见
-	public static final int VISIBLE_FRIEND = 1;// 1朋友可见
-	public static final int VISIBLE_FANS = 2;// 2 粉丝可见
-	public static final int VISIBLE_ALL = 3;// 3 广场可见（所有人可见）
+    public String getFowardUserId() {
+        return fowardUserId;
+    }
 
-	@JSONField(name="msgId")
-	private String messageId;// 公共消息Id
+    public void setFowardUserId(String fowardUserId) {
+        this.fowardUserId = fowardUserId;
+    }
 
-	private String userId;// 发消息的人Id
+    public String getFowardNickname() {
+        return fowardNickname;
+    }
 
-	@JSONField(name = "nickname")
-	private String nickName;// 发消息的人的昵称
+    public void setFowardNickname(String fowardNickname) {
+        this.fowardNickname = fowardNickname;
+    }
 
-	/**
-	 * 消息标志 {@link #FLAG_APPLY_JOB}{@link #FLAG_RECRUIT}{@link #FLAG_NORMAL}
-	 */
-	private int flag;
+    public Count getCount() {
+        return count;
+    }
 
-	private int visible;// 可见范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
+    public void setCount(Count count) {
+        this.count = count;
+    }
 
-	private Body body;// 消息的内容
+    public long getTime() {
+        return time;
+    }
 
-	private Count count;// 次数节点
+    public void setTime(long time) {
+        this.time = time;
+    }
 
-	private long time;// 发布的时间
+    public int getVisible() {
+        return visible;
+    }
 
-	private String model;// 手机设备信息
-	private double latitude;// 发布的经纬度
-	private double longitude;// 发布的经纬度
-	private String location;// 发这条消息是在什么位置
+    public void setVisible(int visible) {
+        this.visible = visible;
+    }
 
-	private int isPraise;// 0没赞过 1赞过
+    public int getIsPraise() {
+        return isPraise;
+    }
 
-	private List<Comment> comments;// 回复数组
-	private List<Praise> praises;// 赞的列表
-	private List<Gift> gifts;// 收到的礼物列表
+    public void setIsPraise(int isPraise) {
+        this.isPraise = isPraise;
+    }
 
-	/**
-	 * 消息来源 {@link #SOURCE_SELF}{@link #SOURCE_FORWARDING}
-	 */
-	private int source;
+    public String getUserId() {
+        return userId;
+    }
 
-	private String fowardText;// 转载的附加Text
-	private String fowardUserId;
-	private String fowardNickname;
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 
-	public String getFowardText() {
-		return fowardText;
-	}
+    public String getNickName() {
+        return nickName;
+    }
 
-	public void setFowardText(String fowardText) {
-		this.fowardText = fowardText;
-	}
+    public void setNickName(String nickname) {
+        this.nickName = nickname;
+    }
 
-	public String getFowardUserId() {
-		return fowardUserId;
-	}
+    public int getSource() {
+        return source;
+    }
 
-	public void setFowardUserId(String fowardUserId) {
-		this.fowardUserId = fowardUserId;
-	}
-
-	public String getFowardNickname() {
-		return fowardNickname;
-	}
-
-	public void setFowardNickname(String fowardNickname) {
-		this.fowardNickname = fowardNickname;
-	}
-
-	public Count getCount() {
-		return count;
-	}
-
-	public void setCount(Count count) {
-		this.count = count;
-	}
-
-	public long getTime() {
-		return time;
-	}
-
-	public void setTime(long time) {
-		this.time = time;
-	}
-
-	public int getVisible() {
-		return visible;
-	}
-
-	public void setVisible(int visible) {
-		this.visible = visible;
-	}
-
-	public int getIsPraise() {
-		return isPraise;
-	}
-
-	public void setIsPraise(int isPraise) {
-		this.isPraise = isPraise;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getNickName() {
-		return nickName;
-	}
-
-	public void setNickName(String nickname) {
-		this.nickName = nickname;
-	}
-
-	public int getSource() {
-		return source;
-	}
-
-	public void setSource(int source) {
-		this.source = source;
-	}
-
-	public int getFlag() {
-		return flag;
-	}
-
-	public void setFlag(int flag) {
-		this.flag = flag;
-	}
-
-	public Body getBody() {
-		return body;
-	}
-
-	public void setBody(Body body) {
-		this.body = body;
-	}
-
-	public List<Comment> getComments() {
-		return comments;
-	}
-
-	public void setComments(List<Comment> comments) {
-		this.comments = comments;
-	}
-
-	public List<Praise> getPraises() {
-		return praises;
-	}
-
-	public void setPraises(List<Praise> praises) {
-		this.praises = praises;
-	}
-
-	public List<Gift> getGifts() {
-		return gifts;
-	}
-
-	public void setGifts(List<Gift> gifts) {
-		this.gifts = gifts;
-	}
-
-	public String getLocation() {
-		return location;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageId) {
-		this.messageId = messageId;
-	}
-
-	public String getModel() {
-		return model;
-	}
-
-	public void setModel(String model) {
-		this.model = model;
-	}
-
-	public double getLatitude() {
-		return latitude;
-	}
-
-	public void setLatitude(double latitude) {
-		this.latitude = latitude;
-	}
-
-	public double getLongitude() {
-		return longitude;
-	}
-
-	public void setLongitude(double longitude) {
-		this.longitude = longitude;
-	}
-
-	// /////////////////////快捷方法///////////////////////////
-	public int getType() {
-		if (body != null) {
-			return body.getType();
-		}
-		return TYPE_TEXT;
-	}
-
-	public String getFirstImageThumbnail() {
-		if (body != null && body.getImages() != null && body.getImages().size() > 0) {
-			return body.getImages().get(0).getThumbnailUrl();
-		}
-		return null;
-	}
-
-	public String getFirstImageOriginal() {
-		if (body != null && body.getImages() != null && body.getImages().size() > 0) {
-			return body.getImages().get(0).getOriginalUrl();
-		}
-		return null;
-	}
-
-	public String getFirstVideo() {
-		if (body != null && body.getVideos() != null && body.getVideos().size() > 0) {
-			return body.getVideos().get(0).getOriginalUrl();
-		}
-		return null;
-	}
-
-	public String getFirstAudio() {
-		if (body != null && body.getAudios() != null && body.getAudios().size() > 0) {
-			return body.getAudios().get(0).getOriginalUrl();
-		}
-		return null;
-	}
-
-	// 获取次数的快捷方法
-	public int getPlay() {
-		if (count != null) {
-			return count.getPlay();
-		}
-		return 0;
-	}
-
-	public int getForward() {
-		if (count != null) {
-			return count.getForward();
-		}
-		return 0;
-	}
-
-	public int getShare() {
-		if (count != null) {
-			return count.getShare();
-		}
-		return 0;
-	}
-
-	public int getCollect() {
-		if (count != null) {
-			return count.getCollect();
-		}
-		return 0;
-	}
-
-	public int getPraise() {
-		if (count != null) {
-			return count.getPraise();
-		}
-		return 0;
-	}
-
-	public void setPraise(int praiseCount) {
-		if (count == null) {
-			count = new Count();
-		}
-		count.setPraise(praiseCount);
-	}
-
-	public int getCommnet() {
-		if (count != null) {
-			return count.getCommnet();
-		}
-		return 0;
-	}
-
-	public void setCommnet(int commentCount) {
-		if (count == null) {
-			count = new Count();
-		}
-		count.setCommnet(commentCount);
-	}
-	
-	public int getMoney() {
-		if (count != null) {
-			return count.getMoney();
-		}
-		return 0;
-	}
-
-	public int getTotal() {
-		if (count != null) {
-			return count.getTotal();
-		}
-		return 0;
-	}
+    public void setSource(int source) {
+        this.source = source;
+    }
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public void setFlag(int flag) {
+        this.flag = flag;
+    }
+
+    public Body getBody() {
+        return body;
+    }
+
+    public void setBody(Body body) {
+        this.body = body;
+    }
+
+    public List<Comment> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<Comment> comments) {
+        this.comments = comments;
+    }
+
+    public List<Praise> getPraises() {
+        return praises;
+    }
+
+    public void setPraises(List<Praise> praises) {
+        this.praises = praises;
+    }
+
+    public List<Gift> getGifts() {
+        return gifts;
+    }
+
+    public void setGifts(List<Gift> gifts) {
+        this.gifts = gifts;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+
+    // /////////////////////快捷方法///////////////////////////
+    public int getType() {
+        if (body != null) {
+            return body.getType();
+        }
+        return TYPE_TEXT;
+    }
+
+    public String getFirstImageThumbnail() {
+        if (body != null && body.getImages() != null && body.getImages().size() > 0) {
+            return body.getImages().get(0).getThumbnailUrl();
+        }
+        return null;
+    }
+
+    public String getFirstImageOriginal() {
+        if (body != null && body.getImages() != null && body.getImages().size() > 0) {
+            return body.getImages().get(0).getOriginalUrl();
+        }
+        return null;
+    }
+
+    public String getFirstVideo() {
+        if (body != null && body.getVideos() != null && body.getVideos().size() > 0) {
+            return body.getVideos().get(0).getOriginalUrl();
+        }
+        return null;
+    }
+
+    public String getFirstAudio() {
+        if (body != null && body.getAudios() != null && body.getAudios().size() > 0) {
+            return body.getAudios().get(0).getOriginalUrl();
+        }
+        return null;
+    }
+
+    // 获取次数的快捷方法
+    public int getPlay() {
+        if (count != null) {
+            return count.getPlay();
+        }
+        return 0;
+    }
+
+    public int getForward() {
+        if (count != null) {
+            return count.getForward();
+        }
+        return 0;
+    }
+
+    public int getShare() {
+        if (count != null) {
+            return count.getShare();
+        }
+        return 0;
+    }
+
+    public int getCollect() {
+        if (count != null) {
+            return count.getCollect();
+        }
+        return 0;
+    }
+
+    public int getPraise() {
+        if (count != null) {
+            return count.getPraise();
+        }
+        return 0;
+    }
+
+    public void setPraise(int praiseCount) {
+        if (count == null) {
+            count = new Count();
+        }
+        count.setPraise(praiseCount);
+    }
+
+    public int getCommnet() {
+        if (count != null) {
+            return count.getCommnet();
+        }
+        return 0;
+    }
+
+    public void setCommnet(int commentCount) {
+        if (count == null) {
+            count = new Count();
+        }
+        count.setCommnet(commentCount);
+    }
+
+    public int getMoney() {
+        if (count != null) {
+            return count.getMoney();
+        }
+        return 0;
+    }
+
+    public int getTotal() {
+        if (count != null) {
+            return count.getTotal();
+        }
+        return 0;
+    }
 
 }

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

@@ -115,7 +115,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         super.onCreate(savedInstanceState);
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
-
         if (TextUtils.isEmpty(mLoginUserId)) {// 容错
             return;
         }
@@ -580,8 +579,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         params.put("access_token", MyApplication.getInstance().mAccessToken);
         params.put("pageSize", "" + 10);
         params.put("type", "0");
-        Log.i("Arison", "params:" + JSON.toJSONString(params));
-        Log.i("Arison", "url:" + mConfig.MSG_LIST);
         StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(
                 mConfig.MSG_LIST, new Response.ErrorListener() {
             @Override
@@ -619,51 +616,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         addDefaultRequest(request);
     }
 
-    //TODO 接口错误，后期整合如无用删除
-    private void requestMyBusiness(final boolean isPullDwonToRefersh, int i) {
-        if (isPullDwonToRefersh) {
-            mPageIndex = 0;
-        }
-        List<String> msgIds = CircleMessageDao.getInstance().getCircleMessageIds(mLoginUserId, mPageIndex, AppConfig.PAGE_SIZE);
-        if (msgIds == null || msgIds.size() <= 0) {
-            mPullToRefreshListView.onRefreshComplete(200);
-            return;
-        }
-
-        HashMap<String, String> params = new HashMap<String, String>();
-        params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("ids", JSON.toJSONString(msgIds));
-
-        StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(mConfig.MSG_GETS, new ErrorListener() {
-            @Override
-            public void onErrorResponse(VolleyError arg0) {
-                ToastUtil.showErrorNet(BusinessCircleActivity.this);
-                mPullToRefreshListView.onRefreshComplete();
-            }
-        }, new StringJsonArrayRequest.Listener<PublicMessage>() {
-            @Override
-            public void onResponse(ArrayResult<PublicMessage> result) {
-                boolean success = Result.defaultParser(BusinessCircleActivity.this, result, true);
-                if (success) {
-                    List<PublicMessage> datas = result.getData();
-                    if (isPullDwonToRefersh) {
-                        mMessages.clear();
-                    }
-                    if (datas != null && datas.size() > 0) {// 没有更多数据
-                        mPageIndex++;
-                        if (isPullDwonToRefersh) {
-                            FileDataHelper.writeFileData(BusinessCircleActivity.this, mLoginUserId, FileDataHelper.FILE_BUSINESS_CIRCLE, result);
-                        }
-                        mMessages.addAll(datas);
-                    }
-                    mAdapter.notifyDataSetChanged();
-                }
-                mPullToRefreshListView.onRefreshComplete();
-            }
-        }, PublicMessage.class, params);
-        addDefaultRequest(request);
-    }
-
     private void requestSpace(final boolean isPullDwonToRefersh) {
         String messageId = null;
         if (!isPullDwonToRefersh && mMessages.size() > 0) {

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

@@ -7,18 +7,21 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.view.SingleDialog;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,7 +48,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     @ViewInject(R.id.et_business_createTime)
     private FormEditText et_business_createTime;
     @ViewInject(R.id.et_business)
-    private FormEditText  et_business;
+    private FormEditText et_business;
     @ViewInject(R.id.et_business_jieDuan)
     private FormEditText et_business_jieDuan;
     @ViewInject(R.id.et_business_enterTime)
@@ -64,6 +67,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private FormEditText et_company_tele;
 
     private List<String> lists = new ArrayList<String>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -78,15 +82,15 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         et_business_jieDuan.setOnClickListener(this);
         et_business_source.setOnClickListener(this);
         et_business_enterMan.setOnClickListener(this);
-
+//        et_business_no.setOnClickListener(this);
         et_business.setKeyListener(null);
+//        et_business_no.setKeyListener(null);
         et_business_jieDuan.setKeyListener(null);
         et_business_source.setKeyListener(null);
         et_business_enterMan.setKeyListener(null);
     }
-
     private void initData() {
-
+        getCodeByNet();
     }
 
     private void initView() {
@@ -96,20 +100,23 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View v) {
-       switch (v.getId()){
-           case R.id.et_business:
-               loadBusiness();
-               break;
-           case R.id.et_business_source:
-               loadSource();
-               break;
-           case R.id.et_business_enterMan:
-               loadManGenJin();
-               break;
-          case R.id.et_business_jieDuan:
-               loadJieDuan();
-              break;
-       }
+        switch (v.getId()) {
+            case R.id.et_business:
+                loadBusiness();
+                break;
+            case R.id.et_business_source:
+                loadSource();
+                break;
+            case R.id.et_business_enterMan:
+                loadManGenJin();
+                break;
+            case R.id.et_business_no:
+
+                break;
+            case R.id.et_business_jieDuan:
+                loadJieDuan();
+                break;
+        }
     }
 
     @Override
@@ -123,8 +130,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-
-
+                sendHttpResquest();
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -133,45 +139,65 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         return true;
     }
 
-    private static final int LOAD_SOURCE=2;
-    private static  final int LOAD_BUSINESS=3;
-    private static  final int LOAD_JIEDUAN=4;
-    private static  final int LOAD_MANGENJIN=5;
-    private Handler mHandler=new Handler(){
+    private static final int codeWhat = 0x11;
+    private static final int LOAD_SOURCE = 2;
+    private static final int LOAD_BUSINESS = 3;
+    private static final int LOAD_JIEDUAN = 4;
+    private static final int LOAD_MANGENJIN = 5;
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
+                case codeWhat://获取编号
+                    progressDialog.dismiss();
+                    String temp = JSON.parseObject(msg.getData().getString("result")).getString("code");
+                    et_business_no.setText(temp);
+                    break;
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    ToastUtil.showToast(BusinessAddActivity.this, "添加商机成功");
+                    finish();
                     break;
-                case LOAD_BUSINESS:
+                case LOAD_BUSINESS://商机库
                     progressDialog.dismiss();
+                    lists.clear();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                   break;
+                    String object = msg.getData().getString("result");
+                    JSONArray jsons = JSON.parseObject(object).getJSONArray("combos");
+                    if (!jsons.isEmpty()) {
+                        for (int i = 0; i < jsons.size(); i++) {
+                            //TODO 没有数据，不知道字段是什么  已实际情况修改字段
+                            lists.add(jsons.getJSONObject(i).getString("BS_NAME"));
+                        }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(et_business, "商机库");
+                    break;
                 case LOAD_JIEDUAN:
                     progressDialog.dismiss();
                     lists.clear();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    String json= msg.getData().getString("result");
-                    JSONArray array= JSON.parseObject(json).getJSONArray("stages");
-                    if (!array.isEmpty()){
-                    for (int i = 0; i < array.size(); i++) {
-                        lists.add(array.getJSONObject(i).getString("BS_NAME"));
-                    }
+                    String json = msg.getData().getString("result");
+                    JSONArray array = JSON.parseObject(json).getJSONArray("stages");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            lists.add(array.getJSONObject(i).getString("BS_NAME"));
+                        }
                     }
                     if (lists.isEmpty()) {
                         lists.add("无");
                     }
-                    showSimpleDialog(et_business_jieDuan,"商机阶段");
+                    showSimpleDialog(et_business_jieDuan, "商机阶段");
                     break;
                 case LOAD_MANGENJIN:
                     progressDialog.dismiss();
                     lists.clear();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                     json= msg.getData().getString("result");
-                     array= JSON.parseObject(json).getJSONArray("recorders");
-                    if (!array.isEmpty()){
+                    json = msg.getData().getString("result");
+                    array = JSON.parseObject(json).getJSONArray("recorders");
+                    if (!array.isEmpty()) {
                         for (int i = 0; i < array.size(); i++) {
                             lists.add(array.getJSONObject(i).getString("BC_RECORDER"));
                         }
@@ -181,9 +207,22 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     }
                     showSimpleDialog(et_business_enterMan, "跟进人");
                     break;
-                case LOAD_SOURCE:
+                case LOAD_SOURCE://商机来源
                     progressDialog.dismiss();
+                    lists.clear();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    object = msg.getData().getString("result");
+                    jsons = JSON.parseObject(object).getJSONArray("combos");
+                    if (!jsons.isEmpty()) {
+                        for (int i = 0; i < jsons.size(); i++) {
+                            //TODO 没有数据，不知道字段是什么  已实际情况修改字段
+                            lists.add(jsons.getJSONObject(i).getString("BS_NAME"));
+                        }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(et_business_source, "商机来源");
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -193,33 +232,98 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         }
     };
 
+
+    private String getEditText(EditText et) {
+        String temp = "";
+        temp = et.getText().toString().trim();
+        return temp;
+    }
+
     /**
-      * @desc:保存商机
-      * @author：Arison on 2016/7/20
-      */
-    private void sendHttpResquest(){
+     * @desc:保存商机
+     * @author：Arison on 2016/7/20
+     */
+    private void sendHttpResquest() {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"crm/chance/saveBusinessChance.action";
-        Map<String,Object> params=new HashMap<>();
-        params.put("formStore", "");
+        String url = Constants.getAppBaseUrl(ct) + "crm/chance/saveBusinessChance.action";
+        Map<String, Object> params = new HashMap<>();
+        String name = getEditText(et_business_name); //商机名称
+        String from = getEditText(et_business_source); //商机来源
+        String bt_tel = getEditText(et_company_tele); //电话（联系方式）
+        String bc_recorddate = getEditText(et_business_createTime); //创建时间
+        String bc_nichehouse = getEditText(et_business); //商机库
+        String bc_currentprocess = getEditText(et_business_jieDuan); //当前阶段
+        String bc_recorder = MyApplication.getInstance().mLoginUser.getNickName(); //创建人
+        String bc_address = getEditText(et_company_address); //地址
+        String bc_lastdate = getEditText(et_business_enterTime); //最后跟进时间
+        String bc_custname = getEditText(et_company_name); //企业名称
+        String bc_doman = getEditText(et_business_enterMan);//跟进人
+        String bc_contact = getEditText(et_company_man); //联系人
+        String bc_remark = getEditText(et_business_source);//备注
+        String bc_position = getEditText(et_company_position); //职位
+        String bc_type = "1";  //商机类型
+        String formStore = "{\n" +
+                "\"bc_description\":\"" + name + "\",\n" +   //商机名称
+
+                "\"bc_from\":\"" + from + "\",\n" +          //商机来源
+
+                "\"bc_nichehouse\":\"" + bc_nichehouse + "\",\n" +      //商机库
+
+                "\"bc_currentprocess\":\"" + bc_currentprocess + "\",\n" +   //当前阶段
+
+                "\"bc_recorddate\":\"" + bc_recorddate + "\",\n" +   //创建时间
+
+                "\"bc_recorder\":\"" + bc_recorder + "\",\n" +   //创建人
+
+                "\"bc_lastdate\":\"" + bc_lastdate + "\",\n" +   //最后跟进时间
+
+                "\"bc_doman\":\"" + bc_doman + "\",\n" +   //跟进人
+
+                "\"bc_remark\":\"" + bc_remark + "\",\n" +   //备注
+
+                "\"bc_custname\":\"" + bc_custname + "\",\n" +   //企业名称
+
+                "\"bc_address\":\"" + bc_address + "\",\n" +   //地址
+
+                "\"bc_contact\":\"" + bc_contact + "\",\n" +   //联系人
+
+                "\"bc_position\":\"" + bc_position + "\",\n" +   //职位
+
+                "\"bt_tel\":\"" + bt_tel + "\",\n" +   //电话
+
+                "\"bc_type\":\"" + bc_type + "\"\n" +   //商机类型
+
+                "}";
+        params.put("formStore", formStore);
         params.put("caller", "BusinessChance");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "get");
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
     }
 
+    private void getCodeByNet() {
+        String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
+        final Map<String, Object> param = new HashMap<>();
+        String caller = "Meetingroomapply";
+        param.put("caller", caller);
+        param.put("type", 2);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+    }
 
     /**
-      * @desc:加载来源
-      * @author：Arison on 2016/7/20
-      */
-    public void loadSource(){
+     * @desc:加载来源
+     * @author：Arison on 2016/7/20
+     */
+    public void loadSource() {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceCombo.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("caller", "nichefrom");
         params.put("field", "bc_from");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_SOURCE, null, null, "post");
     }
@@ -228,66 +332,65 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
      * @desc:加载商机库
      * @author：Arison on 2016/7/20
      */
-    public void loadBusiness(){
+    public void loadBusiness() {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceCombo.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("caller", "nichefrom");
         params.put("field", "bc_nichehouse");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers,LOAD_BUSINESS, null, null, "post");
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_BUSINESS, null, null, "post");
     }
 
 
-
     /**
      * @desc:加载阶段
      * @author：Arison on 2016/7/20
      */
-    public void loadJieDuan(){
+    public void loadJieDuan() {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceStage.action";
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceStage.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("condition", "1=1");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_JIEDUAN, null, null, "post");
     }
 
 
-
     /**
      * @desc:加载跟进人
      * @author：Arison on 2016/7/20
      */
-    public void loadManGenJin(){
+    public void loadManGenJin() {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceRecorder.action";
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceRecorder.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("caller", "employee");
         params.put("condition", "1=1");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_MANGENJIN, null, null, "post");
     }
 
 
     private SingleDialog singleDialog;
-    public void showSimpleDialog(final FormEditText et,String title) {
-        if (singleDialog!=null){
+
+    public void showSimpleDialog(final FormEditText et, String title) {
+        if (singleDialog != null) {
             if (singleDialog.isShowing())
-            return;
+                return;
         }
         singleDialog = new SingleDialog(ct, title,
-                    new SingleDialog.PickDialogListener() {
-                        @Override
-                        public void onListItemClick(int position, String value) {
-                           et.setText(value);
-                        }
-                    });
-            singleDialog.show();
-            singleDialog.initViewData(lists);
+                new SingleDialog.PickDialogListener() {
+                    @Override
+                    public void onListItemClick(int position, String value) {
+                        et.setText(value);
+                    }
+                });
+        singleDialog.show();
+        singleDialog.initViewData(lists);
        /* } else {
             singleDialog.show();
             singleDialog.initViewData(lists);

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

@@ -2,92 +2,157 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
+import android.widget.ListView;
 
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 工作日志
  * by gongpm 16\07\05
  */
 public class WorkLogsActivity extends BaseActivity {
-
-    private PullToRefreshListView listView;
     private WorkLogsActivity ct;
-    private WorkLogsAdapter adapter;
+    private SuperSwipeRefreshLayout root_view;
+    private ListView context_rv;
+    private List<PublicMessage> mMessages;//消息对象
+
+    private static int requestCode = 0x21;
+    public static int resultCode = 0x22;
+
+    private final static int LOAD_WHAT = 0x11;//获取消息列表接口
+    private final static int ADD_WHAT = 0x12;//添加评论接口
+    private PublicMessageAdapter mAdapter;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = msg.getData().getString("result");
+            switch (msg.what) {
+                case LOAD_WHAT:
+                    mMessages = JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toString(), PublicMessage.class);
+                    upDataUi();
+                    break;
+            }
+        }
+    };
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_work_logs);
         ct = this;
-        init();
+        mMessages = new ArrayList<>();
         initView();
     }
-    private void initView() {
-        listView = (PullToRefreshListView) findViewById(R.id.listView);
-        listView.setAdapter(adapter);
-    }
-
-    private void init() {
-        adapter = new WorkLogsAdapter();
 
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.add_item:
+                startActivityForResult(new Intent(ct, AddLogActivity.class), requestCode);
+                break;
+        }
+        return super.onContextItemSelected(item);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_oa_logs, menu);
+        getMenuInflater().inflate(R.menu.menu_add_icon, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-//            case R.id.sreach:
-//                break;
-            case R.id.add:
-                startActivity(new Intent(WorkLogsActivity.this, AddLogActivity.class));
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == this.requestCode) {
+            if (resultCode == this.resultCode) {
 
-
-    class WorkLogsAdapter extends BaseAdapter {
-        @Override
-        public int getCount() {
-            return 10;
+            }
         }
 
-        @Override
-        public Object getItem(int i) {
-            return null;
-        }
+    }
 
-        @Override
-        public long getItemId(int i) {
-            return i;
-        }
+    //获取数据后更新界面
+    private void upDataUi() {
+        if (mAdapter==null)
+        mAdapter = new PublicMessageAdapter(ct, mMessages);
 
-        @Override
-        public View getView(int i, View view, ViewGroup viewGroup) {
-            if (view == null) {
-                view = LayoutInflater.from(ct).inflate(R.layout.item_activity_worklogs, null);
+        context_rv.setAdapter(mAdapter);
+    }
 
-            } else {
+    private void initView() {
+        root_view = (SuperSwipeRefreshLayout) findViewById(R.id.root_view);
+        context_rv = (ListView) findViewById(R.id.context_rv);
+        root_view.setHeaderView(getHeaderView());
+        root_view.setOnPullRefreshListener(new SuperSwipeRefreshLayout.OnPullRefreshListener() {
+            @Override
+            public void onRefresh() {
+                //TODO 开始刷新
+            }
 
+            @Override
+            public void onPullDistance(int distance) {
+                //TODO 下拉距离
+            }
 
+            @Override
+            public void onPullEnable(boolean enable) {
+                //TODO 下拉过程中，下拉的距离是否足够出发刷新
             }
+        });
 
+        initData();
+    }
 
-            return view;
+    private void initData() {
+        requestSpace(LOAD_WHAT);
+    }
+
+    /**
+     * 获取头视图
+     *
+     * @return
+     */
+    private View getHeaderView() {
+        View headerView = LayoutInflater.from(ct).inflate(R.layout.space_cover_view, null);
+        //TODO 对于头视图的操作
+        return headerView;
+    }
+
+    /**
+     * 获取工作日志（朋友圈）数据接口
+     */
+    private void requestSpace(int what) {
+        //参数
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("userId", MyApplication.getInstance().mLoginUser.getUserId());
+        params.put("flag", PublicMessage.FLAG_NORMAL + "");
+        String messageId = null;
+        if (mMessages.size() > 0) {
+            messageId = mMessages.get(mMessages.size() - 1).getMessageId();
+        }
+        if (!TextUtils.isEmpty(messageId)) {
+            params.put("messageId", messageId);
         }
+        params.put("pageSize", "10");
+        ViewUtil.httpSendRequest(this, mConfig.MSG_LIST, params, handler, null, what, null, null, "get");
     }
 }

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

@@ -140,7 +140,7 @@
                     style="@style/form_relative_right_text"
                     whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                     whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                    whatever:testType="regexp" />
+                    whatever:testType="date" />
             </RelativeLayout>
 
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
@@ -279,6 +279,7 @@
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_man"
                     style="@style/form_relative_right_text"
+                    android:hint="不能超过3个字符"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
@@ -296,10 +297,10 @@
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
-                <com.andreabaccega.widget.FormEditText
-                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_position"
                     style="@style/form_relative_right_text"
+                    android:hint="不能超过3个字符"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
@@ -317,12 +318,11 @@
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
-                <com.andreabaccega.widget.FormEditText
-                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_tele"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="phone" />
             </RelativeLayout>
 
         </LinearLayout>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/listView"
+<com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_below="@+id/top"
-    android:layout_marginTop="10dp"
-    android:dividerHeight="2px"
-    android:divider="@color/item_line"
-    android:background="@color/item_color2"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity"/>
+    android:background="@color/white">
+
+    <ListView
+        android:id="@+id/context_rv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>