From 337ec8955e422fde9bbd49263ee7bc845778515c Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Thu, 4 Jan 2024 17:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=81=A5365-=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zj365/dc/adapter/HomeTopLayoutAdapter.kt | 9 +- .../dc/fragment/DynamicManagementFrag.kt | 4 +- .../com/zj365/dc/fragment/HealthHomeFrag.kt | 57 ++--- .../java/com/zj365/dc/fragment/MineFrag.kt | 5 - .../java/com/zj365/dc/fragment/ServerFrag.kt | 226 ------------------ .../java/com/zj365/dc/weight/PrevDialog.kt | 12 +- app/src/main/res/layout/frag_mine.xml | 3 +- config.gradle | 6 +- 8 files changed, 44 insertions(+), 278 deletions(-) delete mode 100644 app/src/main/java/com/zj365/dc/fragment/ServerFrag.kt diff --git a/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt index 9c874c2..c97c311 100644 --- a/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt @@ -19,7 +19,14 @@ class HomeTopLayoutAdapter(var mContext: Context): BaseAdapter(R.id.root).layoutParams - layoutParam.width = screenWidth /data.size + if (data.size < 4){ + layoutParam.width = screenWidth /4 + + }else{ + layoutParam.width = screenWidth /data.size + + } + holder.getView(R.id.root).layoutParams = layoutParam holder.getView(R.id.img_top).setImage(context,item.imageUrl) diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index 5d38b08..7ff59c3 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -310,7 +310,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission override fun onResume() { super.onResume() - mViewModel.getWarningMsg() + // mViewModel.getWarningMsg() } //点击事件 @@ -912,7 +912,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } else if (Const.Companion.WatchDevice.LightA3.ordinal == bean.watchType) {//如果是4G设备，设置连接状态与电量信息 } else {*/ - if (showIdInfo.isEmpty()) { //自己 + if (showIdInfo == CommonUtils.getMyUserId()) { //自己 val localBlueMac = MMkvHelper.getString(Const.Blue_Tooth) if (YCBBlueConnectHelper.getBleNowStatus() == YCBBlueConnectHelper.BLEConnectState.DisConnect) {//如果本地有蓝牙信息且属于未连接状态，则直接连接 LogUtils.d("startConnect::${localBlueMac}") diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt index 4712214..f76b243 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -60,15 +60,6 @@ HealthHomeFrag : BaseVmFrag() { val binding by lazy { FragHealthBinding.inflate(layoutInflater) } - //重签名 - private val signDialog by lazy { - AgainSignDialog(requireContext(), { - RouteManager.goAct(ARouterUrl.LOGIN_ACT) - requireActivity().finish() - }) { - RouteManager.goAct(ARouterUrl.AGAIN_SIGN) - } - } private var canGoto24Healthresult: Boolean = true private var isDemonstrate: Boolean = false @@ -94,16 +85,6 @@ HealthHomeFrag : BaseVmFrag() { - private val dialogBind by lazy { - DialogTip(requireContext(), "需绑定中健三六五健康手表，才能查看", "去绑定") { - RouteManager.goAct(ARouterUrl.DEVICE_CHOICE) - } - } - private val dialogInfoUn by lazy { - DialogTip(requireContext(), "请完善基本信息") { - RouteManager.goAct(ARouterUrl.INFO_SIMPLE) - } - } override fun setLayout(): View = binding.root override fun initView() { super.initView() @@ -144,6 +125,10 @@ HealthHomeFrag : BaseVmFrag() { RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) } + 15 ->{ //视频跳转 + + } + 10 -> {//web 跳转 bundle.clear() bundle.putString("title", bannerBean.title) @@ -153,7 +138,7 @@ HealthHomeFrag : BaseVmFrag() { 20 ->{ val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID - val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId) + val api = WXAPIFactory.createWXAPI(requireContext(), appId) val req = WXLaunchMiniProgram.Req() req.userName = bannerBean.wxId// 填小程序原始id @@ -170,6 +155,10 @@ HealthHomeFrag : BaseVmFrag() { api.sendReq(req) } + + else ->{ + + } } } @@ -199,6 +188,10 @@ HealthHomeFrag : BaseVmFrag() { RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) } + 15 ->{ //视频跳转 + + } + 20 ->{ val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID @@ -219,6 +212,9 @@ HealthHomeFrag : BaseVmFrag() { api.sendReq(req) } + else ->{ + + } } } setOnClickListener() @@ -298,6 +294,10 @@ HealthHomeFrag : BaseVmFrag() { 4 ->{ CommonToastUtils.showToast("敬请期待") } + + else ->{ + + } } } @@ -387,6 +387,10 @@ HealthHomeFrag : BaseVmFrag() { 4 ->{ CommonToastUtils.showToast("敬请期待") } + + else ->{ + + } } } @@ -700,14 +704,6 @@ HealthHomeFrag : BaseVmFrag() { reqGpsPermissionDialog.show() } - //个人信息修改 主界面刷新 - @Subscribe(threadMode = ThreadMode.MAIN) - fun refresh(event: MyInfoEvent) { - if (dialogBind.isShowing) { - dialogBind.dismiss() - } - request() - } //家人信息改变 刷新 @@ -717,11 +713,6 @@ HealthHomeFrag : BaseVmFrag() { } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun againSignEvent(event: AgainSignEvent) { - signDialog.dismiss() - } @Subscribe(threadMode = ThreadMode.MAIN) fun loginOrRegisterChange(event: LoginOrRegisterEvent){ showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 5ee509a..ebadc67 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -65,11 +65,6 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { var inviteCustodyBean: InviteCustodyBean? = null - private val dialogBind by lazy { - DialogTip(requireContext(), "需绑定中健三六五健康手表，才能查看", "去绑定") { - RouteManager.goAct(ARouterUrl.DEVICE_CHOICE) - } - } val dialogInvite by lazy { DialogTipNew(requireContext(), "监护邀请","", "确认","取消",false,{ diff --git a/app/src/main/java/com/zj365/dc/fragment/ServerFrag.kt b/app/src/main/java/com/zj365/dc/fragment/ServerFrag.kt deleted file mode 100644 index 427d141..0000000 --- a/app/src/main/java/com/zj365/dc/fragment/ServerFrag.kt +++ /dev/null @@ -1,226 +0,0 @@ -/* -package com.zj365.dc.fragment - -import android.view.View -import androidx.recyclerview.widget.* -import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils -import com.xty.base.fragment.BaseVmFrag -import com.xty.common.* -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.util.CommonUtils -import com.xty.network.model.ExpertBean -import com.xty.network.model.KeeperBean -import com.xty.network.model.ScienceBean - -class ServerFrag : BaseVmFrag() { - val binding by lazy { FragServerBinding.inflate(layoutInflater) } - val adapterSince by lazy { ScienceAdapter() } - val gjAdalter by lazy { GjAdapter() } - val proAdalter by lazy { ProAdapter() } - - val sexIcon by lazy { arrayOf(R.mipmap.ic_male, R.mipmap.ic_female) } - var clickOnline: KeeperBean? = null - override fun setLayout(): View = binding.root - - override fun setViewModel() = ServerVm() - - override fun observer() { - mViewModel.keeperLive.observe(this) { - binding.mNoNetwork.root.visibility = View.GONE - if (!it.data.isNullOrEmpty()) { - val keeperBean = it.data[0] - clickOnline = keeperBean - binding.mDocName.text = keeperBean.realname - binding.mDocName.tag = keeperBean.id - binding.mPosition.text = keeperBean.positionName - binding.mImageSex.setImageResource(sexIcon[keeperBean.getGenderValue()]) - binding.mTvLoc.text = - "${if (keeperBean.organization.isNullOrEmpty()) "无" else keeperBean.organization} ${if (keeperBean.dictName.isNullOrEmpty()) "无" else keeperBean.dictName}" - binding.mTitleGj.visibility = View.VISIBLE -// binding.mViewGj.visibility = View.VISIBLE - binding.mPhoto.tag = - if (keeperBean.avatar.isNullOrEmpty()) "" else getImageUrl(keeperBean.avatar) - binding.mPhoto.apply { - setImageUser(requireContext(), getImageUrl(keeperBean.avatar)) - } - binding.llgj.visibility = View.VISIBLE - } else { - binding.llgj.visibility = View.GONE - binding.mTitleGj.visibility = View.GONE -// binding.mViewGj.visibility = View.GONE - } - - } - mViewModel.keeperLiveList.observe(this) { - binding.mNoNetwork.root.visibility = View.GONE - var listAll = mutableListOf>() - var step = (0 until it.data.size).step(2) - for (i in step) { - var list = mutableListOf() - list.add(it.data[i]) - if (it.data.size > i + 1) { - list.add(it.data[i + 1]) - } - listAll.add(list) - } - gjAdalter.setNewInstance(it.data) - - } - mViewModel.scinceLive.observe(this) { - binding.mNoNetwork.root.visibility = View.GONE - adapterSince.setNewInstance(it.data) - } - - mViewModel.expertInfoList.observe(this) { - var listAll = mutableListOf>() - var step = (0 until it.data.records.size) - for (i in step) { - var list = mutableListOf() - list.add(it.data.records[i]) - listAll.add(list) - } - proAdalter.setNewInstance(it.data.records) - } - } - - override fun initView() { - super.initView() - statusBar(binding.mStatusBar) - initProAdapter() - initGjAdapter() - initAdapter() - binding.mNoNetwork.mRefreshBtn.isSelected = true - binding.mNoNetwork.mRefreshBtn.setOnClickListener { - mViewModel.getExpertInfoList(1, 20) - mViewModel.getKeeper() - mViewModel.getKeeperList() - mViewModel.getScinceList() - - } - binding.mTvOnLine.setOnClickListener { - clickOnline?.let { - bundle.clear() - bundle.putSerializable("bean", clickOnline) - RouteManager.goAct(ARouterUrl.ONLINE_MAKE, bundle) - } - - } - binding.llNext.setOnClickListener { - onEventObject(requireContext(), UmengEventId.OperGuide) - RouteManager.goAct(ARouterUrl.GUIDE) - } - mViewModel.getExpertInfoList(1, 20) - mViewModel.getKeeper() - mViewModel.getKeeperList() - mViewModel.getScinceList() - - binding.clGj.setOnClickListener { - bundle.clear() - CommonUtils.getMyUserInfo()?.let { - val name = binding.mDocName.text?.toString() - val toUserId = binding.mDocName.tag?.toString() - val fromUserId = id?.toString() - val chatImage = binding.mPhoto.tag?.toString() - if (toUserId.isNullOrEmpty() || fromUserId.isNullOrEmpty()) { - return@setOnClickListener - } -// bundle.putString("title",name) -// bundle.putString("toUserId",toUserId) -// bundle.putString("fromUserId", fromUserId) -// bundle.putString("chatImage", chatImage) -// RouteManager.goAct(ARouterUrl.CHAT_MSG,bundle) - TUIConversationUtils.startAYSingleChatActivity("man_$toUserId", name, chatImage); - - } - - } - - - - refresh() - } - - override fun onResume() { - super.onResume() - if (!checkNetworkAvailable(requireContext())) { - binding.mNoNetwork.root.visibility = View.VISIBLE - } else { -// if (binding.mNoNetwork.root.visibility == View.VISIBLE) { - LogUtils.e("yansu:4444444444444444444444") - mViewModel.getExpertInfoList(1, 20) - mViewModel.getKeeper() - mViewModel.getKeeperList() -// mViewModel.getScinceList() -// } - } - } - - // 刷新注册 - private fun refresh() { - refresh.setRefresh(binding.mRefresh) { - mViewModel.getExpertInfoList(1, 20) - mViewModel.getKeeper() - mViewModel.getKeeperList() - mViewModel.getScinceList() - } - } - - private fun initProAdapter() { - binding.mRecycleprofession.layoutManager = - LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) - binding.mRecycleprofession.adapter = proAdalter -// val pageHelper = LinearSnapHelper() -// pageHelper.attachToRecyclerView(binding.mRecycleprofession) - gjAdalter.addChildClickViewIds(R.id.mImage, R.id.card1) - gjAdalter.setOnItemChildClickListener { adapter, view, position -> - when (view.id) { - R.id.mImage -> { - bundle.clear() - val bean = adapter.getItem(position) as KeeperBean; - bundle.putSerializable("url", bean.introUrl) - bundle.putString("titleName", requireContext().getString(R.string.title_name)) - RouteManager.goAct(ARouterUrl.EXPERT_CHIEF, bundle) - } - R.id.card1 -> { - bundle.clear() - val bean = adapter.getItem(position) as KeeperBean; - bundle.putSerializable("bean", bean) - RouteManager.goAct(ARouterUrl.HOUSEKEEP_INFO, bundle) - } - } - } - proAdalter.setOnItemClickListener { adapter, view, position -> - bundle.clear() - val bean = adapter.getItem(position) as ExpertBean; - bundle.putSerializable("url", bean.infoPhotoUrl) - RouteManager.goAct(ARouterUrl.EXPERT_CHIEF, bundle) - - } - } - - private fun initGjAdapter() { - binding.mRecycle.layoutManager = - LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) - binding.mRecycle.adapter = gjAdalter -// val pageHelper = LinearSnapHelper() -// pageHelper.attachToRecyclerView(binding.mRecycle) - - } - - private fun initAdapter() { - binding.mRecycleNews.layoutManager = LinearLayoutManager(requireContext()) - binding.mRecycleNews.adapter = adapterSince - adapterSince.setOnItemClickListener { adapter, view, position -> - bundle.clear() - var bean = adapter.getItem(position) as ScienceBean - bundle.putSerializable("bean", bean) - onEventObject(requireContext(), UmengEventId.HealthScience, "${bean.name}") - RouteManager.goAct(ARouterUrl.SCIENCE_DETAIL, bundle) - - } - - } - - -}*/ diff --git a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt index 84069dc..dd2e223 100644 --- a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt +++ b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt @@ -41,8 +41,8 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi val bundle = Bundle() bundle.clear() bundle.putString("title", "用户协议") - bundle.putInt("type", Const.AGREEMENT_1) - RouteManager.goAct(ARouterUrl.RICH_TEXT, bundle) + bundle.putString("url","https://dc.zhongjian365.com/agreement.html") + RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle) } override fun updateDrawState(ds: TextPaint) { @@ -56,7 +56,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi override fun onClick(widget: View) { val bundle = Bundle() bundle.putString("title", "隐私政策") - bundle.putString("url", "https://auprty.com/app/static/app/privacy.html") + bundle.putString("url", "https://dc.zhongjian365.com/privacy.html") RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle) } @@ -72,7 +72,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi override fun onClick(widget: View) { val bundle = Bundle() bundle.putString("title", "中健三六五健康 APP 权限列表") - bundle.putString("url", "https://auprty.com/app/static/app/permission.html") + bundle.putString("url", "https://dc.zhongjian365.com/permission.html") RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle) } @@ -89,8 +89,8 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi val bundle = Bundle() bundle.clear() bundle.putString("title", "用户协议") - bundle.putInt("type", Const.AGREEMENT_1) - RouteManager.goAct(ARouterUrl.RICH_TEXT, bundle) + bundle.putString("url","https://dc.zhongjian365.com/agreement.html") + RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle) } override fun updateDrawState(ds: TextPaint) { diff --git a/app/src/main/res/layout/frag_mine.xml b/app/src/main/res/layout/frag_mine.xml index dbb4e12..5628452 100644 --- a/app/src/main/res/layout/frag_mine.xml +++ b/app/src/main/res/layout/frag_mine.xml @@ -20,7 +20,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:layout_marginTop="@dimen/dp_30" app:srlAccentColor="@color/white">