|
|
@@ -24,6 +24,7 @@ import com.baidu.mapapi.model.LatLng;
|
|
|
import com.baidu.mapapi.search.core.PoiInfo;
|
|
|
import com.common.data.CalendarUtil;
|
|
|
import com.common.data.DateFormatUtil;
|
|
|
+import com.common.data.ListUtils;
|
|
|
import com.common.data.StringUtil;
|
|
|
import com.common.system.DisplayUtil;
|
|
|
import com.common.system.SystemUtil;
|
|
|
@@ -37,10 +38,9 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.oa.WorkAdapter;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.presenter.WorkPresenter;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
|
|
|
-import com.common.data.ListUtils;
|
|
|
-import com.xzjmyk.pm.activity.util.oa.WifiReceiverUtil;
|
|
|
import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
|
|
|
import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
|
|
|
+import com.xzjmyk.pm.activity.util.oa.WifiReceiverUtil;
|
|
|
import com.xzjmyk.pm.activity.view.crouton.Crouton;
|
|
|
import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
|
|
|
|
|
|
@@ -145,7 +145,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
|
|
|
findViewById(R.id.unoffice_).setOnClickListener(this);
|
|
|
date_tv.setOnClickListener(this);
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -351,7 +351,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
|
|
|
@Override
|
|
|
public void setTime(String year, String month, String day) {
|
|
|
String time = year + "-" + month + "-" + day;
|
|
|
- selectTime = DateFormatUtil.str2Long(time,DateFormatUtil.YMD);
|
|
|
+ selectTime = DateFormatUtil.str2Long(time, DateFormatUtil.YMD);
|
|
|
isToday = time.equals(DateFormatUtil.long2Str(DateFormatUtil.YMD)) ? true : false;
|
|
|
date_tv.setText(year + "年" + month + "月" + day + "日 " + CalendarUtil.getWeek(selectTime));
|
|
|
presenter.loadWorkData(selectTime, true);
|
|
|
@@ -363,6 +363,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
|
|
|
public void getMac() {
|
|
|
macAddress = SystemUtil.getMac(ct);
|
|
|
if (StringUtil.isEmpty(macAddress)) {
|
|
|
+ //当没有获取到MACAddress的时候,判断wifi状态,如果wifi为未启动
|
|
|
//mac地址不合法时候 提示开启wifi
|
|
|
WifiReceiverUtil wifiReceiver = new WifiReceiverUtil();
|
|
|
wifiReceiver.regReceiver(ct, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {
|