现场测试反馈问题

lmw

2023-06-02 37a3189d71102d0997a349af6666448a4b8c6666

现场测试反馈问题

 app/src/main/java/com/fanghua/driver/base/MyBaseActivity.java

@@ -141,7 +141,7 @@
     * @param time
     */
    public void showOrder(String orderId, int time) {
        MyApplication.Companion.getTTsManager().setVideoText("芳华代驾，有一条新的订单");
        MyApplication.Companion.getTTsManager().setVideoText("芳华代驾司机，有一条新的订单");
        Intent intent = new Intent(this, TripActivity.class);
        intent.putExtra("orderId", orderId);
        intent.putExtra("countDown", time);

 app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt

@@ -67,7 +67,7 @@
    }

    override fun initView() {
        setTitleText("芳华代驾")
        setTitleText("芳华代驾司机")
        callOrder()
        addSockectCancel()
        MyApplication.getInstance()!!.initUpPoint()
@@ -359,8 +359,7 @@
                    tv_length.text = "%d公里".format(orderBean!!.estimatedMileage.toDouble().toInt())
                } else {
                    line1.gone()
                    tv_length.gone()
                    tv_2.gone()
                    ll_length.gone()
                    tv_1.text = "起步价"
                    tv_money.text = "%.2f元".format(orderBean!!.startPrice)
                    moveCamera(aMap, startMarker!!.position)
@@ -369,8 +368,7 @@
            102, 103 -> {
                showMarker2(orderBean!!.currentDistance.toFloat())
                line1.gone()
                tv_length.gone()
                tv_2.gone()
                ll_length.gone()
                if (!orderBean?.endAddress.isNullOrEmpty()) {//有终点
                    tv_money.text = "%.2f元".format(orderBean!!.estimatedPrice)
                } else {
@@ -415,14 +413,11 @@
                countDownTimer?.cancel()
                slide_btn.changeButtonText("开始服务")
                line1.visible()
                tv_length.visible()
                tv_2.visible()
                ll_length.visible()
                line2.visible()
                tv_waiting.visible()
                tv_3.visible()
                ll_waiting.visible()
                line3.visible()
                tv_duration.visible()
                tv_4.visible()
                ll_duration.visible()
                //菜单项显示等待按钮
                tv_wait.visible()
                divider_3.visible()
@@ -444,14 +439,11 @@
                showMarker4()
                slide_btn.changeButtonText("到达目的地")
                line1.visible()
                tv_length.visible()
                tv_2.visible()
                ll_length.visible()
                line2.visible()
                tv_waiting.visible()
                tv_3.visible()
                ll_waiting.visible()
                line3.visible()
                tv_duration.visible()
                tv_4.visible()
                ll_duration.visible()
                //菜单项只显示追加和等待按钮
                tv_cancel.gone()
                divider_1.gone()

 app/src/main/java/com/fanghua/driver/ui/mine/money_bag/InsureDetailActivity.kt

@@ -18,6 +18,7 @@
        data?.apply {
            tv_time.text = TimeUtils.getTimeYYYYMMDDHHmm1(createTime)
            tv_num.text = code
            tv_money.text = amount
        }
    }


 app/src/main/java/com/fanghua/driver/ui/pub/CodeLoginActivity.kt

@@ -36,7 +36,7 @@

    override fun initView() {
        showBack(false)
        setTitleText("芳华代驾")
        setTitleText("芳华代驾司机")
        if (Api.isTest)
            et_login_phone.setText("16666666666")
    }

 app/src/main/java/com/fanghua/driver/ui/pub/InputCodeActivity.kt

@@ -34,7 +34,7 @@
    }

    override fun initView() {
        setTitleText("芳华代驾")
        setTitleText("芳华代驾司机")
        tv_phone.text = phone
        et_code.addTextChangedListener(object :TextWatcher{
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {

 app/src/main/java/com/fanghua/driver/ui/pub/LoginActivity.kt

@@ -33,7 +33,7 @@

    override fun initView() {
        showBack(false)
        setTitleText("芳华代驾")
        setTitleText("芳华代驾司机")
        if (Api.isTest){
            et_login_phone.setText("16666666666")
            et_login_pwd.setText("111111")

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

@@ -41,7 +41,7 @@
                android:drawablePadding="3dp"
                android:maxWidth="280dp"
                android:maxLines="1"
                android:text="芳华代驾"
                android:text="芳华代驾司机"
                android:singleLine="true"
                android:textColor="@color/white"
                android:textSize="18sp"

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

@@ -211,139 +211,176 @@
            android:layout_marginTop="10dp"
            android:background="@color/dividing_line_color"
            app:layout_constraintTop_toBottomOf="@id/tv_end" />

        <TextView
            android:id="@+id/tv_money"
            android:layout_width="wrap_content"
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="20dp"
            android:layout_marginBottom="35dp"
            android:text="0.0元"
            android:textColor="@color/red_main"
            android:textSize="16sp"
            android:textStyle="bold"
            app:layout_constraintEnd_toStartOf="@id/line1"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_end" />
            android:orientation="horizontal"
            android:id="@+id/ll_info"
            app:layout_constraintTop_toBottomOf="@id/tv_end">
            <LinearLayout
                android:layout_width="0dp"
                android:layout_weight="1"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                android:gravity="center"
                android:id="@+id/ll_money">
                <TextView
                    android:id="@+id/tv_money"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="20dp"
                    android:text="0.0元"
                    android:textColor="@color/red_main"
                    android:textSize="16sp"
                    android:textStyle="bold"
                    app:layout_constraintEnd_toStartOf="@id/line1"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/tv_end" />

        <TextView
            android:id="@+id/tv_1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="2dp"
            android:text="预估费用"
            android:textColor="@color/textColor66"
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintEnd_toEndOf="@id/tv_money"
            app:layout_constraintStart_toStartOf="@id/tv_money"
            app:layout_constraintTop_toBottomOf="@id/tv_money" />
                <TextView
                    android:id="@+id/tv_1"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="3dp"
                    android:layout_marginBottom="17dp"
                    android:text="预估费用"
                    android:textColor="@color/textColor66"
                    android:textSize="12sp"
                    android:textStyle="bold"
                    app:layout_constraintEnd_toEndOf="@id/tv_money"
                    app:layout_constraintStart_toStartOf="@id/tv_money"
                    app:layout_constraintTop_toBottomOf="@id/tv_money" />
            </LinearLayout>
            <View
                android:id="@+id/line1"
                android:layout_width="1dp"
                android:layout_height="30dp"
                android:background="@color/dividing_line_color"
                android:layout_gravity="center"/>
            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                android:layout_weight="1"
                android:gravity="center"
                android:id="@+id/ll_length">
                <TextView
                    android:id="@+id/tv_length"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="0公里"
                    android:layout_marginTop="20dp"
                    android:textColor="@color/red_main"
                    android:textSize="16sp"
                    android:textStyle="bold"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
                    app:layout_constraintEnd_toStartOf="@id/line2"
                    app:layout_constraintStart_toEndOf="@id/line1" />

        <View
            android:id="@+id/line1"
            android:layout_width="1dp"
            android:layout_height="30dp"
            android:background="@color/dividing_line_color"
            app:layout_constraintBottom_toBottomOf="@id/tv_1"
            app:layout_constraintEnd_toStartOf="@id/tv_length"
            app:layout_constraintStart_toEndOf="@id/tv_money"
            app:layout_constraintTop_toTopOf="@id/tv_money" />
                <TextView
                    android:id="@+id/tv_2"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="行驶里程"
                    android:textColor="@color/textColor66"
                    android:textSize="12sp"
                    android:textStyle="bold"
                    android:layout_marginTop="3dp"
                    android:layout_marginBottom="17dp"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
                    app:layout_constraintEnd_toEndOf="@id/tv_length"
                    app:layout_constraintStart_toStartOf="@id/tv_length" />
            </LinearLayout>
            <View
                android:id="@+id/line2"
                android:layout_width="1dp"
                android:layout_height="30dp"
                android:layout_gravity="center"
                android:background="@color/dividing_line_color"
                android:visibility="gone" />
            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:visibility="gone"
                android:layout_marginTop="20dp"
                android:gravity="center"
                android:orientation="vertical"
                android:id="@+id/ll_waiting">
                <TextView
                    android:id="@+id/tv_waiting"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="0分钟"
                    android:textColor="@color/red_main"
                    android:textSize="16sp"
                    android:textStyle="bold"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
                    app:layout_constraintEnd_toStartOf="@id/line3"
                    app:layout_constraintStart_toEndOf="@id/line2" />

        <TextView
            android:id="@+id/tv_length"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="0公里"
            android:textColor="@color/red_main"
            android:textSize="16sp"
            android:textStyle="bold"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
            app:layout_constraintEnd_toStartOf="@id/line2"
            app:layout_constraintStart_toEndOf="@id/line1" />
                <TextView
                    android:id="@+id/tv_3"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="等待时间"
                    android:textColor="@color/textColor66"
                    android:textSize="12sp"
                    android:textStyle="bold"
                    android:layout_marginTop="3dp"
                    android:layout_marginBottom="17dp"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
                    app:layout_constraintEnd_toEndOf="@id/tv_waiting"
                    app:layout_constraintStart_toStartOf="@id/tv_waiting" />
            </LinearLayout>
            <View
                android:id="@+id/line3"
                android:layout_width="1dp"
                android:layout_height="30dp"
                android:background="@color/dividing_line_color"
                android:visibility="gone"
                android:layout_gravity="center"
                app:layout_constraintEnd_toStartOf="@id/tv_duration"
                app:layout_constraintStart_toEndOf="@id/tv_waiting"
                app:layout_constraintTop_toTopOf="@id/line1" />
            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:layout_marginTop="20dp"
                android:gravity="center"
                android:visibility="gone"
                android:orientation="vertical"
                android:id="@+id/ll_duration">
                <TextView
                    android:id="@+id/tv_duration"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="0分钟"
                    android:textColor="@color/red_main"
                    android:textSize="16sp"
                    android:textStyle="bold"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toEndOf="@id/line3" />

        <TextView
            android:id="@+id/tv_2"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="行驶里程"
            android:textColor="@color/textColor66"
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
            app:layout_constraintEnd_toEndOf="@id/tv_length"
            app:layout_constraintStart_toStartOf="@id/tv_length" />
                <TextView
                    android:id="@+id/tv_4"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="行驶时间"
                    android:textColor="@color/textColor66"
                    android:textSize="12sp"
                    android:textStyle="bold"
                    android:layout_marginTop="3dp"
                    android:layout_marginBottom="17dp"
                    app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
                    app:layout_constraintEnd_toEndOf="@id/tv_duration"
                    app:layout_constraintStart_toStartOf="@id/tv_duration" />
            </LinearLayout>
        </LinearLayout>

        <View
            android:id="@+id/line2"
            android:layout_width="1dp"
            android:layout_height="30dp"
            android:background="@color/dividing_line_color"
            android:visibility="gone"
            app:layout_constraintEnd_toStartOf="@id/tv_waiting"
            app:layout_constraintStart_toEndOf="@id/tv_length"
            app:layout_constraintTop_toTopOf="@id/line1" />

        <TextView
            android:id="@+id/tv_waiting"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="0分钟"
            android:textColor="@color/red_main"
            android:textSize="16sp"
            android:textStyle="bold"
            android:visibility="gone"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
            app:layout_constraintEnd_toStartOf="@id/line3"
            app:layout_constraintStart_toEndOf="@id/line2" />

        <TextView
            android:id="@+id/tv_3"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="等待时间"
            android:textColor="@color/textColor66"
            android:textSize="12sp"
            android:textStyle="bold"
            android:visibility="gone"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
            app:layout_constraintEnd_toEndOf="@id/tv_waiting"
            app:layout_constraintStart_toStartOf="@id/tv_waiting" />

        <View
            android:id="@+id/line3"
            android:layout_width="1dp"
            android:layout_height="30dp"
            android:background="@color/dividing_line_color"
            android:visibility="gone"
            app:layout_constraintEnd_toStartOf="@id/tv_duration"
            app:layout_constraintStart_toEndOf="@id/tv_waiting"
            app:layout_constraintTop_toTopOf="@id/line1" />

        <TextView
            android:id="@+id/tv_duration"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="0分钟"
            android:textColor="@color/red_main"
            android:textSize="16sp"
            android:textStyle="bold"
            android:visibility="gone"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_money"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@id/line3" />

        <TextView
            android:id="@+id/tv_4"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="行驶时间"
            android:textColor="@color/textColor66"
            android:textSize="12sp"
            android:textStyle="bold"
            android:visibility="gone"
            app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
            app:layout_constraintEnd_toEndOf="@id/tv_duration"
            app:layout_constraintStart_toStartOf="@id/tv_duration" />

        <TextView
            android:id="@+id/tv_action"
@@ -354,11 +391,10 @@
            app:layout_constraintBottom_toBottomOf="parent"
            android:background="@drawable/bg_login"
            android:gravity="center"
            android:layout_marginTop="10dp"
            android:text="接单（10）"
            android:textColor="#ffffffff"
            android:textSize="14sp"
            app:layout_constraintTop_toBottomOf="@id/tv_1" />
            app:layout_constraintTop_toBottomOf="@id/ll_info" />

        <com.fanghua.driver.utils.view.SlidingButton
            android:id="@+id/slide_btn"
@@ -366,8 +402,7 @@
            android:layout_height="45dp"
            android:layout_marginHorizontal="10dp"
            android:layout_marginBottom="10dp"
            app:layout_constraintTop_toBottomOf="@id/tv_1"
            android:layout_marginTop="10dp"
            app:layout_constraintTop_toBottomOf="@id/ll_info"
            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>