18034727885
2026-07-20 f0b2c58bd5235a6eec25ca7f40f937421ae8e8fa
修复问题
7个文件已修改
50 ■■■■■ 已修改文件
app/src/main/java/com/igo/user/ui/HomeActivity.kt 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/MainActivity.kt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/MapTripFragment.kt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/OrderOtherActivity.kt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values-en/strings.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values-fr/strings.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/HomeActivity.kt
@@ -25,6 +25,7 @@
import com.igo.user.R
import com.igo.user.databinding.ActivityHomeBinding
import com.igo.user.dialog.TipDialog
import com.igo.user.extension.setOnDurationClickListener
import com.igo.user.network.Apis.getOrderDrivingData
import com.igo.user.network.HttpManager
import com.igo.user.network.entity.Function
@@ -92,18 +93,18 @@
        Glide.with(this).load(SPUtils.instance().getString("imgUrlLogistics", "")).into(bind.img3)
        bind.apply {
            img1.setOnClickListener {
            img1.setOnDurationClickListener {
                if (checkLogin())
                    toHome(0)
            }
            img2.setOnClickListener {
            img2.setOnDurationClickListener {
                if (checkLogin())
                    toHome(1)
            }
            img3.setOnClickListener {
            img3.setOnDurationClickListener {
                if (checkLogin())
                    startActivity<H5Activity>(
                        "url" to "https://exp.hyuusoft.com/official-huoyun-new-h5",
@@ -112,29 +113,29 @@
                        "fullScreen" to "1",
                    )
            }
            imguserinto.setOnClickListener {
            imguserinto.setOnDurationClickListener {
                if (checkLogin())
                    if (!drawerMain.isDrawerOpen(GravityCompat.START))
                        drawerMain.openDrawer(GravityCompat.START)
            }
            imNews.setOnClickListener {
            imNews.setOnDurationClickListener {
                if (checkLogin())
                    startActivity<MsgActivity>()
            }
        }
        tv_score.setOnClickListener {
        tv_score.setOnDurationClickListener {
            userInfo?.apply {
                startActivity<ScoreActivity>("score" to integral)
            }
        }
        tv_order.setOnClickListener {
        tv_order.setOnDurationClickListener {
            startActivity<OrderActivity>()
        }
        tv_setting.setOnClickListener {
        tv_setting.setOnDurationClickListener {
            startActivityForResult<SettingActivity>(500, "phone" to (userInfo?.phone ?: ""))
        }
        iv_header_home.setOnClickListener {
        iv_header_home.setOnDurationClickListener {
            userInfo?.let {
                startActivity<UserInfoActivity>(
                    "nickName" to it.nickName,
@@ -147,10 +148,10 @@
                )
            }
        }
        tv_coupon.setOnClickListener {
        tv_coupon.setOnDurationClickListener {
            startActivity<MyCouponActivity>()
        }
        tv_safe.setOnClickListener {
        tv_safe.setOnDurationClickListener {
            userInfo?.let {
                startActivity<SafetyActivity>(
                    "state" to it.verified,
@@ -160,7 +161,7 @@
                )
            }
        }
        tv_wallet.setOnClickListener {
        tv_wallet.setOnDurationClickListener {
            userInfo?.let {
                startActivity<WalletActivity>(
                    "balance" to it.balance,
@@ -168,20 +169,20 @@
                )
            }
        }
        tv_red.setOnClickListener {
        tv_red.setOnDurationClickListener {
            startActivity<RedPackageActivity>()
        }
        tv_share.setOnClickListener {
        tv_share.setOnDurationClickListener {
            startActivity<ShareAppActivity>()
        }
        tv_feed_back.setOnClickListener {
        tv_feed_back.setOnDurationClickListener {
            startActivity<FeedbackActivity>()
        }
        tv_service.setOnClickListener {
        tv_service.setOnDurationClickListener {
            startActivity<ServiceActivity>()
        }
        tv_invoice.setOnClickListener {
        tv_invoice.setOnDurationClickListener {
            startActivity<InvokeListActivity>()
        }
    }
app/src/main/java/com/igo/user/ui/MainActivity.kt
@@ -39,6 +39,7 @@
import com.igo.user.dialog.AlertDialog
import com.igo.user.dialog.BannerDialog
import com.igo.user.dialog.TipDialog
import com.igo.user.extension.setOnDurationClickListener
import com.igo.user.network.HttpManager
import com.igo.user.network.entity.Function
import com.igo.user.network.entity.UserInfo
@@ -560,7 +561,7 @@
                    tv_tip.isVisible = mViewPager.currentItem != 1
                    Log.e("当前订单详情: ", "order.state ${order.state}")
                    Log.e("当前订单详情: ", "order.orderType ${order.orderType}")
                    tv_tip.setOnClickListener {
                    tv_tip.setOnDurationClickListener {
                        if (tv_tip.alpha != 0f) {
                            if (order.state in (1..5) || order.state == 11)
                                startActivity<TripActivity>(
@@ -577,7 +578,7 @@
                        }
                    }
                    if (!IGoApplication.hasAutoGoTripping) {
                        tv_tip.callOnClick()
                        tv_tip.performClick()
                        IGoApplication.hasAutoGoTripping = true
                    }
                }
app/src/main/java/com/igo/user/ui/trip/MapTripFragment.kt
@@ -27,7 +27,6 @@
import cn.sinata.xldutils.defaultScheduler
import cn.sinata.xldutils.fragment.BaseFragment
import cn.sinata.xldutils.gone
import cn.sinata.xldutils.invisible
import cn.sinata.xldutils.utils.LanguageUtil
import cn.sinata.xldutils.utils.SpanBuilder
import cn.sinata.xldutils.utils.myToast
@@ -385,6 +384,10 @@
            } else {//专车代叫只判断是否选择姓名
                if (name != getString(R.string.选乘车人)) 1 else 0
            }
            if (chooseindex == 2 && (name.isEmpty() || phone.isNullOrEmpty())) {
                myToast(getString(R.string.请选择乘车人))
                return
            }
            tv_action_taxi.isClickable = false
            tv_action_special.isClickable = false
            showDialog()
app/src/main/java/com/igo/user/ui/trip/OrderOtherActivity.kt
@@ -56,7 +56,7 @@
                myToast(getString(R.string.请填写手机号))
                return@setOnClickListener
            }
            phone = areaCode.toString().replace("+", "") + phone
            phone = areaCode.text.toString().replace("+", "") + phone
            val name = et_name.text.toString()
            if (name.isEmpty()) {
app/src/main/res/values-en/strings.xml
@@ -2043,5 +2043,6 @@
    <string name="取货图片">Pickup Photos</string>
    <string name="送达图片">Delivery Images</string>
    <string name="使用优惠券抵扣">use coupons for deduction</string>
    <string name="请选择乘车人">Please select your passenger</string>
</resources>
app/src/main/res/values-fr/strings.xml
@@ -2015,5 +2015,6 @@
    <string name="取货图片">Images de ramassage</string>
    <string name="送达图片">Livraison d\'images</string>
    <string name="使用优惠券抵扣">Utiliser un bon de réduction pour déduire</string>
    <string name="请选择乘车人">Veuillez sélectionner les passagers</string>
</resources>
app/src/main/res/values/strings.xml
@@ -1070,5 +1070,6 @@
    <string name="取货图片">取货图片</string>
    <string name="送达图片">送达图片</string>
    <string name="使用优惠券抵扣">使用优惠券抵扣</string>
    <string name="请选择乘车人">请选择乘车人</string>
</resources>