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

WeiChat/src/main/AndroidManifest.xml

@@ -431,10 +431,10 @@
             android:label="外勤签到" />
         <activity
             android:name=".ui.erp.activity.oa.MeetDetailsActivity"
-            android:label="会议签到" />
+            android:label="会议详情" />
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
-            android:label="查看签到情况" />
+            android:label="会议签到" />
         <activity
             android:name=".ui.erp.activity.crm.CustomerAddActivity"
             android:configChanges="orientation|keyboardHidden"

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

@@ -10,7 +10,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
@@ -27,10 +26,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -88,7 +85,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         tv_priority.setOnClickListener(this);
         tv_date.setOnClickListener(this);
         tv_date_start.setOnClickListener(this);
-        findViewById(R.id.sex_erp_rl).setOnClickListener(this);
+        findViewById(R.id.tv_executive).setOnClickListener(this);
         tv_date.setKeyListener(null);
         tv_date.setFocusable(false);
         tv_date_start.setKeyListener(null);
@@ -128,12 +125,27 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         return true;
     }
 
-    public void showDialog(final TextView tv) {
-        DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
+    public void showDialog(final FormEditText tv, final boolean b) {
+        final DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
         dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dia, long date) {
                 String str = TimeUtils.f_long_2_str(date);
-                tv.setText(str);
+                String start = null;
+                if (!b) {
+                    start = tv_date_start.getText().toString();
+                    if (str.compareTo(start) < 0) {
+                        ToastUtil.showToast(ct, "结束时间不能小于开始时间");
+                    } else {
+                        tv.setText(str);
+                    }
+                } else {
+                    start = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                    if (str.compareTo(start) < 0) {
+                        ToastUtil.showToast(ct, "开始时间不能小于当前时间");
+                    } else {
+                        tv.setText(str);
+                    }
+                }
             }
         });
         dialog.show();
@@ -270,41 +282,17 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         sex_option.show();
     }
 
-    private void showDateDialog(final FormEditText view) {
-        DatePicker picker = new DatePicker(this);
-        picker.setRange(1950, 2030);
-        picker.setSelectedItem(
-                Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1,
-                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
-            @Override
-            public void onDatePicked(String year, String month, String day) {
-                switch (view.getId()) {
-                    case R.id.tv_date:
-                        view.setText(year + "-" + month + "-" + day);
-                        break;
-                    case R.id.tv_date_start:
-                        view.setText(year + "-" + month + "-" + day);
-                        break;
-                }
-
-
-            }
-        });
-        picker.show();
-    }
 
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_date_start:
-                showDialog(tv_date_start);
+                showDialog(tv_date_start, true);
 //                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
                 break;
             case R.id.tv_date:
                 if (tv_date_start.getText() != null && tv_date_start.getText().toString().length() > 0) {
-                    showDialog(tv_date);
+                    showDialog(tv_date, false);
                 } else {
                     ToastUtil.showToast(ct, "请先填写开始日期");
                 }
@@ -316,7 +304,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             case R.id.tv_priority:
                 showPriorityDialog(tv_priority, 0x11);
                 break;
-            case R.id.sex_erp_rl:
+            case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
                 intent.putExtra("single", true);
                 startActivityForResult(intent, 0x11);

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

@@ -51,7 +51,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_customer_login;
     @ViewInject(R.id.tv_linksman_login)
     private FormEditText tv_linksman_login;
-
     @ViewInject(R.id.tv_date_start)
     private FormEditText tv_date_start;
     @ViewInject(R.id.tv_date_end)

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

@@ -51,6 +51,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private Button click_btn;
     @ViewInject(R.id.oa_meeting_start_date)
     private TextView oa_meeting_start_date;
+    @ViewInject(R.id.end_meet_tv)
+    private TextView end_meet_tv;
     @ViewInject(R.id.status_tv)
     private TextView status_tv;
     @ViewInject(R.id.location_tv)
@@ -158,6 +160,11 @@ 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();
@@ -277,10 +284,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             param.put("em_code", em_code);
             param.put("ma_code", ma_id);
         }
-//        param.put("emcode", em_code);
-//        if (type != ENDMEET)
-//            param.put("caller", caller);
-//        param.put("ma_id", ma_id);
         param.put("sessionId", sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -466,6 +466,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
     /**
      * 点击我和我的下属的工作日志中的标识变化
+     *
      * @param isMy 是否是 我的工作日志
      */
     private void chaneTAG(boolean isMy) {
@@ -616,6 +617,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             }
             if (chche.getStatus() != null) {//状态
                 viewholder.item_status_tv.setText(chche.getStatus());
+                if ("已拜访".equals(chche.getStatus())) {
+                    viewholder.item_doit_tv.setVisibility(View.GONE);
+                } else {
+                    viewholder.item_doit_tv.setVisibility(View.VISIBLE);
+                }
             } else {
                 viewholder.item_status_tv.setText("");
             }

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

@@ -48,13 +48,15 @@ public class SaveMeetActivity extends BaseActivity {
                     ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要失败");
                 }
             } else if (msg.what == 0x12) {
-                JSONObject json = JSON.parseObject(message);
-                if (json.containsKey("success") && json.getBoolean("success")) {
-                    ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
-                    finish();
-                } else {
-                    ToastUtil.showToast(SaveMeetActivity.this, "更新会议纪要失败");
-                }
+                ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
+                finish();
+//                JSONObject json = JSON.parseObject(message);
+//                if (json.containsKey("success") && json.getBoolean("success")) {
+//                    ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
+//                    finish();
+//                } else {
+//                    ToastUtil.showToast(SaveMeetActivity.this, "更新会议纪要失败");
+//                }
             }
         }
     };
@@ -67,11 +69,13 @@ public class SaveMeetActivity extends BaseActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_visit_save, menu);
         return super.onCreateOptionsMenu(menu);
     }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -113,6 +117,7 @@ public class SaveMeetActivity extends BaseActivity {
         }
         doSave(builder.toString());
     }
+
     private void updataCode() {
         //获取网络数据
         if (bean == null) {

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

@@ -957,10 +957,10 @@ public class MessageFragment extends EasyFragment {
                 }
                 TASK_count = task_num;
                 handler.sendEmptyMessage(TASK_MSG);
-//                DAIBAN_count = daiban_num;
-//                handler.sendEmptyMessage(DAIBAN_MSG);
-                SUBRICE_count = pagin_num;
-                handler.sendEmptyMessage(SUBRICE_MSG);
+                DAIBAN_count = daiban_num;
+                handler.sendEmptyMessage(DAIBAN_MSG);
+//                SUBRICE_count = pagin_num;
+//                handler.sendEmptyMessage(SUBRICE_MSG);
             }
         }
     }

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

@@ -32,6 +32,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textColor="@color/white"
                 android:layout_marginTop="2dp"
                 android:text="会议纪要" />
         </LinearLayout>
@@ -55,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
+                android:textColor="@color/white"
                 android:text="分配任务" />
         </LinearLayout>
     </LinearLayout>

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

@@ -10,7 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="44dp"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <RadioButton
             android:id="@+id/sin_rb"
@@ -31,17 +32,14 @@
             android:button="@null"
             android:drawableTop="@drawable/outoffice_play"
             android:gravity="center"
-            android:text="足迹"
-            android:visibility="gone" />
+            android:text="足迹" />
 
     </RadioGroup>
-
     <View
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:layout_above="@+id/top"
         android:background="@color/item_line" />
-
     <FrameLayout
         android:id="@+id/content_fl"
         android:layout_width="match_parent"

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

@@ -47,6 +47,7 @@
             android:id="@+id/sex_erp_rl"
             style="@style/form_relative_customer"
             android:background="@color/white">
+
             <TextView
                 android:id="@+id/sex_text"
                 android:layout_width="wrap_content"
@@ -68,8 +69,7 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_executive"
                 style="@style/form_relative_right_text"
-                android:clickable="false"
-                android:focusable="false"
+                android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>