2016/8/31 修复首页异常及bug

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

@@ -285,7 +285,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 "\"ma_groupid\":" + "\"" + ids + "\",\n" +
                 "\"ma_id\":" + "\"" + id + "\",\n" +
                 "\"ma_isturndoc\":" + "\"" + "否" + "\",\n" +
-                "\"ma_mrname\":" + "\"" + name_et.getText().toString() + "\",\n" +
+                "\"ma_mrname\":" + "\"" + location_et.getText().toString() + "\",\n" +
                 "\"ma_recorddate\":" + "\"" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "\",\n" +
                 "\"ma_recorder\":" + "\"" + MyApplication.getInstance().mLoginUser.getNickName() + "\",\n" +
                 "\"ma_remark\":" + "\"" + about_et.getText().toString() + "\",\n" +

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

@@ -72,7 +72,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             switch (msg.what) {
                 case whatLoad:
                     object = JSON.parseObject(message).getJSONObject("panelData");
-                    updataUI();
+//                    updataUI();
                     break;
                 case ENDMEET:
                     ToastUtil.showToast(ct, "会议结束成功");
@@ -130,7 +130,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             ma_id = entity.getMa_id();
             ma_code = entity.getMa_code();
         }
-        loadDetailsData();
         loadNumData();
         initView();
     }
@@ -160,13 +159,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initView() {
-        if (entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder())) {
-            end_meet_tv.setVisibility(View.GONE);
-        } else {
-            end_meet_tv.setVisibility(View.VISIBLE);
-        }
-        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);
@@ -174,21 +166,18 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         findViewById(R.id.click_btn).setOnClickListener(this);
         findViewById(R.id.location_tag).setOnClickListener(this);
         findViewById(R.id.add_task_ll).setOnClickListener(this);
-    }
-
-    String baseUrl;
-
-    private void updataUI() {
-        if (object == null) return;
-        name_tv.setText(object.getString("ma_theme"));
-        addr_tv.setText(object.getString("mr_site"));
-        user_tv.setText(object.getString("ma_recorder"));
-        long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
-        oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
-        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
-        oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
+        if (entity == null) return;
+        if (entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder())) {
+            end_meet_tv.setVisibility(View.GONE);
+        } else {
+            end_meet_tv.setVisibility(View.VISIBLE);
+        }
+        //设置会议 地点、介绍、发起人、标签
+        addr_tv.setText(entity.getMa_mrname() == null ? "未填写" : entity.getMa_mrname());
+        sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
+        user_tv.setText(entity.getMa_recorder() == null ? "" : entity.getMa_recorder());
+        tag_tv.setText(entity.getMa_tag() == null ? "" : entity.getMa_tag());
+        //设置会议状态
         String str = entity.getMa_stage();
         if (str == null) {
             if (TimeUtils.f_str_2_long(entity.getMa_starttime()) > System.currentTimeMillis())
@@ -201,9 +190,18 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             }
         }
         status_tv.setText(str);
+        //设置开始和结束时间的显示
+        long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
+        oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
+        oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
+        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
+        oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
+        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
     }
 
-    //下拉页面数据
+    String baseUrl;
+
+    //获取会议详情接口（获取到的数据太少，先不用）
     private void loadDetailsData() {
         progressDialog.show();
         //获取网络数据

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

@@ -288,7 +288,7 @@ public class MeetingActivity extends BaseActivity {
             viewholder.oa_meeting_start_date.setText(TimeUtils.long2str(startLong, "HH:mm"));
             viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));
             viewholder.oa_meeting_name_tv.setText(entity.getMa_theme());
-            viewholder.oa_meeting_addr_tv.setText(entity.getMa_remark());
+            viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
             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_type() == null ? "" : entity.getMa_type());
@@ -313,17 +313,17 @@ public class MeetingActivity extends BaseActivity {
         if (requestCode == this.requestCode) {
             if (resultCode == 0x14) {
                 if ("data".equals(data.getStringExtra("data"))) {
-                    //TODO 刷新
                     list_business.setRefreshing(true);
                     loadNetData(1);
                 }
             } else if (resultCode == 0x15) {
+                Log.i("gongpengming", "resultCode == 0x15");
                 int i = data.getIntExtra("item", -1);
+                Log.i("gongpengming", "item=" + i);
                 if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
+                    Log.i("gongpengming", "item=已结束");
                     entities = adapter.getData();
                     entities.get(i).setStatus("已结束");
-                } else {
-                    entities.get(i).setStatus("进行中");
                 }
                 adapter.setData(entities);
             }

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

@@ -102,7 +102,8 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                         }
                     } else {
                         //如果返回失败
-                        ToastUtil.showToast(ct, "网络连接失败，请稍后再试");
+                        ct.finish();
+                        ToastUtil.showToast(ct, "系统尚未找到您的班次，请联系管理员设置班次");
                     }
                     break;
                 case WHATLOG://获取打卡