diff --git a/.idea/misc.xml b/.idea/misc.xml index bb2448b..e4cdbe0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -134,8 +134,10 @@ + + @@ -204,7 +206,7 @@ - + @@ -222,7 +224,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index bb2448b..e4cdbe0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -134,8 +134,10 @@ + + @@ -204,7 +206,7 @@ - + @@ -222,7 +224,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0bad5dc..ee5f2fa 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -1,5 +1,6 @@ package com.casic.dcms.fragment; +import android.annotation.SuppressLint; import android.content.Intent; import androidx.lifecycle.Observer; @@ -32,6 +33,7 @@ import com.casic.dcms.view.upload.CommonCaseActivity; import com.casic.dcms.view.verify.VerifyCaseActivity; import com.casic.dcms.vm.HomePageViewModel; +import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -40,9 +42,10 @@ import java.util.GregorianCalendar; +@SuppressLint("SetTextI18n") public class HomePageFragment extends AndroidxBaseFragment { - private HomePageViewModel homePageViewModel; + private UserViewModel userViewModel; @Override protected void setupTopBarLayout() { @@ -51,47 +54,31 @@ @Override protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + userViewModel.userDataResult.observe(this, new Observer() { + @Override + public void onChanged(UserBean it) { + if (it.getCode() == 200) { + GregorianCalendar calendar = new GregorianCalendar(); + int x = calendar.get(GregorianCalendar.AM_PM); + String timezone; + if (x == 0) { + timezone = "上午"; + } else { + timezone = "下午"; + } + UserBean.DataBean bean = it.getData(); + + Glide.with(requireContext()).load(R.mipmap.app_logo).into(viewBinding.userIconView); + viewBinding.userNameView.setText(timezone + "好！" + bean.getName()); + viewBinding.userDeptView.setText(bean.getDeptName() + bean.getRoleNames()); + } + } + }); + //首页相关功能项 - homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); + HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); homePageViewModel.obtainHomePageData("05"); - } - - @Override - protected void observeRequestState() { - - } - - @Override - public void onResume() { - String lastTime = (String) SaveKeyValues.getValue(LocaleConstant.LAST_LOGIN, ""); - String timeValue; - if ("".equals(lastTime)) { - timeValue = "上次登录时间：无法确定"; - } else { - timeValue = "上次登录时间：" + lastTime; - } - viewBinding.lastTimeView.setText(timeValue); - //用户信息 - UserBean.DataBean userBean = StringHelper.getUserBean(); - //获取用户信息之后保存登录时间 - SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - - GregorianCalendar calendar = new GregorianCalendar(); - int x = calendar.get(GregorianCalendar.AM_PM); - String timezone; - if (x == 0) { - timezone = "上午"; - } else { - timezone = "下午"; - } - Glide.with(this).load(R.mipmap.app_logo).into(viewBinding.userIconView); - viewBinding.userNameView.setText(timezone + "好！" + userBean.getName()); - viewBinding.userDeptView.setText(userBean.getDeptName() + userBean.getRoleNames()); - super.onResume(); - } - - @Override - protected void initEvent() { homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -173,4 +160,31 @@ } }); } + + @Override + protected void observeRequestState() { + + } + + @Override + public void onResume() { + super.onResume(); + String lastTime = (String) SaveKeyValues.getValue(LocaleConstant.LAST_LOGIN, ""); + String timeValue; + if ("".equals(lastTime)) { + timeValue = "上次登录时间：无法确定"; + } else { + timeValue = "上次登录时间：" + lastTime; + } + viewBinding.lastTimeView.setText(timeValue); + //获取用户信息之后保存登录时间 + SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); + + userViewModel.getUserData(); + } + + @Override + protected void initEvent() { + + } } \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bb2448b..e4cdbe0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -134,8 +134,10 @@ + + @@ -204,7 +206,7 @@ - + @@ -222,7 +224,7 @@ - + diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0bad5dc..ee5f2fa 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -1,5 +1,6 @@ package com.casic.dcms.fragment; +import android.annotation.SuppressLint; import android.content.Intent; import androidx.lifecycle.Observer; @@ -32,6 +33,7 @@ import com.casic.dcms.view.upload.CommonCaseActivity; import com.casic.dcms.view.verify.VerifyCaseActivity; import com.casic.dcms.vm.HomePageViewModel; +import com.casic.dcms.vm.UserViewModel; import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseFragment; @@ -40,9 +42,10 @@ import java.util.GregorianCalendar; +@SuppressLint("SetTextI18n") public class HomePageFragment extends AndroidxBaseFragment { - private HomePageViewModel homePageViewModel; + private UserViewModel userViewModel; @Override protected void setupTopBarLayout() { @@ -51,47 +54,31 @@ @Override protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + userViewModel.userDataResult.observe(this, new Observer() { + @Override + public void onChanged(UserBean it) { + if (it.getCode() == 200) { + GregorianCalendar calendar = new GregorianCalendar(); + int x = calendar.get(GregorianCalendar.AM_PM); + String timezone; + if (x == 0) { + timezone = "上午"; + } else { + timezone = "下午"; + } + UserBean.DataBean bean = it.getData(); + + Glide.with(requireContext()).load(R.mipmap.app_logo).into(viewBinding.userIconView); + viewBinding.userNameView.setText(timezone + "好！" + bean.getName()); + viewBinding.userDeptView.setText(bean.getDeptName() + bean.getRoleNames()); + } + } + }); + //首页相关功能项 - homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); + HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); homePageViewModel.obtainHomePageData("05"); - } - - @Override - protected void observeRequestState() { - - } - - @Override - public void onResume() { - String lastTime = (String) SaveKeyValues.getValue(LocaleConstant.LAST_LOGIN, ""); - String timeValue; - if ("".equals(lastTime)) { - timeValue = "上次登录时间：无法确定"; - } else { - timeValue = "上次登录时间：" + lastTime; - } - viewBinding.lastTimeView.setText(timeValue); - //用户信息 - UserBean.DataBean userBean = StringHelper.getUserBean(); - //获取用户信息之后保存登录时间 - SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - - GregorianCalendar calendar = new GregorianCalendar(); - int x = calendar.get(GregorianCalendar.AM_PM); - String timezone; - if (x == 0) { - timezone = "上午"; - } else { - timezone = "下午"; - } - Glide.with(this).load(R.mipmap.app_logo).into(viewBinding.userIconView); - viewBinding.userNameView.setText(timezone + "好！" + userBean.getName()); - viewBinding.userDeptView.setText(userBean.getDeptName() + userBean.getRoleNames()); - super.onResume(); - } - - @Override - protected void initEvent() { homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -173,4 +160,31 @@ } }); } + + @Override + protected void observeRequestState() { + + } + + @Override + public void onResume() { + super.onResume(); + String lastTime = (String) SaveKeyValues.getValue(LocaleConstant.LAST_LOGIN, ""); + String timeValue; + if ("".equals(lastTime)) { + timeValue = "上次登录时间：无法确定"; + } else { + timeValue = "上次登录时间：" + lastTime; + } + viewBinding.lastTimeView.setText(timeValue); + //获取用户信息之后保存登录时间 + SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); + + userViewModel.getUserData(); + } + + @Override + protected void initEvent() { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 479219b..6e29fed 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -1,5 +1,6 @@ package com.casic.dcms.fragment; +import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.ClipData; import android.content.ClipboardManager; @@ -47,6 +48,7 @@ import java.util.ArrayList; import java.util.List; +@SuppressLint("SetTextI18n") public class MinePageFragment extends AndroidxBaseFragment { private UserBean.DataBean user; @@ -70,10 +72,11 @@ @Override public void onChanged(UserBean it) { if (it.getCode() == 200) { - DialogHub.get().dismissLoading(); - StringHub.show(requireContext(), "同步完成"); user = it.getData(); - updateUserInfo(); + + viewBinding.userNameView.setText(user.getName()); + viewBinding.userPhoneView.setText("电话：" + user.getPhone()); + viewBinding.userDeptView.setText("部门：" + user.getDeptName()); } } }); @@ -167,7 +170,6 @@ viewBinding.updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DialogHub.get().showLoading(requireActivity(), "同步中，请稍后..."); userViewModel.getUserData(); } }); @@ -247,24 +249,8 @@ @Override public void onResume() { - user = StringHelper.getUserBean(); - updateUserInfo(); super.onResume(); - } - - private void updateUserInfo() { - //设置头像，圆形，暂时是默认的 -// val roundDrawable = -// BitmapFactory.decodeResource(requireContext().resources, R.mipmap.login_casic) -// .createRoundDrawable( -// requireContext(), -// 3f.dp2px(requireContext()), -// R.color.mainThemeColor.convertColor(requireContext()) -// ) -// userImageView.setImageDrawable(roundDrawable) - viewBinding.userNameView.setText(user.getName()); - viewBinding.userPhoneView.setText("电话：" + user.getPhone()); - viewBinding.userDeptView.setText("部门：" + user.getDeptName()); + userViewModel.getUserData(); } //下载apk