中健365-上线优化

develop
wlh 1 year ago
parent 4176e8ed0f
commit 337ec8955e

@ -19,7 +19,14 @@ class HomeTopLayoutAdapter(var mContext: Context): BaseAdapter<HomeLayoutBean.Ho
var screenWidth = context.resources.displayMetrics.widthPixels
val layoutParam = holder.getView<LinearLayout>(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<LinearLayout>(R.id.root).layoutParams = layoutParam
holder.getView<ImageView>(R.id.img_top).setImage(context,item.imageUrl)

@ -310,7 +310,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
override fun onResume() {
super.onResume()
mViewModel.getWarningMsg()
// mViewModel.getWarningMsg()
}
//点击事件
@ -912,7 +912,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , 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}")

@ -60,15 +60,6 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
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<HomeVm>() {
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<HomeVm>() {
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
}
15 ->{ //视频跳转
}
10 -> {//web 跳转
bundle.clear()
bundle.putString("title", bannerBean.title)
@ -153,7 +138,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
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<HomeVm>() {
api.sendReq(req)
}
else ->{
}
}
}
@ -199,6 +188,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
}
15 ->{ //视频跳转
}
20 ->{
val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId非小程序的 AppID
@ -219,6 +212,9 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
api.sendReq(req)
}
else ->{
}
}
}
setOnClickListener()
@ -298,6 +294,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
4 ->{
CommonToastUtils.showToast("敬请期待")
}
else ->{
}
}
}
@ -387,6 +387,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
4 ->{
CommonToastUtils.showToast("敬请期待")
}
else ->{
}
}
}
@ -700,14 +704,6 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
reqGpsPermissionDialog.show()
}
//个人信息修改 主界面刷新
@Subscribe(threadMode = ThreadMode.MAIN)
fun refresh(event: MyInfoEvent) {
if (dialogBind.isShowing) {
dialogBind.dismiss()
}
request()
}
//家人信息改变 刷新
@ -717,11 +713,6 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
@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") {

@ -65,11 +65,6 @@ class MineFrag : BaseVmFrag<SettingVm>(),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,{

@ -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<ServerVm>() {
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<List<KeeperBean>>()
var step = (0 until it.data.size).step(2)
for (i in step) {
var list = mutableListOf<KeeperBean>()
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<List<ExpertBean>>()
var step = (0 until it.data.records.size)
for (i in step) {
var list = mutableListOf<ExpertBean>()
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)
}
}
}*/

@ -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) {

@ -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">
<com.scwang.smart.refresh.header.ClassicsHeader
@ -178,7 +177,7 @@
<TextView
android:id="@+id/mCoupon"
android:layout_width="37dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/col_313"

@ -31,10 +31,10 @@ ext {
h5_debug_url : "https://built.zhongjian365.com/",
h5_release_url : "https://built.zhongjian365.com/"
//
/* debug_url : "http://java01.zhongjian365.com/app/",
release_url: "http://java01.zhongjian365.com/app/",*/
/*debug_url : "http://java01.zhongjian365.com/app/",
release_url: "http://java01.zhongjian365.com/app/",
/* h5_debug_url : "http://testbuilt.zhongjian365.com/",
h5_debug_url : "http://testbuilt.zhongjian365.com/",
h5_release_url : "http://testbuilt.zhongjian365.com/"*/
]

Loading…
Cancel
Save