|
|
@@ -392,7 +392,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
intent.putExtra("data", object.toString());
|
|
|
startActivityForResult(intent, isMe ? 0x20 : 0x21);
|
|
|
} else if (e.isMission()) {
|
|
|
- if (util.isMissionOk( e)) {//外勤计划
|
|
|
+ if (util.isMissionOk(e)) {//外勤计划
|
|
|
intent = new Intent(activity, VisitReportAddActivity.class);
|
|
|
intent.putExtra("type", 3);
|
|
|
intent.putExtra("isOutplan", true);
|
|
|
@@ -459,7 +459,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
emptyLayout.setShowEmptyButton(false);
|
|
|
emptyLayout.setShowErrorButton(false);
|
|
|
emptyLayout.setEmptyViewRes(R.layout.oa_empty_list);
|
|
|
- adapter = new OAAdapter(ct,util, new ArrayList<OAModel>());
|
|
|
+ adapter = new OAAdapter(ct, util, new ArrayList<OAModel>());
|
|
|
oa_listview.setAdapter(adapter);
|
|
|
listenerMap = new HashMap<>();
|
|
|
curDate = new Date(System.currentTimeMillis());
|
|
|
@@ -593,16 +593,14 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
ok++;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (ListUtils.isEmpty(filterModels)) {
|
|
|
+ if (ListUtils.isEmpty(filterModels))
|
|
|
emptyLayout.showEmpty();
|
|
|
- }
|
|
|
CommonUtil.textSpanForStyle(all_task_num, "工作日历 " + size, size + "", getResources().getColor(R.color.orange_text));
|
|
|
CommonUtil.textSpanForStyle(ok_task_num, "已完成 " + ok, ok + "", getResources().getColor(R.color.orange_text));
|
|
|
CommonUtil.textSpanForStyle(uok_task_num, "未完成 " + (size - ok), (size - ok) + "", getResources().getColor(R.color.orange_text));
|
|
|
//当前日期小于等于选中日期
|
|
|
if (adapter == null) {
|
|
|
- adapter = new OAAdapter(ct,util, filterModels);
|
|
|
+ adapter = new OAAdapter(ct, util, filterModels);
|
|
|
oa_listview.setAdapter(adapter);
|
|
|
} else {
|
|
|
adapter.setModels(filterModels);
|
|
|
@@ -629,6 +627,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
private PopupWindow popupWindow = null;
|
|
|
|
|
|
public void showPopupWindow(View parent) {
|
|
|
+
|
|
|
View view = null;
|
|
|
WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
|
|
|
if (popupWindow == null) {
|
|
|
@@ -912,8 +911,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
private boolean isToday() {
|
|
|
boolean isToday = TimeUtils.s_long_2_str(System.currentTimeMillis()).
|
|
|
equals(TimeUtils.s_format.format(curDate));
|