diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..7b940da 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,8 +18,8 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private Context context; - private List menuData; + private final Context context; + private final List menuData; public HomeRecycleAdapter(Context context, List menus) { this.context = context; @@ -64,8 +64,8 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private TextView textView; + private final ImageView imageView; + private final TextView textView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..7b940da 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,8 +18,8 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private Context context; - private List menuData; + private final Context context; + private final List menuData; public HomeRecycleAdapter(Context context, List menus) { this.context = context; @@ -64,8 +64,8 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private TextView textView; + private final ImageView imageView; + private final TextView textView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d3c3f37..a73889b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -60,7 +60,7 @@ @Override protected void initData() { - String lastTime = (String) SaveKeyValues.getValue("lastTime", ""); + String lastTime = (String) SaveKeyValues.getValue(StringHelper.getUserAccount(), ""); String timeValue; if ("".equals(lastTime)) { timeValue = "上次登录时间:无法确定"; @@ -90,7 +90,7 @@ UserBean.DataBean dataBean = userBean.getData(); StringHelper.saveUserBean(new Gson().toJson(dataBean)); //获取用户信息之后保存登录时间 - SaveKeyValues.putValue("lastTime", TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); + SaveKeyValues.putValue(dataBean.getAccount(), TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); GregorianCalendar calendar = new GregorianCalendar(); int x = calendar.get(GregorianCalendar.AM_PM); @@ -113,7 +113,7 @@ public void obtainHomePageResult(HomePageBean resultBean) { if (resultBean.getCode() == 200) { HomeRecycleAdapter adapter = new HomeRecycleAdapter(context, resultBean.getData().getMenus()); - viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 3)); + viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 2)); viewBinding.homeRecyclerView.setAdapter(adapter); adapter.setOnGridItemClickListener(new HomeRecycleAdapter.OnGridItemClickListener() { @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..7b940da 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,8 +18,8 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private Context context; - private List menuData; + private final Context context; + private final List menuData; public HomeRecycleAdapter(Context context, List menus) { this.context = context; @@ -64,8 +64,8 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private TextView textView; + private final ImageView imageView; + private final TextView textView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d3c3f37..a73889b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -60,7 +60,7 @@ @Override protected void initData() { - String lastTime = (String) SaveKeyValues.getValue("lastTime", ""); + String lastTime = (String) SaveKeyValues.getValue(StringHelper.getUserAccount(), ""); String timeValue; if ("".equals(lastTime)) { timeValue = "上次登录时间:无法确定"; @@ -90,7 +90,7 @@ UserBean.DataBean dataBean = userBean.getData(); StringHelper.saveUserBean(new Gson().toJson(dataBean)); //获取用户信息之后保存登录时间 - SaveKeyValues.putValue("lastTime", TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); + SaveKeyValues.putValue(dataBean.getAccount(), TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); GregorianCalendar calendar = new GregorianCalendar(); int x = calendar.get(GregorianCalendar.AM_PM); @@ -113,7 +113,7 @@ public void obtainHomePageResult(HomePageBean resultBean) { if (resultBean.getCode() == 200) { HomeRecycleAdapter adapter = new HomeRecycleAdapter(context, resultBean.getData().getMenus()); - viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 3)); + viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 2)); viewBinding.homeRecyclerView.setAdapter(adapter); adapter.setOnGridItemClickListener(new HomeRecycleAdapter.OnGridItemClickListener() { @Override diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 6ed0c82..36d94ec 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -1,22 +1,32 @@ - + android:elevation="10dp" + app:cardCornerRadius="5dp" + app:cardUseCompatPadding="true"> - + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical" + android:padding="@dimen/padding_10dp"> - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..7b940da 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -18,8 +18,8 @@ public class HomeRecycleAdapter extends RecyclerView.Adapter { - private Context context; - private List menuData; + private final Context context; + private final List menuData; public HomeRecycleAdapter(Context context, List menus) { this.context = context; @@ -64,8 +64,8 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private TextView textView; + private final ImageView imageView; + private final TextView textView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d3c3f37..a73889b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -60,7 +60,7 @@ @Override protected void initData() { - String lastTime = (String) SaveKeyValues.getValue("lastTime", ""); + String lastTime = (String) SaveKeyValues.getValue(StringHelper.getUserAccount(), ""); String timeValue; if ("".equals(lastTime)) { timeValue = "上次登录时间:无法确定"; @@ -90,7 +90,7 @@ UserBean.DataBean dataBean = userBean.getData(); StringHelper.saveUserBean(new Gson().toJson(dataBean)); //获取用户信息之后保存登录时间 - SaveKeyValues.putValue("lastTime", TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); + SaveKeyValues.putValue(dataBean.getAccount(), TimeOrDateUtil.timestampToCompleteDate(System.currentTimeMillis())); GregorianCalendar calendar = new GregorianCalendar(); int x = calendar.get(GregorianCalendar.AM_PM); @@ -113,7 +113,7 @@ public void obtainHomePageResult(HomePageBean resultBean) { if (resultBean.getCode() == 200) { HomeRecycleAdapter adapter = new HomeRecycleAdapter(context, resultBean.getData().getMenus()); - viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 3)); + viewBinding.homeRecyclerView.setLayoutManager(new GridLayoutManager(context, 2)); viewBinding.homeRecyclerView.setAdapter(adapter); adapter.setOnGridItemClickListener(new HomeRecycleAdapter.OnGridItemClickListener() { @Override diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 6ed0c82..36d94ec 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -1,22 +1,32 @@ - + android:elevation="10dp" + app:cardCornerRadius="5dp" + app:cardUseCompatPadding="true"> - + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical" + android:padding="@dimen/padding_10dp"> - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 686e283..d45a060 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,7 +15,7 @@ #FF0000 #278DF9 - #575757 + #333333 #24CE9E #06134C