Commit d8c48563 authored by linfeng's avatar linfeng

bug修改

parent f95c02fe
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default" flavorDimensions "default"
versionCode 144 versionCode 153
versionName "1.4.4" versionName "1.5.3"
multiDexEnabled true multiDexEnabled true
ndk { ndk {
......
...@@ -265,7 +265,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -265,7 +265,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
tvDay.setCompoundDrawables(null, null, null, drawable); tvDay.setCompoundDrawables(null, null, null, drawable);
begDate = MyUtils.getFetureDate(1) + " 09:00"; begDate = MyUtils.getFetureDate(1) + " 09:00";
tvGetTime.setText(DateUtils.formatDate66(begDate)); tvGetTime.setText(DateUtils.formatDate66(begDate));
tvGetWeek.setText("周" + MyUtils.getWeek(DateUtils.getCurDate())); tvGetWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(1)));
endDate = MyUtils.getFetureDate(2) + " 18:00"; endDate = MyUtils.getFetureDate(2) + " 18:00";
tvOutTime.setText(DateUtils.formatDate66(endDate)); tvOutTime.setText(DateUtils.formatDate66(endDate));
tvOutWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(2))); tvOutWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(2)));
...@@ -893,6 +893,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -893,6 +893,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
return; return;
} }
} }
/** /**
* 判断是否登录 * 判断是否登录
* *
...@@ -900,7 +901,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -900,7 +901,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
*/ */
private boolean isLogin() { private boolean isLogin() {
if (TextUtils.isEmpty(OkGoUtil.getToken())) { if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivity(LoginRvActivity.getIntent(_mActivity,0)); startActivity(LoginRvActivity.getIntent(_mActivity, 0));
return false; return false;
} }
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment