修复问题 升级版本号

18034727885

2026-09-18 1328a7b0b90825b1fd63bca8f7675e52df8b151d

修复问题
升级版本号

 app/build.gradle

@@ -21,8 +21,8 @@
        applicationId "com.gopost.user"
        minSdkVersion 23
        targetSdkVersion 36
        versionCode 28
        versionName "1.28"
        versionCode 29
        versionName "1.29"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -31,12 +31,23 @@
            minifyEnabled false
            zipAlignEnabled true
            signingConfig signingConfigs.release
            buildConfigField "String", "BASE_URL", "\"https://gopost.ci/user-server/\""
            buildConfigField "String", "SOCKET_SERVER", "\"34.155.170.245\""
            buildConfigField "int", "SOCKET_PORT", "8888"

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        debug {
            minifyEnabled false
            zipAlignEnabled true
            signingConfig signingConfigs.release
            buildConfigField "String", "BASE_URL", "\"https://gopost.ci/user-server/\""
            buildConfigField "String", "SOCKET_SERVER", "\"34.155.170.245\""
            buildConfigField "int", "SOCKET_PORT", "8888"
//            buildConfigField "String", "BASE_URL", "\"http://192.168.110.111:5000/user-server/\""
//            buildConfigField "String", "SOCKET_SERVER", "\"192.168.110.111\""
//            buildConfigField "int", "SOCKET_PORT", "9991"

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

 app/src/main/java/com/igo/user/IGoApplication.kt

@@ -78,7 +78,7 @@
    }

    private fun initNetty() {
        NettyClient.getInstance().init(this, Apis.SOCKET_SERVER, Apis.SOCKET_PORT, true)
        NettyClient.getInstance().init(this, BuildConfig.SOCKET_SERVER, BuildConfig.SOCKET_PORT, true)
        NettyClient.getInstance().addOnMessageListener { message ->
            try {
                val json = JSONObject(message)

 app/src/main/java/com/igo/user/network/Apis.kt

@@ -1,24 +1,13 @@
package com.igo.user.network

import com.igo.user.BuildConfig

object Apis {
    private var isTest = false

    private const val TEST_URL = "http://192.168.110.111:5000/user-server/"
    private const val LINE_URL = "https://gopost.ci/user-server/" //线上服务器
    val BASE_URL = if (isTest) TEST_URL else LINE_URL

    private const val TEST_IP = "192.168.110.111"
    private const val LINE_IP = "34.155.170.245"//线上服
    private const val TEST_PORT = 9991 //测试外
    private const val LINE_PORT = 8888 //线上
    val SOCKET_SERVER = if (isTest) TEST_IP else LINE_IP
    val SOCKET_PORT = if (isTest) TEST_PORT else LINE_PORT

    /**公共接口*/
    val SHARE_URL = "https://igo.i-go.group/share/share_/shareIndex%d.html?language=%d&type=1&uid=%d" //普通分享
    val TRIP_URL = "https://igo.i-go.group/share/orderShare/index%d.html?orderId=%s_%d_%d" //行程分享

    val CODE_IMG = "${BASE_URL}base/kaptcha?phone=%s" //图形验证码
    val CODE_IMG = "${BuildConfig.BASE_URL}base/kaptcha?phone=%s" //图形验证码

    const val H5_URL = "base/agreement/queryByType" //获取协议
    const val upImage = "base/user/image" //上传

 app/src/main/java/com/igo/user/network/RRetrofit.kt

@@ -62,7 +62,7 @@
    }

    private val retrofit: Retrofit = Retrofit.Builder()
        .baseUrl(Apis.BASE_URL)
        .baseUrl(BuildConfig.BASE_URL)
        .addConverterFactory(JsonConverterFactory.create())
        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
        .client(

 app/src/main/java/com/igo/user/ui/H5Activity.kt

@@ -1,6 +1,8 @@
package com.igo.user.ui

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.widget.TextView
import cn.sinata.xldutils.activity.WebViewActivity
@@ -12,25 +14,60 @@
import org.jetbrains.anko.find
import org.jetbrains.anko.sdk27.coroutines.onClick

class H5Activity :WebViewActivity() {
class H5Activity : WebViewActivity() {
    companion object {
        fun getIntent(
            context: Context,
            url: String,
            type: Int,
            title: String = "",
            fullScreen: String = "0",
            exitByWeb: String = "0",
            actionEnable: Boolean = false
        ): Intent {
            return Intent(context, H5Activity::class.java).apply {
                putExtra("url", url)
                putExtra("type", type)
                putExtra("title", title)
                putExtra("fullScreen", fullScreen)
                putExtra("exitByWeb", exitByWeb)
                putExtra("actionEnable", actionEnable)
            }
        }
    }

    private val url by lazy { intent.getStringExtra("url") }
    private val type by lazy { intent.getIntExtra("type", 0) }
    private val title by lazy { intent.getStringExtra("title") }
    private val fullScreen by lazy { intent.getStringExtra("fullScreen") }
    private val exitByWeb by lazy { intent.getStringExtra("exitByWeb") }
    private val actionEnable by lazy { intent.getBooleanExtra("actionEnable", false) }
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        titleBar.setTitleColor(cn.sinata.xldutils.R.color.textColor)
        titleBar.backgroundColorResource = cn.sinata.xldutils.R.color.white
        titleBar.leftView.setCompoundDrawablesWithIntrinsicBounds(cn.sinata.xldutils.R.mipmap.back,0,0,0)
        titleBar.leftView.setCompoundDrawablesWithIntrinsicBounds(cn.sinata.xldutils.R.mipmap.back, 0, 0, 0)
        UltimateBar.with(this)
            .statusDark(true)
            .create().immersionBar() //沉浸状态栏
        val tvAction = find<TextView>(R.id.tv_action)
        if (intent.getBooleanExtra("actionEnable",false)){
        if (actionEnable) {
            tvAction.visible()
            tvAction.onClick {
                setResult(Activity.RESULT_OK)
                finish()
            }
        }
        if (intent.getStringExtra("fullScreen") == "1") {
        if (fullScreen == "1") {
            titleBar.gone()
        }
    }

    override fun onBackPressHandle() {
        if (exitByWeb == "1" && webView.canGoBack()) {
            webView.goBack()
            return
        }
        super.onBackPressHandle()
    }
}

 app/src/main/java/com/igo/user/ui/HomeActivity.kt

@@ -11,6 +11,7 @@
import androidx.core.view.GravityCompat
import androidx.drawerlayout.widget.DrawerLayout
import cn.sinata.rxnetty.LogHelper
import cn.sinata.xldutils.utils.LanguageUtil
import cn.sinata.xldutils.utils.SPUtils
import cn.sinata.xldutils.utils.showAllowingStateLoss
import com.facebook.drawee.view.SimpleDraweeView
@@ -22,6 +23,7 @@
import com.igo.user.dialog.TipDialog
import com.igo.user.extension.setOnDurationClickListener
import com.igo.user.network.HttpManager
import com.igo.user.network.RRetrofit
import com.igo.user.network.entity.Function
import com.igo.user.network.entity.UserInfo
import com.igo.user.network.request
@@ -99,13 +101,21 @@
                    toHome(1)
            }
            img3.setOnDurationClickListener {
                if (checkLogin())
                    startActivity<H5Activity>(
                        "url" to "https://exp.hyuusoft.com/official-huoyun-new-h5",
                        "type" to 0,
                        "title" to "",
                        "fullScreen" to "1",
                    )
                if (checkLogin()) {
                    SPUtils.instance().getString(Const.User.PHONE).takeIf { !it.isEmpty() }?.also {
                        val language = LanguageUtil.getLanguage()
                        val l = RRetrofit.getLanguageType(language)
                        startActivity(
                            H5Activity.getIntent(
                                this@HomeActivity,
                                "https://ies.hyuusoft.com/qihong_client/#/?phone=${it}&language=${l}",
                                0,
                                fullScreen = "1",
                                exitByWeb = "1",
                            )
                        )
                    }
                }
            }
            imguserinto.setOnDurationClickListener {
                if (checkLogin())

 app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt

@@ -293,12 +293,6 @@
            }
            aMap = it.apply {
                isMyLocationEnabled = true
                moveCamera(
                    CameraUpdateFactory.newLatLngZoom(
                        IGoApplication.getCurrentLocation(),
                        DEFAULT_SCALE_LEVEL
                    )
                )
                uiSettings.isMyLocationButtonEnabled = false
                setOnMyLocationChangeListener {
                    Log.e(Const.Tag, "当前定位：lat:" + it.latitude + ",lon:" + it.longitude)
@@ -306,21 +300,7 @@
//                IGoApplication.address = it.address
//                IGoApplication.cityCode = it.extras.getString("adcode")?:""
                    if (locCount < 1) {
                        if (mainActivity.lat != 0.0)
                            moveCamera(
                                CameraUpdateFactory.newLatLngZoom(
                                    LatLng(
                                        mainActivity.lat,
                                        mainActivity.lon
                                    ), DEFAULT_SCALE_LEVEL
                                )
                            )
                        else
                            moveCamera(
                                CameraUpdateFactory.newLatLngZoom(
                                    LatLng(it.latitude, it.longitude), DEFAULT_SCALE_LEVEL
                                )
                            )
                        moveCamera(CameraUpdateFactory.newLatLngZoom(LatLng(it.latitude, it.longitude), DEFAULT_SCALE_LEVEL))
                    }
                    locCount++
                }
@@ -346,6 +326,7 @@
                    objectAnimator1.start()
                    tv_center.text = getString(R.string.在这里领取)
                }
                moveCamera(CameraUpdateFactory.newLatLngZoom(IGoApplication.getCurrentLocation(), DEFAULT_SCALE_LEVEL))
            }
        }
    }

 app/src/main/java/com/igo/user/ui/mine/adapter/MyCouponAdapter.kt

@@ -25,7 +25,7 @@
        holder.setText(R.id.tv_agency,data.getNameStr())
        holder.setText(R.id.tv_deadline,context.getString(R.string.有效期至,data.time))
        holder.setText(R.id.tv_range,context.getString(data.getRangeStr())+data.getFullMoney(context))
        holder.setText(R.id.tv_money, String.format("%.2f",data.money).extClearInvalidZero())
        holder.setText(R.id.tv_money, data.money.toString().extClearInvalidZero())
        holder.bind<CheckedTextView>(R.id.radio_check).invisible()
//        holder.setText(R.id.tv_condition, if (data.type == 2) String.format("满%.2f元可用",data.fullMoney) else "")
        holder.bind<View>(R.id.cl_left).backgroundResource = if (type == 2) R.mipmap.bg_coupon_grey else data.getTypeBg()

 app/src/main/java/com/igo/user/ui/trip/MapTripFragment.kt

@@ -484,24 +484,7 @@
//                IGoApplication.address = it.address
//                IGoApplication.cityCode = it.extras.getString("adcode")?:""
                    if (locCount < 2) {
                        if (mainActivity.lat != 0.0)
                            moveCamera(
                                CameraUpdateFactory.newLatLngZoom(
                                    LatLng(
                                        mainActivity.lat,
                                        mainActivity.lon
                                    ), 18f
                                )
                            )
                        else
                            moveCamera(
                                CameraUpdateFactory.newLatLngZoom(
                                    LatLng(
                                        it.latitude,
                                        it.longitude
                                    ), 18f
                                )
                            )
                        moveCamera(CameraUpdateFactory.newLatLngZoom(LatLng(it.latitude, it.longitude), 18f))
                    }
                    locCount++
                }

 app/src/main/res/layout/activity_home.xml

@@ -124,6 +124,12 @@

                    </LinearLayout>

                    <View
                        android:layout_width="10dp"
                        android:layout_height="1px"
                        android:visibility="gone"
                        tools:visibility="visible"/>

                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"

 app/src/main/res/layout/item_msg.xml

@@ -1,38 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/swipe_layout"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@color/page_bg"
    android:paddingTop="4dp"
    android:layout_height="wrap_content">
    android:paddingTop="4dp">

        <TextView
            android:layout_width="70dp"
            android:layout_height="match_parent"
            android:text="删除"
            android:gravity="center"
            android:layout_gravity="right"
            android:textColor="@color/white"
            android:background="@color/colorRed"
            android:textSize="15sp"
            android:textStyle="bold"
            android:id="@+id/tv_del"/>
    <TextView
        android:id="@+id/tv_del"
        android:layout_width="70dp"
        android:layout_height="match_parent"
        android:layout_gravity="right"
        android:background="@color/colorRed"
        android:gravity="center"
        android:text="删除"
        android:textColor="@color/white"
        android:textSize="15sp"
        android:textStyle="bold" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@color/white"
        android:paddingBottom="10dp">
        android:paddingVertical="14dp">

        <TextView
            android:id="@+id/tv_title"
            style="@style/style_common_text"
            android:layout_width="wrap_content"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_margin="14dp"
            android:layout_marginHorizontal="14dp"
            android:text="系统提示"
            android:textStyle="bold"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

@@ -40,36 +42,44 @@
            android:id="@+id/tv_time"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="13dp"
            android:layout_marginTop="10dp"
            android:layout_marginEnd="14dp"
            android:text="2019-05-02 10:48"
            android:textColor="@color/textColor99"
            android:textSize="12sp"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_title"
            app:layout_constraintEnd_toEndOf="parent" />
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toBottomOf="@id/ll_content" />

        <TextView
            android:id="@+id/tv_content"
        <LinearLayout
            android:id="@+id/ll_content"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginTop="11dp"
            android:layout_marginEnd="13dp"
            android:text="热烈祝贺GOPOSTAPP上线，柳州的帅哥美女
些有彩蛋，速来体验！"
            android:textColor="@color/textColor66"
            android:textSize="12sp"
            app:layout_constraintEnd_toStartOf="@id/iv_img"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="@id/tv_title"
            app:layout_constraintStart_toStartOf="@id/tv_title"
            app:layout_constraintTop_toBottomOf="@id/tv_title" />
            app:layout_constraintTop_toBottomOf="@id/tv_title">

        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/iv_img"
            android:layout_width="62dp"
            android:layout_height="62dp"
            android:visibility="gone"
            app:actualImageScaleType="centerCrop"
            app:layout_constraintEnd_toEndOf="@id/tv_time"
            app:placeholderImage="@color/page_bg"
            app:layout_constraintTop_toTopOf="@id/tv_content"
            app:roundedCornerRadius="1dp" />
            <TextView
                android:id="@+id/tv_content"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="热烈祝贺GOPOSTAPP上线，柳州的帅哥美女些有彩蛋，速来体验！"
                android:textColor="@color/textColor66"
                android:textSize="12sp"
                app:layout_constraintEnd_toStartOf="@id/iv_img" />

            <com.facebook.drawee.view.SimpleDraweeView
                android:id="@+id/iv_img"
                android:layout_width="62dp"
                android:layout_height="62dp"
                android:layout_marginStart="13dp"
                android:visibility="gone"
                app:actualImageScaleType="centerCrop"
                app:placeholderImage="@color/page_bg"
                app:roundedCornerRadius="1dp"
                tools:visibility="visible" />
        </LinearLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
</com.daimajia.swipe.SwipeLayout>

 xldutils-kotlin/src/main/java/cn/sinata/xldutils/activity/WebViewActivity.kt

@@ -12,7 +12,7 @@

open class WebViewActivity : TitleActivity() {

    private val webView by lazy {
    protected val webView by lazy {
        find<WebView>(R.id.webView)
    }
    private val tv_show_forus by lazy {