From 3f61e241cb666a0e55d07c289bbb94d60da94033 Mon Sep 17 00:00:00 2001 From: LiuSiXiang-007 <2535147127@qq.com> Date: Mon, 18 Mar 2024 11:32:04 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=85=B3=E4=BA=8Eapp=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=20/=20=E5=AE=9A=E4=BD=8D=E5=B9=BF=E6=92=AD=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/ui/activity/AboutActivity.java | 5 +- ...Adapter.java => PanelRecyclerAdapter.java} | 31 +++++---- .../push/ui/fragment/UserFragment.java | 20 +++--- .../kanglai/push/ui/vm/AboutViewModel.java | 30 +++++++- .../kanglai/push/ui/vm/LoginViewModel.java | 2 +- .../com/kanglai/push/util/AlarmReceiver.java | 3 +- app/src/main/res/layout/activity_about.xml | 69 ++++++++++++++----- library/core/src/main/res/values/strings.xml | 2 +- 8 files changed, 114 insertions(+), 48 deletions(-) rename app/src/main/java/com/kanglai/push/ui/adapter/{UserRecyclerAdapter.java => PanelRecyclerAdapter.java} (73%) diff --git a/app/src/main/java/com/kanglai/push/ui/activity/AboutActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/AboutActivity.java index 32920eb..53b11c6 100644 --- a/app/src/main/java/com/kanglai/push/ui/activity/AboutActivity.java +++ b/app/src/main/java/com/kanglai/push/ui/activity/AboutActivity.java @@ -13,13 +13,14 @@ import com.kanglai.push.ui.vm.AboutViewModel; /** *

- * 关于 + * 关于app *

* * @Author: wangxiang4 * @since: 2022/10/24 */ -public class AboutActivity extends BaseActivity { +public class AboutActivity extends BaseActivity{ + @Override public int setContentView(Bundle savedInstanceState) { return R.layout.activity_about; diff --git a/app/src/main/java/com/kanglai/push/ui/adapter/UserRecyclerAdapter.java b/app/src/main/java/com/kanglai/push/ui/adapter/PanelRecyclerAdapter.java similarity index 73% rename from app/src/main/java/com/kanglai/push/ui/adapter/UserRecyclerAdapter.java rename to app/src/main/java/com/kanglai/push/ui/adapter/PanelRecyclerAdapter.java index 35b0e56..8a37ec6 100644 --- a/app/src/main/java/com/kanglai/push/ui/adapter/UserRecyclerAdapter.java +++ b/app/src/main/java/com/kanglai/push/ui/adapter/PanelRecyclerAdapter.java @@ -11,15 +11,16 @@ import lombok.experimental.Accessors; /** *

- * 我的回收列表数据适配器 + * 面板回收列表数据适配器 + * 个人页头像下方的列表 *

* * @Author: wangxiang4 * @since: 2023/1/31 */ -public class UserRecyclerAdapter extends DefaultRecyclerAdapter { +public class PanelRecyclerAdapter extends DefaultRecyclerAdapter { - private List mItemList; + private List mItemList; private EventListener mEventListener; @@ -27,7 +28,7 @@ public class UserRecyclerAdapter extends DefaultRecyclerAdapter { @Accessors @NoArgsConstructor @AllArgsConstructor - public static class UserEntity { + public static class PanelEntity { public String code; @@ -46,32 +47,32 @@ public class UserRecyclerAdapter extends DefaultRecyclerAdapter { public Boolean hidesLeftImage; } - public UserRecyclerAdapter(List mItemList){ + public PanelRecyclerAdapter(List mItemList){ this.mItemList = mItemList; } - public UserRecyclerAdapter(List mItemList, Boolean hidesDisclosure) { + public PanelRecyclerAdapter(List mItemList, Boolean hidesDisclosure) { super(null, null, hidesDisclosure, null); this.mItemList = mItemList; } - public UserRecyclerAdapter(List mItemList, Boolean hidesDisclosure, Boolean hidesLeftImage) { + public PanelRecyclerAdapter(List mItemList, Boolean hidesDisclosure, Boolean hidesLeftImage) { super(null, null, hidesDisclosure, hidesLeftImage); this.mItemList = mItemList; } - public UserRecyclerAdapter(List mItemList, - Integer defaultImage, - Integer defaultBadge, - Boolean hidesDisclosure, - Boolean hidesLeftImage) { + public PanelRecyclerAdapter(List mItemList, + Integer defaultImage, + Integer defaultBadge, + Boolean hidesDisclosure, + Boolean hidesLeftImage) { super(defaultImage, defaultBadge, hidesDisclosure, hidesLeftImage); this.mItemList = mItemList; } public interface EventListener { - void onItemViewClicked(UserEntity userEntity); + void onItemViewClicked(PanelEntity userEntity); } @@ -83,7 +84,7 @@ public class UserRecyclerAdapter extends DefaultRecyclerAdapter { @Override public void onBindViewHolder(final ViewHolder viewHolder, final int position) { super.onBindViewHolder(viewHolder, position); - final UserEntity item = mItemList.get(position); + final PanelEntity item = mItemList.get(position); viewHolder.layoutContent.setOnClickListener(view -> onItemViewClick(item)); viewHolder.titleLabel.setText(item.title); viewHolder.detailLabel.setText(item.detail); @@ -102,7 +103,7 @@ public class UserRecyclerAdapter extends DefaultRecyclerAdapter { } } - private void onItemViewClick(UserEntity userEntity) { + private void onItemViewClick(PanelEntity userEntity) { if (mEventListener != null && ObjectUtils.isNotEmpty(mItemList)) { mEventListener.onItemViewClicked(userEntity); } diff --git a/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java b/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java index 9f5baa1..8d6a641 100644 --- a/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java +++ b/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java @@ -28,7 +28,7 @@ import com.kanglai.push.databinding.FragmentUserBinding; import com.kanglai.push.entity.User; import com.kanglai.push.util.LocationService; import com.kanglai.push.ui.activity.AboutActivity; -import com.kanglai.push.ui.adapter.UserRecyclerAdapter; +import com.kanglai.push.ui.adapter.PanelRecyclerAdapter; import com.kanglai.push.ui.vm.UserViewModel; import com.kongzue.dialogx.DialogX; import com.kongzue.dialogx.dialogs.MessageDialog; @@ -38,16 +38,16 @@ import java.util.List; /** *

- * 我的 + * “我的”碎片页 *

* * @Author: entfrm开发团队-王翔 * @Date: 2022/7/15 */ -public class UserFragment extends BaseFragment implements UserRecyclerAdapter.EventListener { +public class UserFragment extends BaseFragment implements PanelRecyclerAdapter.EventListener { private RecyclerView mRecyclerView; - private UserRecyclerAdapter mAdapter; + private PanelRecyclerAdapter mAdapter; public ImageView avatar; @@ -77,12 +77,12 @@ public class UserFragment extends BaseFragment list = CollectionUtils.newArrayList( - new UserRecyclerAdapter.UserEntity().setCode("1").setTitle("关闭定位服务").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), - new UserRecyclerAdapter.UserEntity().setCode("2").setTitle("关于我们").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), - new UserRecyclerAdapter.UserEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true) + List list = CollectionUtils.newArrayList( + new PanelRecyclerAdapter.PanelEntity().setCode("1").setTitle("关闭定位服务").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), + new PanelRecyclerAdapter.PanelEntity().setCode("2").setTitle("关于我们").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), + new PanelRecyclerAdapter.PanelEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true) ); - final UserRecyclerAdapter userRecyclerAdapter = new UserRecyclerAdapter(list); + final PanelRecyclerAdapter userRecyclerAdapter = new PanelRecyclerAdapter(list); userRecyclerAdapter.setEventListener(this); mAdapter = userRecyclerAdapter; RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); @@ -102,7 +102,7 @@ public class UserFragment extends BaseFragment - * 关于 + * 关于APP *

* * @Author: wangxiang4 @@ -15,6 +21,13 @@ import androidx.lifecycle.LifecycleOwner; */ public class AboutViewModel extends ToolbarViewModel { + public ObservableField document01 = new ObservableField("《友信APP客户端用户协议手册》"); // 用户协议 + public ObservableField document02 = new ObservableField("《友信APP客户端隐私保护指引》"); // 用户协议 + /** 底部文字 */ + public ObservableField tit01 = new ObservableField("客服热线 400-1512-686"); + public ObservableField tit02 = new ObservableField("©2023-2024 康来生物科技有限公司 版权所有 — All Rights Reserved"); + public ObservableField tit03 = new ObservableField("大家的支持是我们工作的动力"); + public AboutViewModel(@NonNull Application application) { super(application); } @@ -22,7 +35,20 @@ public class AboutViewModel extends ToolbarViewModel { @Override public void onCreate(@NonNull LifecycleOwner owner) { super.onCreate(owner); - super.setTitleText("关于"); + super.setTitleText("关于"+ R.string.app_name); } + + public BindingCommand document01ClickCommand = new BindingCommand(() -> { // 用户手册 + Bundle bundle = new Bundle(); + bundle.putString("DOCUMENT_TYPE", "0"); + startActivity(DocumentActivity.class, bundle); + }); + + public BindingCommand document02ClickCommand = new BindingCommand(() -> { // 隐私政策 + Bundle bundle = new Bundle(); + bundle.putString("DOCUMENT_TYPE", "1"); + startActivity(DocumentActivity.class, bundle); + }); + } diff --git a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java index 8d0102a..d570875 100644 --- a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java +++ b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java @@ -64,7 +64,7 @@ public class LoginViewModel extends BaseViewModel { public ObservableField username = new ObservableField(""); /** 用户密码 */ - public ObservableField password = new ObservableField("123456"); +// public ObservableField password = new ObservableField("123456"); /** 电话号码 */ public ObservableField phones = new ObservableField(""); diff --git a/app/src/main/java/com/kanglai/push/util/AlarmReceiver.java b/app/src/main/java/com/kanglai/push/util/AlarmReceiver.java index 078e1e7..b39d370 100644 --- a/app/src/main/java/com/kanglai/push/util/AlarmReceiver.java +++ b/app/src/main/java/com/kanglai/push/util/AlarmReceiver.java @@ -57,7 +57,8 @@ public class AlarmReceiver extends BroadcastReceiver implements AMapLocationList LogUtils.i("--------------------------------AlarmReceiver---------------------------------------"); /** 上传之前需要判断一次用户登录状态 即 id 时候存在 */ - locationConfigure(HistoryMsgUtil.noneId(),context); + locationConfigure(!HistoryMsgUtil.noneId(),context); +// locationConfigure(true,context); } /** 获取定位数据 */ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 5622bfd..e171b78 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -16,17 +16,23 @@ layout="@layout/layout_toolbar" binding:toolbarViewModel="@{viewModel.toolbarViewModel}" /> - + + android:layout_weight="1"> + + + @@ -35,39 +41,70 @@ android:layout_height="wrap_content" android:text="@string/app_name" android:textColor="@color/black" - android:textSize="24dp" + android:textSize="@dimen/dp_26" + android:letterSpacing="0.1" android:textStyle="bold" /> + android:textColor="@color/black40" + android:textSize="@dimen/dp_12" /> - + + + + + + - + + android:textSize="@dimen/dp_10" /> + android:textSize="@dimen/dp_10" /> diff --git a/library/core/src/main/res/values/strings.xml b/library/core/src/main/res/values/strings.xml index ba4b864..ec79dba 100644 --- a/library/core/src/main/res/values/strings.xml +++ b/library/core/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ 友信 - exploit-1.0.1 + Version 1.0.1 kanglai-push 发生意外错误。\n抱歉，给您带来不便。 重新启动