From bf9a24d132791d700a5213f270d2b3496298059e Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Wed, 3 Jan 2024 15:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zj365/dc/activity/MainActivity.kt | 2 +- .../zj365/dc/activity/MessageDetailNewAct.kt | 4 +- .../java/com/zj365/dc/fragment/MineFrag.kt | 61 +- app/src/main/res/layout/frag_health.xml | 3 +- app/src/main/res/layout/frag_mine.xml | 1557 +++++++++-------- .../src/main/res/layout/dialog_activities.xml | 7 +- .../com/xty/common/util/ImageGetterUtils.java | 89 + .../xty/common/weight/CustomerRecyclerview.kt | 16 + .../main/res/drawable/shape_red_dot_white.xml | 5 + .../act/familyhealth/FamilyHealthAct.kt | 7 +- .../FamilyHealthGuardianListAct.kt | 21 +- .../FamilyHealth/HealthFamilyAdapter.kt | 2 + .../com/zj365/health/vm/FamilyHealthVm.kt | 24 + .../main/res/layout/item_health_family.xml | 1 + .../layout/item_health_family_guardian.xml | 22 +- .../main/java/com/zj365/mime/vm/SettingVm.kt | 24 + .../main/java/com/xty/network/ApiInterface.kt | 12 + 17 files changed, 1071 insertions(+), 786 deletions(-) create mode 100644 common/src/main/java/com/xty/common/util/ImageGetterUtils.java create mode 100644 common/src/main/java/com/xty/common/weight/CustomerRecyclerview.kt create mode 100644 common/src/main/res/drawable/shape_red_dot_white.xml diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt index 8e17209..3e31d13 100644 --- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt @@ -159,7 +159,7 @@ class MainActivity : BaseVmAct(), Consumer { mViewModel.getUserEquipmentInformationizationRequest(userId) mViewModel.getBanners(userId,3) mViewModel.getIsDemonstate() - mViewModel.searchInviteInfo() + if(EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)) { diff --git a/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt b/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt index 1d23dd6..032fe02 100644 --- a/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt @@ -7,6 +7,7 @@ import com.xty.base.act.BaseVmAct import com.xty.base.vm.BaseVm import com.xty.common.Dateutils import com.xty.common.arouter.ARouterUrl +import com.xty.common.util.ImageGetterUtils import com.xty.network.model.MessageBean import com.xty.network.model.MessageTypeDataBean import com.zj365.dc.databinding.ActMessageDetailNewBinding @@ -40,7 +41,8 @@ class MessageDetailNewAct: BaseVmAct() { msgBean?.let { binding.tvMsgTitle.text = it.notifyTitle binding.tvMsgTime.text = Dateutils.formatTime(it.notifyCreateTime,Dateutils.YYYY_MM_DD_HH_MM) - binding.tvMsgContent.text = Html.fromHtml(it.notifyContent) + binding.tvMsgContent.text = Html.fromHtml(it.notifyContent,ImageGetterUtils.MyImageGetter(this,binding.tvMsgContent),null) + } 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 d510679..f212604 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -4,7 +4,6 @@ import android.Manifest import android.content.Intent import android.net.Uri import android.os.Build -import android.text.TextUtils import android.view.View import androidx.annotation.RequiresApi import com.xty.base.dialog.AppUpdateDialog @@ -12,7 +11,6 @@ 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.bracelet.YCBBlueConnectHelper import com.xty.common.event.AddSuccessEvent import com.xty.common.event.BindDevEvent import com.xty.common.event.LoginOrRegisterEvent @@ -20,14 +18,15 @@ import com.xty.common.event.LoginOutEvent import com.xty.common.event.MyInfoEvent import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils +import com.xty.network.model.InviteCustodyBean import com.xty.network.model.SettingBean import com.zj365.dc.BuildConfig import com.zj365.dc.activity.MainActivity import com.zj365.dc.databinding.FragMineBinding -import com.zj365.health.act.HealthMainAct import com.zj365.health.vm.ReportVm import com.zj365.health.weight.DialogTip +import com.zj365.health.weight.DialogTipNew import com.zj365.mime.act.DevInfoAct import com.zj365.mime.vm.SettingVm import org.greenrobot.eventbus.EventBus @@ -64,12 +63,27 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { var user: SettingBean.User? = null private var showIdInfo = "" //需要显示的信息的id + var inviteCustodyBean: InviteCustodyBean? = null + private val dialogBind by lazy { DialogTip(requireContext(), "需绑定中健三六五健康手表，才能查看", "去绑定") { RouteManager.goAct(ARouterUrl.DEVICE_CHOICE) } } + val dialogInvite by lazy { + DialogTipNew(requireContext(), "监护邀请","", "确认","取消",false,{ + inviteCustodyBean?.let { + mViewModel.confirmInvite(it.id,"1") + } + }){ + inviteCustodyBean?.let { + mViewModel.confirmInvite(it.id,"0") + } + } + + } + override fun setViewModel() = SettingVm() @RequiresApi(Build.VERSION_CODES.O) @@ -84,10 +98,15 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { isDemonstrate = (requireActivity() as MainActivity).isDemonstrate + //刷新注册 + refresh() + binding.mNoNetwork.mRefreshBtn.isSelected = true binding.mNoNetwork.mRefreshBtn.setOnClickListener { mViewModel.getMySetting() mViewModel.getAllInfo(showIdInfo,false) + + mViewModel.searchInviteInfo() } binding.clInfo.setOnClickListener { @@ -368,6 +387,17 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { } } + private fun refresh() { + refresh.setRefresh(binding.mRefresh) { + mViewModel.getMySetting() +// } + + mViewModel.getAllInfo(showIdInfo,false) +// mViewModel.getScore(1) + mViewModel.searchInviteInfo() + } + } + override fun onResume() { super.onResume() /* if (!checkNetworkAvailable(requireContext())) { @@ -378,7 +408,8 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { // } mViewModel.getAllInfo(showIdInfo,false) - mViewModel.getScore(1) +// mViewModel.getScore(1) + mViewModel.searchInviteInfo() // } } @@ -399,6 +430,17 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { } } + mViewModel.findInfoLiveData.observe(this){ + binding.imgRedDot.visibility = View.GONE + if (it.data != null){ + binding.imgRedDot.visibility = View.VISIBLE + inviteCustodyBean = it.data + dialogInvite.setContentNew("${CommonUtils.replaceMiddleNumber(it.data.phone)}用户邀请您成为 监护人") + dialogInvite.show() + } + + } + Const.mainLiveData.observe(this) { if (null == it) { @@ -448,7 +490,8 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { MMkvHelper.getLong(Const.USER_ID).toString() } mViewModel.getMySetting() - mViewModel.getScore(1) +// mViewModel.getScore(1) + mViewModel.searchInviteInfo() } @Subscribe(threadMode = ThreadMode.MAIN) @@ -460,20 +503,22 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { fun addSuccess(event: AddSuccessEvent){ mViewModel.getMySetting() mViewModel.getAllInfo(showIdInfo,false) - mViewModel.getScore(1) +// mViewModel.getScore(1) + } @Subscribe(threadMode = ThreadMode.MAIN) fun bindDevSuccess(event:BindDevEvent){ mViewModel.getMySetting() mViewModel.getAllInfo(showIdInfo,false) - mViewModel.getScore(1) +// mViewModel.getScore(1) } @Subscribe(threadMode = ThreadMode.MAIN) fun refreshUI(event: MyInfoEvent){ mViewModel.getMySetting() mViewModel.getAllInfo(showIdInfo,false) - mViewModel.getScore(1) +// mViewModel.getScore(1) + mViewModel.searchInviteInfo() } diff --git a/app/src/main/res/layout/frag_health.xml b/app/src/main/res/layout/frag_health.xml index d4b2cfe..a09236e 100644 --- a/app/src/main/res/layout/frag_health.xml +++ b/app/src/main/res/layout/frag_health.xml @@ -26,12 +26,11 @@ - - + + android:layout_height="0dp" + android:layout_weight="1" + android:layout_marginTop="@dimen/dp_30" + app:srlAccentColor="@color/white"> + + - + android:background="@color/col_f2f"> - + android:layout_height="match_parent" + android:background="@color/col_f2f" + android:orientation="vertical"> + android:layout_height="@dimen/dp_310" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - + android:background="@color/white" + app:layout_constraintLeft_toLeftOf="parent"> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/view"> + + - - + + + + + + + + + + + + android:paddingTop="@dimen/dp_25" + android:orientation="horizontal" + android:weightSum="4" + android:background="@color/white" + app:layout_constraintTop_toBottomOf="@+id/cl_info"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/h1" + > - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + android:text="有效期至：2033-12-12 15:24:36" + android:textColor="@color/col_fac" + android:textSize="@dimen/sp_12" + tools:ignore="UseCompatTextViewDrawableXml" /> - + + android:gravity="center_vertical" + android:text="增值服务" + android:textColor="@color/col_fac" + android:layout_marginTop="@dimen/dp_8" + android:textSize="@dimen/dp_14" + android:textStyle="bold" /> + + + + + + + + + + + + + + + + + + + + + android:layout_marginTop="@dimen/dp_12" + android:textColor="@color/col_7c7"/> + + + + + - + android:text="健康监测" + android:textSize="@dimen/sp_14" + android:textStyle="bold" + android:layout_marginTop="@dimen/dp_12" + android:textColor="@color/col_7c7"/> - + + android:layout_marginTop="@dimen/dp_12" + android:textColor="@color/col_7c7"/> + + + + + android:text="数据对比" + android:textSize="@dimen/sp_14" + android:textStyle="bold" + android:layout_marginTop="@dimen/dp_12" + android:textColor="@color/col_7c7"/> - + - + - + + + + + + - + + android:id="@+id/ll_early_warning_of_disease" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical"> + + android:layout_width="@dimen/dp_45" + android:layout_height="@dimen/dp_45" + android:background="@mipmap/icon_health_warning" + android:scaleType="centerCrop"/> + android:layout_marginTop="@dimen/dp_12" + android:textColor="@color/col_7c7"/> + - + + - + + - - - + + - + - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="@dimen/dp_135" + android:orientation="vertical" + android:layout_marginLeft="@dimen/dp_14" + android:layout_marginRight="@dimen/dp_14" + android:layout_marginTop="@dimen/dp_12" + android:background="@drawable/shape_8round_white"> - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_22" + android:layout_marginLeft="@dimen/dp_16" + android:orientation="horizontal"> + + android:textColor="@color/col_313" + android:textSize="@dimen/sp_17"/> - - - - - - - - + android:orientation="horizontal"> - + - + + - + - - - - + - + + + + - - - - - - - - - + + - - - - - + + + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:visibility="invisible" + android:orientation="vertical"> - + + - + - + - - - + - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_marginLeft="@dimen/dp_14" + android:layout_marginRight="@dimen/dp_14" + android:layout_marginTop="@dimen/dp_12" + android:background="@drawable/shape_8round_white"> - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_22" + android:layout_marginLeft="@dimen/dp_16" + android:orientation="horizontal"> + + android:textColor="@color/col_313" + android:textSize="@dimen/sp_17"/> - - - - - - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center" - android:visibility="invisible" - android:orientation="vertical"> - - - - - - - - - + + + - + - - - - + - + + + + - + + - - + + - + + - + - - - - - - - - - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_24" + android:layout_marginBottom="@dimen/dp_22" + android:orientation="horizontal"> - + - + + - + - + - - + + + + - + + - + + - - - - + + - - + - - - - - + - + + + - - \ No newline at end of file diff --git a/base/src/main/res/layout/dialog_activities.xml b/base/src/main/res/layout/dialog_activities.xml index 402bafa..eb3b8a7 100644 --- a/base/src/main/res/layout/dialog_activities.xml +++ b/base/src/main/res/layout/dialog_activities.xml @@ -15,10 +15,11 @@ () { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + urlDrawable.bitmap = changeBitmapSize(resource); + urlDrawable.setBounds(0, 0, changeBitmapSize(resource).getWidth(), changeBitmapSize(resource).getHeight()); + textView.invalidate(); + textView.setText(textView.getText());//不加这句显示不出来图片，原因不详 + } + }); + + return urlDrawable; + } + + public class URLDrawable extends BitmapDrawable { + public Bitmap bitmap; + + @Override + public void draw(Canvas canvas) { + super.draw(canvas); + if (bitmap != null) { + canvas.drawBitmap(bitmap, 0, 0, getPaint()); + } + } + } + + private Bitmap changeBitmapSize(Bitmap bitmap) { + int width = bitmap.getWidth(); + int height = bitmap.getHeight(); + //设置想要的大小 + int newWidth = width; + int newHeight = height; + //计算压缩的比率 + float scaleWidth = ((float) newWidth) / width; + float scaleHeight = ((float) newHeight) / height; + //获取想要缩放的matrix + Matrix matrix = new Matrix(); + matrix.postScale(scaleWidth, scaleHeight); + //获取新的bitmap + bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true); + + bitmap.getWidth(); + + bitmap.getHeight(); + + return bitmap; + + } + + + } +} diff --git a/common/src/main/java/com/xty/common/weight/CustomerRecyclerview.kt b/common/src/main/java/com/xty/common/weight/CustomerRecyclerview.kt new file mode 100644 index 0000000..babacad --- /dev/null +++ b/common/src/main/java/com/xty/common/weight/CustomerRecyclerview.kt @@ -0,0 +1,16 @@ +package com.xty.common.weight + +import android.content.Context +import android.util.AttributeSet +import android.view.MotionEvent +import androidx.recyclerview.widget.RecyclerView + +class CustomerRecyclerview @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : RecyclerView(context, attrs) { + + override fun dispatchTouchEvent(ev: MotionEvent?): Boolean { + parent.requestDisallowInterceptTouchEvent(true) + return super.dispatchTouchEvent(ev) + } +} \ No newline at end of file diff --git a/common/src/main/res/drawable/shape_red_dot_white.xml b/common/src/main/res/drawable/shape_red_dot_white.xml new file mode 100644 index 0000000..b9e56cc --- /dev/null +++ b/common/src/main/res/drawable/shape_red_dot_white.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt index a6ab906..b569a9f 100644 --- a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt +++ b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt @@ -46,7 +46,7 @@ class FamilyHealthAct : BaseListAct() { setRecycleRefresh(binding.recyclerView, binding.mRefresh, true) binding.recyclerView.layoutManager = LinearLayoutManager(this) binding.recyclerView.adapter = mAdapter - mAdapter.addChildClickViewIds(R.id.tv_add_cancel, R.id.tv_watch,R.id.tv_current_time,R.id.ll_avatar) + mAdapter.addChildClickViewIds(R.id.tv_add_cancel, R.id.tv_watch,R.id.tv_current_time,R.id.user_avatar_recycler,R.id.tv_num) mAdapter.setOnItemChildClickListener { adapter, view, position -> val familyHealthBean = adapter.data[position] as FamilyHealthBean when (view.id) { @@ -57,8 +57,11 @@ class FamilyHealthAct : BaseListAct() { mViewModel.exitCustody(familyHealthBean.id.toString()) } } + R.id.tv_num ->{ + RouteManager.goAct(ARouterUrl.FAMILY_GUARDIAN_LIST_ACT) - R.id.ll_avatar ->{ + } + R.id.user_avatar_recycler ->{ RouteManager.goAct(ARouterUrl.FAMILY_GUARDIAN_LIST_ACT) } } diff --git a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthGuardianListAct.kt b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthGuardianListAct.kt index 16dc4d2..adb0654 100644 --- a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthGuardianListAct.kt +++ b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthGuardianListAct.kt @@ -4,11 +4,14 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.alibaba.android.arouter.facade.annotation.Route import com.xty.base.act.BaseListAct import com.xty.common.arouter.ARouterUrl +import com.xty.common.event.AddSuccessEvent +import com.xty.network.model.FamilyGuardianBean import com.xty.network.model.FamilyHealthBean import com.zj365.health.R import com.zj365.health.adapter.familyhealth.FamilyHealthGuardianAdapter import com.zj365.health.databinding.ActFamilyHealthGuardianBinding import com.zj365.health.vm.FamilyHealthVm +import org.greenrobot.eventbus.EventBus @Route(path = ARouterUrl.FAMILY_GUARDIAN_LIST_ACT) class FamilyHealthGuardianListAct : BaseListAct() { @@ -22,13 +25,14 @@ class FamilyHealthGuardianListAct : BaseListAct() { binding.recyclerView.adapter = adapter adapter.addChildClickViewIds(R.id.cb_frist, R.id.img_delete) adapter.setOnItemChildClickListener { adapter, view, position -> - val familyHealthBean = adapter.data[position] as FamilyHealthBean + val familyGuardianBean = adapter.data[position] as FamilyGuardianBean when (view.id) { R.id.img_delete -> { - mViewModel.exitCustody(familyHealthBean.id.toString()) + mViewModel.deleteGuardian(familyGuardianBean.id) + // mViewModel.exitCustody(familyHealthBean.id.toString()) } R.id.cb_frist->{ - + mViewModel.setFirstGuardian(familyGuardianBean.id) } } } @@ -52,6 +56,17 @@ class FamilyHealthGuardianListAct : BaseListAct() { mViewModel.familyGuardianLiveData.observe(this){ adapter.setNewInstance(it.data) } + + mViewModel.deleteGuardianLiveData.observe(this){ + page =1 + loadData() + EventBus.getDefault().post(AddSuccessEvent()) + } + + mViewModel.firstGuardianLiveData.observe(this){ + page =1 + loadData() + } } override fun setLayout()= binding.root diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt index ec60d67..63f2c1b 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt @@ -6,6 +6,8 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.tencent.qcloud.tuikit.timcommon.component.impl.GlideEngine import com.xty.base.adapter.BaseAdapter +import com.xty.common.arouter.ARouterUrl +import com.xty.common.arouter.RouteManager import com.xty.common.setImageUser import com.xty.network.model.FamilyHealthBean import com.zj365.health.R diff --git a/health/src/main/java/com/zj365/health/vm/FamilyHealthVm.kt b/health/src/main/java/com/zj365/health/vm/FamilyHealthVm.kt index 4d1f28b..43a4709 100644 --- a/health/src/main/java/com/zj365/health/vm/FamilyHealthVm.kt +++ b/health/src/main/java/com/zj365/health/vm/FamilyHealthVm.kt @@ -14,6 +14,11 @@ class FamilyHealthVm :BaseVm() { val familyGuardianLiveData by lazy { MutableLiveData>>() } val exitCustody by lazy { MutableLiveData>() } + + val firstGuardianLiveData by lazy { MutableLiveData>() } + + val deleteGuardianLiveData by lazy { MutableLiveData>() } + fun getFamilyHealthList(){ startHttp (true){ @@ -40,4 +45,23 @@ class FamilyHealthVm :BaseVm() { } + fun setFirstGuardian(id:Long){ + startHttp { + val json = JSONObject() + json.put("id",id) + val request = apiInterface().setFirstGuardian(retrofits.getRequestBody(json.toString())) + request.getCodeStatus(firstGuardianLiveData,nowData) + } + } + + fun deleteGuardian(id:Long){ + startHttp { + val json = JSONObject() + json.put("id",id) + val request = apiInterface().deleteGuardian(retrofits.getRequestBody(json.toString())) + request.getCodeStatus(deleteGuardianLiveData,nowData) + } + } + + } \ No newline at end of file diff --git a/health/src/main/res/layout/item_health_family.xml b/health/src/main/res/layout/item_health_family.xml index abe44c4..f3fa171 100644 --- a/health/src/main/res/layout/item_health_family.xml +++ b/health/src/main/res/layout/item_health_family.xml @@ -128,6 +128,7 @@ android:orientation="horizontal"> + android:paddingLeft="@dimen/dp_16" + android:paddingTop="@dimen/dp_11" + android:paddingBottom="@dimen/dp_11" + android:paddingRight="@dimen/dp_16" + android:layout_height="wrap_content"> + android:scaleType="centerCrop" + android:layout_height="@dimen/dp_50"/> + android:layout_marginTop="@dimen/dp_5"/> @@ -47,7 +52,7 @@ android:id="@+id/img_delete" android:background="@mipmap/icon_close_delet" android:layout_centerVertical="true" - android:layout_marginRight="@dimen/dp_15"/> + /> + \ No newline at end of file diff --git a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt index 78aa14f..d935a8a 100644 --- a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt +++ b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.xty.base.vm.BaseVm import com.xty.common.Const import com.xty.network.model.FamilyBean +import com.xty.network.model.InviteCustodyBean import com.xty.network.model.MainBean import com.xty.network.model.ProgrammeBean import com.xty.network.model.RespBody @@ -29,6 +30,10 @@ class SettingVm : BaseVm() { val updateLive by lazy { MutableLiveData>() } val allData by lazy { MutableLiveData>() } + val findInfoLiveData by lazy { MutableLiveData>() } + + val confirmInviteLiveData by lazy { MutableLiveData>() } + fun getNesProg(id: String) { startHttp { @@ -160,4 +165,23 @@ class SettingVm : BaseVm() { body.getCodeStatus(allData,nowData) } } + + fun searchInviteInfo(){ + startHttp(false) { + var json = JSONObject() + val response = apiInterface().findConfirmInfo(retrofits.getRequestBody(json.toString())) + response.getCodeStatus(findInfoLiveData, nowData) + } + } + + fun confirmInvite(id:String, status:String){ + startHttp(false) { + var json = JSONObject() + json.put("id",id) + json.put("status",status) + val response = apiInterface().confirmInvited(retrofits.getRequestBody(json.toString())) + response.getCodeStatus(confirmInviteLiveData,nowData) + } + + } } \ No newline at end of file diff --git a/network/src/main/java/com/xty/network/ApiInterface.kt b/network/src/main/java/com/xty/network/ApiInterface.kt index f0976fd..bb3da98 100644 --- a/network/src/main/java/com/xty/network/ApiInterface.kt +++ b/network/src/main/java/com/xty/network/ApiInterface.kt @@ -1724,6 +1724,18 @@ interface ApiInterface { @POST("customer/family/getGuardianList") suspend fun getFamilyGuardianList(@Body rb:RequestBody) : RespBody> + /** + * 设置第一监护人 + */ + @POST("customer/family/setFirstGuardian") + suspend fun setFirstGuardian(@Body rb:RequestBody) : RespBody + + /** + * 删除监护人 + */ + @POST("customer/family/deleteGuardian") + suspend fun deleteGuardian(@Body rb:RequestBody) : RespBody + /** * 退出监护 */