fix

lmw

2023-03-14 128cbeac95dbc995fe1760bbd0f0a985fa5d23ba

fix

 app/src/main/java/com/fuban/user/dialog/ShareDialog.kt

@@ -6,6 +6,8 @@
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
import cn.sinata.xldutils.gone
import cn.sinata.xldutils.invisible
import cn.sinata.xldutils.visible
import com.fuban.user.R
import kotlinx.android.synthetic.main.dialog_share.*
@@ -37,6 +39,8 @@
        super.onViewCreated(view, savedInstanceState)
        if (isTrip)
            tv_msg.visible()
        else
            tv_title.text = "分享"
        iv_close.setOnClickListener {
            dismiss()
        }

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

@@ -19,8 +19,8 @@
    val SOCKET_PORT = if (isTest) TEST_PORT else LINE_PORT

    /**公共接口*/
    val SHARE_URL = "https://fuban.net/share/shareIndex.html?uid=%d&type=1" //普通分享
    val TRIP_URL = "https://fuban.net/orderShare/index.html?orderId=%s&orderType=%d" //行程分享
    val SHARE_URL = "https://fuban.net/sharePage/share/shareIndex.html?uid=%d&type=1" //普通分享
    val TRIP_URL = "https://fuban.net/sharePage/orderShare/index.html?orderId=%s&orderType=%d" //行程分享

    const val H5_URL = "base/agreement/queryByType" //获取协议
    const val queryOpenCity = "base/openCity/queryOpenCity"

 app/src/main/java/com/fuban/user/network/entity/MineData.kt

@@ -8,7 +8,7 @@
    val emergencyContactNumber: String = "",
    val id: Int = 0,
    val integral: String = "",
    val isAuth: Int = 0,
    val isAuth: String = "",
    val name: String = "",
    val nickName: String = "",
    val phone: String = "",

 app/src/main/java/com/fuban/user/network/entity/OrderData.kt

@@ -179,8 +179,8 @@
    }

    fun getStateColor() = when(state){
        7-> R.color.colorRed
        10-> R.color.textColor66
        7,8-> R.color.colorRed
        9,10-> R.color.textColor66
        else->R.color.colorPrimary
    }


 app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt

@@ -279,9 +279,8 @@
                    getTrippingData()
                    tv_complain.visible()
                    tv_share.visible()
                    if (type == Const.OrderType.TYPE_CROSS_CITY) //跨城行程中无法取消
                        titleBar.getRightButton(0)?.gone()

//                    if (type == Const.OrderType.TYPE_CROSS_CITY) //跨城行程中无法取消
                    titleBar.getRightButton(0)?.gone()
                }else->{
                    startActivity<OrderDetailActivity>("id" to id,"type" to type)
                    finish()
@@ -463,7 +462,7 @@
                    val s = System.currentTimeMillis()
                    val i = Math.max(s - waittime,0L)
                    val c = String.format("司机到达预约地点，已等您%02d:%02d", i / 1000 / 60, i / 1000 % 60)
                    tv_state.text = SpanBuilder(c).color(this,11,c.length,R.color.colorRed).build()
                    tv_state.text = SpanBuilder(c).color(this,12,c.length,R.color.colorRed).build()
                    FBApplication.intervalCount ++
                    if (FBApplication.intervalCount>7){
                        getTrippingData()

 app/src/main/res/drawable/icon_logo.png

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

@@ -7,9 +7,10 @@
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:hint="分享文案"
        android:gravity="center"
        android:layout_marginHorizontal="20dp"
        android:text="福伴出行为客户提供安全、便捷、优质的个性化商旅出行用车体验，并带领客户探秘当地人文地理、风俗民情、户外运动、商务活动及相关代订业务的综合性服务平台。"
        app:layout_constraintTop_toTopOf="parent"
        android:textColor="@color/textColor"
        android:layout_marginTop="25dp"/>
    <TextView
        android:layout_width="match_parent"

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

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

    <com.facebook.drawee.view.SimpleDraweeView
        android:id="@+id/iv_img"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_width="160dp"
        android:layout_height="160dp"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        android:layout_marginTop="180dp"
        android:scaleType="centerCrop"
        app:placeholderImage="@mipmap/splash"
        app:placeholderImage="@mipmap/icon_logo"
        app:placeholderImageScaleType="centerCrop" />
</androidx.constraintlayout.widget.ConstraintLayout>

 umeng_sdk/src/main/res/drawable/icon_logo.png