2016/08/18-1

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

@@ -12,15 +12,11 @@ public class MeetEntity  implements Parcelable {
     private String ma_starttime;//发起时间
     private String ma_endtime;//结束时间
     private String ma_theme;//主题
+    private String ma_remark;
     private String ma_mrname;//会议地点
     private int ma_id;
-    private String ma_stage;
     private String ma_tag;
-
-
-
-    public MeetEntity() {
-    }
+public MeetEntity(){}
 
     public String getMa_code() {
         return ma_code;
@@ -62,6 +58,14 @@ public class MeetEntity  implements Parcelable {
         this.ma_theme = ma_theme;
     }
 
+    public String getMa_remark() {
+        return ma_remark;
+    }
+
+    public void setMa_remark(String ma_remark) {
+        this.ma_remark = ma_remark;
+    }
+
     public String getMa_mrname() {
         return ma_mrname;
     }
@@ -78,14 +82,6 @@ public class MeetEntity  implements Parcelable {
         this.ma_id = ma_id;
     }
 
-    public String getMa_stage() {
-        return ma_stage;
-    }
-
-    public void setMa_stage(String ma_stage) {
-        this.ma_stage = ma_stage;
-    }
-
     public String getMa_tag() {
         return ma_tag;
     }
@@ -94,40 +90,18 @@ public class MeetEntity  implements Parcelable {
         this.ma_tag = ma_tag;
     }
 
-    public static Creator<MeetEntity> getCREATOR() {
-        return CREATOR;
-    }
-
     protected MeetEntity(Parcel in) {
         ma_code = in.readString();
         ma_recorder = in.readString();
         ma_starttime = in.readString();
         ma_endtime = in.readString();
         ma_theme = in.readString();
+        ma_remark = in.readString();
         ma_mrname = in.readString();
         ma_id = in.readInt();
-        ma_stage = in.readString();
         ma_tag = in.readString();
     }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(ma_code);
-        dest.writeString(ma_recorder);
-        dest.writeString(ma_starttime);
-        dest.writeString(ma_endtime);
-        dest.writeString(ma_theme);
-        dest.writeString(ma_mrname);
-        dest.writeInt(ma_id);
-        dest.writeString(ma_stage);
-        dest.writeString(ma_tag);
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
     public static final Creator<MeetEntity> CREATOR = new Creator<MeetEntity>() {
         @Override
         public MeetEntity createFromParcel(Parcel in) {
@@ -139,4 +113,22 @@ public class MeetEntity  implements Parcelable {
             return new MeetEntity[size];
         }
     };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(ma_code);
+        parcel.writeString(ma_recorder);
+        parcel.writeString(ma_starttime);
+        parcel.writeString(ma_endtime);
+        parcel.writeString(ma_theme);
+        parcel.writeString(ma_remark);
+        parcel.writeString(ma_mrname);
+        parcel.writeInt(ma_id);
+        parcel.writeString(ma_tag);
+    }
 }

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

@@ -93,7 +93,18 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     if (json.getBoolean("success") != null && json.getBoolean("success")) {
                         //TODO 创建会议成功  开始创建群组
                         ToastUtil.showToast(ct, "添加会议成功，正在为你建立会议群");
-                        CreateRoomUtil.getInstance().createRoom(ct, entities, name_et.getText().toString() + "会议群", "创建为了提醒会议成员");
+                        CreateRoomUtil.getInstance().createRoom(ct, entities, name_et.getText().toString() + "会议群", "创建为了提醒会议成员", new CreateRoomUtil.OnCreateRoomListener() {
+                            @Override
+                            public void result(boolean isOk) {
+                                if (isOk) {
+                                    ToastUtil.showToast(ct, "已经为您的会议建立群组");
+                                    Intent intent = new Intent();
+                                    intent.putExtra("data", "data");
+                                    setResult(0x14, intent);
+                                    finish();
+                                }
+                            }
+                        });
 //                        createRoom(name_et.getText().toString() + "会议群", "创建为了提醒会议成员");
                     } else {
                         ToastUtil.showToast(ct, "内部错误,请稍后再试或联系工作人员");

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

@@ -32,6 +32,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private TextView name_tv;
     @ViewInject(R.id.addr_tv)
     private TextView addr_tv;
+    @ViewInject(R.id.sub_tv)
+    private TextView sub_tv;
+    @ViewInject(R.id.tag_tv)
+    private TextView tag_tv;
     @ViewInject(R.id.user_tv)
     private TextView user_tv;
     @ViewInject(R.id.oa_meeting_start)
@@ -119,6 +123,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initView() {
+        sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
+        tag_tv.setText(entity.getMa_tag() == null ? "" : entity.getMa_tag());
 //        getPoinfo();
         findViewById(R.id.meet_save).setOnClickListener(this);
         findViewById(R.id.num_tag).setOnClickListener(this);

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

@@ -215,14 +215,14 @@ public class MeetingActivity extends BaseActivity {
         private void bindData(ViewHolder viewholder, int i) {
             MeetEntity entity = entities.get(i);
             String str = "";
-            if (entity.getMa_stage() == null) {
-                if (TimeUtils.f_str_2_long(entity.getMa_starttime()) > System.currentTimeMillis())
-                    str = "未开始";
-                else
-                    str = "进行中";
-            } else {
-                str = entity.getMa_stage();
-            }
+//            if (entity.getMa_stage() == null) {
+//                if (TimeUtils.f_str_2_long(entity.getMa_starttime()) > System.currentTimeMillis())
+//                    str = "未开始";
+//                else
+//                    str = "进行中";
+//            } else {
+//                str = entity.getMa_stage();
+//            }
             long startLong = TimeUtils.f_str_2_long(entity.getMa_starttime());
             long endLong = TimeUtils.f_str_2_long(entity.getMa_endtime());
             viewholder.oa_meeting_start.setText(TimeUtils.long2str(endLong, "MM月dd日"));
@@ -231,7 +231,7 @@ public class MeetingActivity extends BaseActivity {
             viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));
             viewholder.oa_meeting_name_tv.setText(entity.getMa_theme());
             viewholder.oa_meeting_status_tv.setText(str);
-            viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
+            viewholder.oa_meeting_addr_tv.setText(entity.getMa_remark());
             viewholder.oa_meeting_user_tv.setText(entity.getMa_recorder());
             if (entity.getMa_tag() == null || entity.getMa_tag().length() <= 0) return;
             viewholder.oa_meeting_tag_tv.setText(entity.getMa_tag());

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

@@ -76,7 +76,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/oa_meeting_start_date"
         android:layout_marginTop="10dp"
-        android:text="会议地点"
+        android:text="会议介绍"
         android:textColor="@color/hintColor" />
 
     <TextView