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

中建365-bug修复

Browse Source
dev_second
wlh 7 months ago
parent edfac21862
commit 6ee2b06f2e
5 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -124,10 +124,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
} }
5 -> { //内部跳转 5 -> { //内部跳转
// bundle.clear()
// bundle.putString("title", bannerBean.title)
// bundle.putString("url", bannerBean.linkAddress)
// RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
bundle.clear() bundle.clear()
bundle.putString("title", bannerBean.title) bundle.putString(
bundle.putString("url", bannerBean.linkAddress) "web_site_url",
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) "${bannerBean.linkAddress}"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
} }
15 ->{ //视频跳转 15 ->{ //视频跳转
@ -135,10 +141,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
} }
10 -> {//web 跳转 10 -> {//web 跳转
// bundle.clear()
// bundle.putString("title", bannerBean.title)
// bundle.putString("url", bannerBean.linkAddress)
// RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
bundle.clear() bundle.clear()
bundle.putString("title", bannerBean.title) bundle.putString(
bundle.putString("url", bannerBean.linkAddress) "web_site_url",
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) "${bannerBean.linkAddress}"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
} }
20 ->{ 20 ->{
val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
@ -180,17 +192,29 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
} }
5 -> { //内部跳转 5 -> { //内部跳转
// bundle.clear()
// bundle.putString("title", bannerBean.title)
// bundle.putString("url", bannerBean.linkAddress)
// RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
bundle.clear() bundle.clear()
bundle.putString("title", bannerBean.title) bundle.putString(
bundle.putString("url", bannerBean.linkAddress) "web_site_url",
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) "${bannerBean.linkAddress}"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
} }
10 -> {//web 跳转 10 -> {//web 跳转
// bundle.clear()
// bundle.putString("title", bannerBean.title)
// bundle.putString("url", bannerBean.linkAddress)
// RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
bundle.clear() bundle.clear()
bundle.putString("title", bannerBean.title) bundle.putString(
bundle.putString("url", bannerBean.linkAddress) "web_site_url",
RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) "${bannerBean.linkAddress}"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
} }
15 ->{ //视频跳转 15 ->{ //视频跳转

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

@ -176,6 +176,7 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) {
@JavascriptInterface @JavascriptInterface
fun jumpWallet(str: String?){ fun jumpWallet(str: String?){
str?.let { str?.let {
LogUtils.e("eeeee",it)
var wxBean = GsonUtils.fromJson(it, OpenWXBean::class.java) var wxBean = GsonUtils.fromJson(it, OpenWXBean::class.java)
val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID

2
base/src/main/java/com/xty/base/utils/PayUtils.kt
Unescape Escape View File

@ -6,6 +6,7 @@ import android.os.Looper
import android.os.Message import android.os.Message
import android.text.TextUtils import android.text.TextUtils
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
@ -137,6 +138,7 @@ open class PayUtils(var context: Context) {
tvZhifu.text = "确认支付" tvZhifu.text = "确认支付"
} }
val llDuihuan = view.findViewById<LinearLayout>(R.id.llDuihuan) val llDuihuan = view.findViewById<LinearLayout>(R.id.llDuihuan)
llDuihuan.visibility = View.GONE
llDuihuan.setOnClickListener { llDuihuan.setOnClickListener {
tvWeixin.isSelected = false tvWeixin.isSelected = false
tvZhifubao.isSelected = false tvZhifubao.isSelected = false

14
health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt
Unescape Escape View File

@ -96,6 +96,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
private var user: ReportBean.User? = null private var user: ReportBean.User? = null
private var isfirst: Boolean = true private var isfirst: Boolean = true
private var isX1X2 = false private var isX1X2 = false
private var startEventTime:Long=0L
private var isSelectTable = false private var isSelectTable = false
private var isScrollTable = false private var isScrollTable = false
@ -192,6 +193,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
override fun initData() { override fun initData() {
super.initData() super.initData()
startEventTime = System.currentTimeMillis()
isX1X2 = MMkvHelper.getBoolean(Const.X1_X2_Device, false) isX1X2 = MMkvHelper.getBoolean(Const.X1_X2_Device, false)
isEstimate = intent.getBooleanExtra("isEstimate", false) isEstimate = intent.getBooleanExtra("isEstimate", false)
@ -764,6 +766,10 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
timeMill - (24 * 60 * 60 * 1000), timeMill - (24 * 60 * 60 * 1000),
SimpleDateFormat("MM-dd") SimpleDateFormat("MM-dd")
) )
val yestDay1 = RxTimeTool.milliseconds2String(
timeMill - (24 * 60 * 60 * 1000),
SimpleDateFormat("yyyy-MM-dd")
)
if (isDemonstrate) { if (isDemonstrate) {
if (isfirst) { if (isfirst) {
binding.mTvTime.text = yestDay binding.mTvTime.text = yestDay
@ -771,6 +777,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
binding.mTvTime.text = timSelect.selectTime binding.mTvTime.text = timSelect.selectTime
} }
isfirst = false isfirst = false
text = "$yestDay1 11:00:00"
} else { } else {
binding.mTvTime.text = "$yestDay 11:00 至 ${ binding.mTvTime.text = "$yestDay 11:00 至 ${
it.data.healthy.createTime.substring( it.data.healthy.createTime.substring(
@ -778,6 +785,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
10 10
) )
} 11:00" } 11:00"
text = "$yestDay1 11:00:00"
} }
} }
} }
@ -1993,21 +2001,21 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
val time = if (nowTime == showTime) { val time = if (nowTime == showTime) {
RxTimeTool.curTimeString RxTimeTool.curTimeString
} else { } else {
"$showTime 12:00:00" showTime
} }
if (isEstimate) { if (isEstimate) {
user?.let { user?.let {
val aesId = AESCrypt.encrypt("${it.id}") val aesId = AESCrypt.encrypt("${it.id}")
val subtitle = "${it.name}的24小时健康评估" val subtitle = "${it.name}的24小时健康评估"
val url = "${BuildConfig.image_prefix}/shareApi/reportDaily/$aesId/${time}" val url = "${BuildConfig.image_prefix}shareApi/reportDaily/$aesId/${time}"
WxUtils.shareWebPage("24小时健康评估", subtitle, this, url) WxUtils.shareWebPage("24小时健康评估", subtitle, this, url)
} }
} else { } else {
user?.let { user?.let {
val aesId = AESCrypt.encrypt("${it.id}") val aesId = AESCrypt.encrypt("${it.id}")
val subtitle = "${it.name}的日报数据" val subtitle = "${it.name}的日报数据"
val url = "${BuildConfig.image_prefix}/shareApi/reportDaily/$aesId/${time}" val url = "${BuildConfig.image_prefix}shareApi/reportDaily/$aesId/${time}"
WxUtils.shareWebPage("日报分享", subtitle, this, url) WxUtils.shareWebPage("日报分享", subtitle, this, url)
} }
} }

10
health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt
Unescape Escape View File

@ -2643,13 +2643,13 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
shareTitle = "近30天健康评估分享" shareTitle = "近30天健康评估分享"
title = "${it.name}近30天健康评估" title = "${it.name}近30天健康评估"
url = url =
"${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime" "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
} else { } else {
//近七天分享 //近七天分享
shareTitle = "近7天健康评估分享" shareTitle = "近7天健康评估分享"
title = "${it.name}近7天健康评估" title = "${it.name}近7天健康评估"
url = url =
"${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime" "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
} }
} else { } else {
when (index) { when (index) {
@ -2662,19 +2662,19 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
myTime = "${times[0].trim()}/${times[1]}" myTime = "${times[0].trim()}/${times[1]}"
} }
url = url =
"${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime" "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
} }
ReportVm.ReportInfoType.Month -> { ReportVm.ReportInfoType.Month -> {
shareTitle = "月报分享" shareTitle = "月报分享"
title = "${it.name}月健康状态趋势" title = "${it.name}月健康状态趋势"
url = "${BuildConfig.image_prefix}/shareApi/reportMonthly/$aesId/$time" url = "${BuildConfig.image_prefix}shareApi/reportMonthly/$aesId/$time"
} }
ReportVm.ReportInfoType.Year -> { ReportVm.ReportInfoType.Year -> {
shareTitle = "年报分享" shareTitle = "年报分享"
title = "${it.name}本年健康状态趋势" title = "${it.name}本年健康状态趋势"
url = "${BuildConfig.image_prefix}/shareApi/reportYear/$aesId/$time" url = "${BuildConfig.image_prefix}shareApi/reportYear/$aesId/$time"
} }
else -> {} else -> {}

Write Preview
Loading…
Cancel
Save