xieyongming
/
anyu_zhongjian_android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中建365-优化/bug修复

Browse Source
develop
wlh 1 year ago
parent 231dd91020
commit a31b0caab5
24 changed files with 184 additions and 131 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/java/com/zj365/dc/activity/DeviceChoiceAct.kt
Unescape Escape View File

@ -9,12 +9,15 @@ import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
import com.xty.common.bracelet.checkBlueConnectPermission
import com.xty.common.bracelet.getBluePermission
import com.xty.common.event.BindDevEvent
import com.xty.network.model.DeviceBean
import com.zj365.dc.R
import com.zj365.dc.adapter.DeviceChoiceAdapter
import com.zj365.dc.databinding.ActDeviceChoiceBinding
import com.zj365.dc.vm.DeviceChoiceVm
import com.zj365.mime.weight.FactorySettingDialog
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
/**
* 选择手表型号
@ -101,4 +104,9 @@ class DeviceChoiceAct : BaseVmAct<DeviceChoiceVm>() {
super.onBackPressed()
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onBindDev(event : BindDevEvent){
finish()
}
}

3
app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt
Unescape Escape View File

@ -9,12 +9,14 @@ import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct
import com.xty.common.LogUtils
import com.xty.common.arouter.ARouterUrl
import com.xty.common.event.BindDevEvent
import com.xty.common.util.CommonToastUtils
import com.xty.common.xqr_code.XQRCodeAct
import com.xuexiang.xqrcode.XQRCode
import com.zj365.dc.databinding.ActBinderDeviceOneKeyBinding
import com.zj365.dc.model.ScanInfoBean
import com.zj365.dc.vm.OneKeyBinderDeviceVm
import org.greenrobot.eventbus.EventBus
@Route(path = ARouterUrl.DEVICE_ACTIVE)
class OneKeyBinderDeviceAct : BaseVmAct<OneKeyBinderDeviceVm>() {
@ -22,6 +24,7 @@ class OneKeyBinderDeviceAct : BaseVmAct<OneKeyBinderDeviceVm>() {
val binding by lazy { ActBinderDeviceOneKeyBinding.inflate(layoutInflater) }
override fun liveObserver() {
mViewModel.bindResult.observe(this){
EventBus.getDefault().post(BindDevEvent())
CommonToastUtils.showToast("绑定成功")
finish()
}

16
app/src/main/java/com/zj365/dc/activity/RecognizeResultAct.kt
Unescape Escape View File

@ -95,13 +95,13 @@ class RecognizeResultAct : BaseVmAct<DietManagementVm>() {
var vit = bean.vit_a+ bean.vit_b1+ bean.vit_b2+bean.vit_c+bean.vit_e
var calorieBean = ReportNewBean().apply {
title = "热卡分析"
count = bean.df+bean.cho+vit
listNum.add(vit )
listNum.add(bean.df)
count = bean.protein+bean.cho+bean.fat
listNum.add(bean.cho)
listName.add("维生素")
listName.add("膳食纤维")
listNum.add(bean.protein)
listNum.add(bean.fat)
listName.add("碳水化合")
listName.add("蛋白质")
listName.add("脂肪")
unit = "g"
isShow = true
}
@ -117,11 +117,7 @@ class RecognizeResultAct : BaseVmAct<DietManagementVm>() {
binding.recycler.addItemDecoration(object : ItemDecoration(){
override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) {
super.getItemOffsets(outRect, itemPosition, parent)
if (itemPosition == 0){
}else{
outRect.right = SizeUtils.dp2px(8.0f)
}
outRect.right = SizeUtils.dp2px(8.0f)
}
})
adapter.setOnItemClickListener{ adapter, view, position ->

6
app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt
Unescape Escape View File

@ -76,6 +76,12 @@ class BannerCustomAdapter(var context: Context)
mVHMap.append(position, imageHolder)
context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) }
}
20 ->{
val imageHolder: ImageHolder = holder as ImageHolder
mVHMap.append(position, imageHolder)
context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) }
}
}
}
}

5
app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt
Unescape Escape View File

@ -1,7 +1,10 @@
package com.zj365.dc.adapter
import android.widget.ImageView
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.setImage
import com.xty.network.model.FoodRecoginzeInfo
import com.xty.network.model.HomeLayoutBean
import com.zj365.dc.R
@ -16,6 +19,8 @@ class RecognizeResultAdapter : BaseAdapter<FoodRecoginzeInfo>(R.layout.item_reco
}
holder.getView<ImageView>(R.id.img_pic).setImage(context,item.img)
}
}

54
app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
Unescape Escape View File

@ -37,6 +37,7 @@ import com.xty.common.bracelet.checkBlueConnectPermission
import com.xty.common.bracelet.getBluePermission
import com.xty.common.bracelet.isGpsOpen
import com.xty.common.event.AddSuccessEvent
import com.xty.common.event.BindDevEvent
import com.xty.common.event.BlueToothConnectEvent
import com.xty.common.event.ChangeFamilyEvent
import com.xty.common.event.FamilyEvent
@ -171,8 +172,6 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
//家人信息绑定
initFamilyAdapter()
//点击事件
setOnClickListener()
@ -314,41 +313,6 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
mViewModel.getWarningMsg()
}
/**
* 家人信息绑定
*/
@SuppressLint("NotifyDataSetChanged")
private fun initFamilyAdapter() {
/*binding.mRecycle.layoutManager =
LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false)
binding.mRecycle.adapter = mFamilyAdapter
mFamilyAdapter.setOnItemClickListener { adapter, view, position ->
if (position == mFamilyAdapter.data.size - 1) {
onEventObject(requireContext(), UmengEventId.Family)
RouteManager.goAct(ARouterUrl.BIND_FAMILY)
} else {
val bean = adapter.getItem(position) as FamilyBean
showIdInfo = if (bean.id == 0) {
""
} else {
bean.userJointId.toString()
}
sex = bean.sex.toString()
binding.mHeader.mWearManager.visibility =
if (showIdInfo.isEmpty()) View.VISIBLE else View.GONE
setUserImage(if (showIdInfo.isEmpty()) "0" else showIdInfo, bean.avatarUrl, bean.sex.toString())
binding.mHeader.mUserName.text = bean.fCall
mFamilyAdapter.position = position
mFamilyAdapter.notifyDataSetChanged()
mViewModel.getAllInfo(showIdInfo, true)
getXtInfo(showIdInfo)
get24HourReportInfo(showIdInfo)
// mViewModel.getDkInfo(false, showIdInfo)
updateWarningStatus()
}
}*/
}
//点击事件
private fun setOnClickListener() {
binding.mMsgLayout.setOnClickListener(onClickListener)
@ -1737,10 +1701,6 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
tenJob?.cancel()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun LoginOrRegisterChange(event: LoginOrRegisterEvent){
request()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun loginOutChange(event: LoginOutEvent){
@ -1771,7 +1731,19 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
getXtInfo(showIdInfo)
get24HourReportInfo(showIdInfo)
request()
uploadWhatchData()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun bindDevSuccess(event: BindDevEvent){
getXtInfo(showIdInfo)
get24HourReportInfo(showIdInfo)
request()
uploadWhatchData()
}
}

152
app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package com.zj365.dc.fragment
import android.R.attr.path
import android.content.Intent
import android.provider.Settings
import android.view.View
@ -29,7 +28,6 @@ import com.xty.common.util.CommonUtils
import com.xty.network.model.BannerBean
import com.xty.network.model.FamilyBean
import com.xty.network.model.HomeLayoutBean
import com.xty.network.model.MainBean
import com.xty.network.model.ScienceBean
import com.youth.banner.indicator.RoundLinesIndicator
import com.youth.banner.listener.OnPageChangeListener
@ -45,6 +43,8 @@ import com.zj365.dc.vm.HomeVm
import com.zj365.dc.weight.AgainSignDialog
import com.zj365.health.weight.DialogTip
import com.zj365.mime.weight.NoticeSettingDialog
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@ -149,6 +149,21 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
bundle.putString("url", bannerBean.linkAddress)
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
}
20 ->{
val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId)
val req = WXLaunchMiniProgram.Req()
req.userName = bannerBean.wxId// 填小程序原始id
// req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
req.miniprogramType =
WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
api.sendReq(req)
}
}
}
@ -177,6 +192,22 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
bundle.putString("url", bannerBean.linkAddress)
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
}
20 ->{
val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
val api = WXAPIFactory.createWXAPI(requireContext(), appId)
val req = WXLaunchMiniProgram.Req()
req.userName = bannerBean.wxId // 填小程序原始id
//req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
req.miniprogramType =
WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
api.sendReq(req)
}
}
}
setOnClickListener()
@ -200,34 +231,12 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
binding.mCom.rvLayout.adapter = layoutTopAdapter
layoutTopAdapter.setOnItemClickListener { adapter, view, position ->
CommonToastUtils.showToast("敬请期待")
/*var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean
var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean
when(contentData.jumpType){
1 ->{
contentData.jumpUrl?.let {
when(contentData.jumpUrl){
"AI_TONGUE" ->{ //AI 舌诊
onEventObject(requireContext(), UmengEventId.HealthRisk)
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.TONGUE_MAIN_ACTIVITY, bundle)
}
"AI_TUMOR" ->{ //防癌
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.PRVENT_CANCER, bundle)
}
"MEALS"->{ //膳食管理
}
else ->{
}
}
}
CommonToastUtils.showToast("敬请期待")
}
@ -241,16 +250,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
else ->{
3 ->{
contentData.jumpUrl?.let {
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 = "gh_d43f693ca31f" // 填小程序原始id
req.userName = contentData.wxId // 填小程序原始id
req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
// req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
req.miniprogramType =
WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
@ -259,7 +268,11 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
}
}*/
4 ->{
CommonToastUtils.showToast("敬请期待")
}
}
}
@ -299,6 +312,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
"PSYCHOLOGY" ->{
CommonToastUtils.showToast("敬请期待")
}
else ->{
CommonToastUtils.showToast("敬请期待")
}
@ -317,16 +334,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
else ->{
3 ->{
contentData.jumpUrl?.let {
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 = "gh_d43f693ca31f" // 填小程序原始id
req.userName = contentData.wxId // 填小程序原始id
req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
//req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
req.miniprogramType =
WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
@ -335,6 +352,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
}
4 ->{
CommonToastUtils.showToast("敬请期待")
}
}
}
@ -452,25 +473,6 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
private fun setOnClickListener() {
/*binding.mChildView.llAiConfectioner.setOnClickListener(onClickListener)
binding.mChildView.llAiSkinMeasurement.setOnClickListener(onClickListener)
binding.mChildView.llCancerScreening.setOnClickListener(onClickListener)
binding.mChildView.llMentalTest.setOnClickListener(onClickListener)
binding.mChildView.llAiTongueDiagnosis.setOnClickListener(onClickListener)
binding.mChildView.llDietManagement.setOnClickListener(onClickListener)*/
/*
binding.mCom.llHealthRecords.setOnClickListener(onClickListener)
*//*binding.mChildHomeView.mRelInterDk.setOnClickListener(onClickListener)
binding.mChildHomeView.mRelInterBD.setOnClickListener(onClickListener)
binding.mChildHomeView.mRelInterFamily.setOnClickListener(onClickListener)*//*
binding.mCom.llHealthCode.setOnClickListener(onClickListener)
binding.mCom.llDailyBenefit.setOnClickListener(onClickListener)
binding.mCom.llVideoInterview.setOnClickListener(onClickListener)
*//*binding.mOrganView.llCompare.setOnClickListener(onClickListener)
binding.myManager.setOnClickListener(onClickListener)
binding.myHealthDa.setOnClickListener(onClickListener)*/
binding.tvMore.setOnClickListener {
RouteManager.goAct(ARouterUrl.SCIENCE_LIST)
@ -516,16 +518,21 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
private fun request() {
mViewModel.getBanners(CommonUtils.getMyUserId(),1)//当期登录用户id
mainScope.launch {
mViewModel.getBanners(CommonUtils.getMyUserId(),1)//当期登录用户id
delay(1000)
mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id
// mViewModel.getMyFamilyList()
}
mViewModel.getScinceList()
mViewModel.getHomeLayout()
mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id
}
@ -540,17 +547,24 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
if (null == it) {
return@observe
}
if (it[1].isNullOrEmpty()){
binding.mBanner.visibility = View.GONE
}else{
binding.mBanner.visibility = View.VISIBLE
mBannerAdapter.setDatas(it[1])
mBannerAdapter.notifyDataSetChanged()
mBannerAdapter.setDatas(it[1])
}
if(it[2].isNullOrEmpty()){
binding.mBannerTwo.visibility = View.GONE
binding.mBannerCardTwo.visibility = View.GONE
}else{
binding.mBannerTwo.visibility = View.VISIBLE
binding.mBannerCardTwo.visibility = View.VISIBLE
mMiddleBannerAdapter.setDatas(it[2])
mMiddleBannerAdapter.notifyDataSetChanged()
// mMiddleBannerAdapter.notifyDataSetChanged()
}
}
mViewModel.scinceLive.observe(this) {
@ -585,7 +599,13 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
mViewModel.layoutLive.observe(this){
layoutTopAdapter.setNewInstance(it.data.top)
binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),it.data.middle.size/2)
if(it.data.middle.size <= 6){
binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),3)
}else{
binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),4)
}
layoutContentAdapter.setNewInstance(it.data.middle)
}
}
@ -666,7 +686,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
signDialog.dismiss()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun LoginOrRegisterChange(event: LoginOrRegisterEvent){
fun loginOrRegisterChange(event: LoginOrRegisterEvent){
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
""
} else {

2
app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt
Unescape Escape View File

@ -81,7 +81,7 @@ class MessageFragment : BaseFragList<MessageVm>() {
override fun setLayout()=binding.root
@Subscribe(threadMode = ThreadMode.MAIN)
fun LoginOrRegisterChange(event: LoginOrRegisterEvent){
fun loginOrRegisterChange(event: LoginOrRegisterEvent){
refresh()
}

20
app/src/main/java/com/zj365/dc/fragment/MineFrag.kt
Unescape Escape View File

@ -14,6 +14,7 @@ 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
import com.xty.common.event.LoginOutEvent
import com.xty.common.event.MyInfoEvent
@ -25,6 +26,7 @@ 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.mime.act.DevInfoAct
import com.zj365.mime.vm.SettingVm
@ -222,7 +224,16 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
CommonToastUtils.showToast("敬请期待")
bundle.clear()
bundle.putString("id", showIdInfo)
bundle.putSerializable("index", ReportVm.ReportInfoType.Day)
bundle.putBoolean("isDemonstrate", isDemonstrate)
bundle.putInt("pageType", 0)
bundle.putString("titleName", "日报")
// RouteManager.goAct(ARouterUrl.HEALTH_REPORT, bundle)//老版（日周月年）报
RouteManager.goAct(ARouterUrl.HEALTH_SKY_HOUR_REPORT, bundle)
// CommonToastUtils.showToast("敬请期待")
}
}
binding.llStartBs.setOnClickListener {
@ -451,6 +462,13 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
mViewModel.getAllInfo(showIdInfo,false)
mViewModel.getScore(1)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun bindDevSuccess(event:BindDevEvent){
mViewModel.getMySetting()
mViewModel.getAllInfo(showIdInfo,false)
mViewModel.getScore(1)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun refreshUI(event: MyInfoEvent){
mViewModel.getMySetting()

1
app/src/main/res/layout/frag_health.xml
Unescape Escape View File

@ -110,6 +110,7 @@
app:banner_indicator_normal_color="@color/col_298D0"
app:banner_indicator_selected_color="@color/col_8D0"
app:banner_infinite_loop="true"
app:banner_loop_time="4000" />
</androidx.cardview.widget.CardView>

1
app/src/main/res/layout/item_recognize_result.xml
Unescape Escape View File

@ -16,6 +16,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:is_circle="false"
android:scaleType="centerCrop"
android:layout_margin="@dimen/dp_1"
app:corner_radius="@dimen/dp_8"/>

8
base/src/main/java/com/xty/base/h5/CloudJSBridge.kt
Unescape Escape View File

@ -56,6 +56,7 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) {
}
@JavascriptInterface
fun gotoScienceDetail(str: String?){
LogUtils.e("CloudJSBridge","gotoScienceDetail str")
str?.let {
@ -64,4 +65,11 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) {
ToastUtils(context).showToast("敬请期待")
}
@JavascriptInterface
fun watchRecharge(str: String?){
str?.let {
}
}
}

2
common/src/main/res/drawable/shape_r8_02c_stroke_1_5.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="@color/col_02c" android:width="@dimen/dp_1_5"/>
<stroke android:color="@color/col_02c" android:width="@dimen/dp_2"/>
<corners android:radius="@dimen/dp_8"/>
</shape>

BIN
common/src/main/res/mipmap-xhdpi/ic_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
common/src/main/res/mipmap-xxhdpi/ic_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_about_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 12 KiB

1
health/src/main/res/layout/frag_sleep_new.xml
Unescape Escape View File

@ -114,6 +114,7 @@
<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
layout="@layout/sleep_music_info"
android:layout_marginBottom="@dimen/dp_20"/>
</LinearLayout>

9
mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt
Unescape Escape View File

@ -126,6 +126,15 @@ class DevInfoAct : BaseVmAct<SettingVm>(),EasyPermissions.PermissionCallbacks {
RouteManager.goAct(ARouterUrl.H5_ACT,bundle)
}
binding.tvRecharge.setOnClickListener {
bundle.clear()
bundle.putString(
"web_site_url",
"${BuildConfig.h5url}pages/index/index?pageId=flowRecharge"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
}
}

12
mine/src/main/java/com/zj365/mime/vm/BaseInfoVm.kt
Unescape Escape View File

@ -62,14 +62,14 @@ class BaseInfoVm : BaseVm() {
startHttp {
withContext(Dispatchers.IO) {
var fileId = ""
var fileUrl = ""
if (path.isNullOrEmpty()) {
} else {
val image = async { uploadImage(path) }
val await = image.await()
fileId = await.fileId
fileUrl = await.url
}
val upload = async {
uploadInfo(
@ -81,7 +81,7 @@ class BaseInfoVm : BaseVm() {
urgent,
urgentPhone,
urgentRelation,
fileId,
fileUrl,
province,
city,
district,
@ -118,7 +118,7 @@ class BaseInfoVm : BaseVm() {
urgent: String,
urgentPhone: String,
urgentRelation: String,
fileId: String = "",
fileUrl: String = "",
province: String,
city: String,
district: String,
@ -162,8 +162,8 @@ class BaseInfoVm : BaseVm() {
json.put("birthday", birthDay)
json.put("birthdayType", birthdayType)
if (!fileId.isNullOrEmpty()) {
json.put("avatarUrl", fileId)
if (!fileUrl.isNullOrEmpty()) {
json.put("avatarUrl", fileUrl)
}
val rb = retrofits.getRequestBody(json.toString())
return apiInterface().setUpdateUser(rb)

4
mine/src/main/res/layout/act_about.xml
Unescape Escape View File

@ -18,11 +18,13 @@
android:layout_margin="@dimen/dp_14"
android:orientation="vertical">
<ImageView
<com.ruffian.library.widget.RImageView
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_43"
app:is_circle="false"
app:corner_radius="@dimen/dp_8"
android:src="@mipmap/icon_about_logo" />
<TextView

2
network/src/main/java/com/xty/network/ApiInterface.kt
Unescape Escape View File

@ -12,7 +12,7 @@ interface ApiInterface {
/**
* 图像上传
*/
@POST("customer/uploadImages")
@POST("upload/uploadFileNew")
@Multipart
suspend fun uploadImage(
@Part patt: MultipartBody.Part

5
network/src/main/java/com/xty/network/model/BannerBean.kt
Unescape Escape View File

@ -5,7 +5,8 @@ import java.io.Serializable
data class BannerBean(
val title: String,
val content: String,
val bannerType: Int,//1:图文展示， 5：app内部打开， 10：web外部跳转， 15：视频播放】，imgUrl 图片地址，linkAddress，连接地址
val bannerType: Int,//1:图文展示， 5：app内部打开， 10：web外部跳转， 15：视频播放，20 小程序跳转】，imgUrl 图片地址，linkAddress，连接地址
val imgUrl: String,
val linkAddress: String
val linkAddress: String,
val wxId:String //小程序ID
):Serializable

1
network/src/main/java/com/xty/network/model/FoodRecoginzeInfo.kt
Unescape Escape View File

@ -4,6 +4,7 @@ import java.nio.DoubleBuffer
data class FoodRecoginzeInfo(
val id:Long,
val img:String,
val heat:Float, //热量(大卡/100g)
val df:Float, //膳食纤维(g/100g
val cho:Float,//碳水化合物(g/100g)

3
network/src/main/java/com/xty/network/model/HomeLayoutBean.kt
Unescape Escape View File

@ -13,6 +13,7 @@ data class HomeLayoutBean(
var jumpType:Int, //1，原生跳转，2，h5跳转，3，小程序跳转
var jumpUrl:String?, //跳转地址或编码
var status:Int,
var seq:String
var seq:String,
var wxId:String
)
}

Write Preview
Loading…
Cancel
Save