简化代客下单

lmw

2024-06-13 1128afd3a9e45d09d8c345d2ed901a1e585a4393

简化代客下单

 app/src/main/java/com/future/driver/bean/DriverBean.java

@@ -5,6 +5,7 @@
    public String driverContactAddress; //居住地
    public String getDriverLicenseDate; //初次领取驾驶证日期
    public String headImgUrl; //头像
    public String faceImgUrl; //人脸
    public String idCard; //身份证号码
    public String idCardImgUrl1; //身份证正面照
    public String idCardImgUrl2; //身份证背面照

 app/src/main/java/com/future/driver/bean/LineBean.java

@@ -69,6 +69,12 @@
        private int minute;
        private String name;
        private int number;
        public String startCityId;
        public String startCityName;
        public String endCityId;
        public String endCityName;
        public String endSiteName;
        public String startSiteName;

        public int getAmount() {
            return amount;

 app/src/main/java/com/future/driver/bean/UserInfoBean.java

@@ -37,6 +37,7 @@
    private int id = -1;
    private long addTime;
    private String avatar="";
    public String faceImgUrl="";
    private String nickname;
    private String brand;
    private String licensePlate;

 app/src/main/java/com/future/driver/netUtls/Api.java

 app/src/main/java/com/future/driver/ui/DialogUtil.kt

@@ -105,12 +105,12 @@
            dialog.dismiss()
        }
        view.tv_close_base.setOnClickListener {
            dialog.dismiss()
            clickClose()
            dialog.dismiss()
        }
        view.tv_sure_base.setOnClickListener {
            dialog.dismiss()
            clickSure()
            dialog.dismiss()
        }
        view.tv_view_two_base.text = content
        return dialog

 app/src/main/java/com/future/driver/ui/adapter/MineEventAdapter.kt

@@ -1,6 +1,7 @@
package com.future.driver.ui.adapter

import android.view.View
import cn.sinata.xldutils.utils.SpanBuilder
import cn.sinata.xldutils.utils.gone
import cn.sinata.xldutils.utils.visible
import com.future.driver.R
@@ -15,15 +16,10 @@
        return R.layout.item_mine_event
    }

    override fun onBindItem(holder: BaseViewHolder?, view: View?, item: EventBean.DataBean?) {
    override fun onBindItem(holder: BaseViewHolder?, view: View?, item: EventBean.DataBean) {
        holder?.let {
            if (item!!.carryOut.isEmpty()){
                it.itemView.tv_content.gone()
            }else{
                it.itemView.tv_content.visible()
            }
            it.itemView.tv_content.text =item.carryOut
            it.itemView.tv_over.text =  item.content
            it.itemView.tv_content.text = "活动${holder.layoutPosition+1}"
            it.itemView.tv_over.text =  if(item.carryOut.isEmpty()) item.content else SpanBuilder.content(item.content+"；"+item.carryOut).colorSpan(context,item.content.length+1,item.content.length+item.carryOut.length+1,R.color.main_color_orange).build()
        }
    }


 app/src/main/java/com/future/driver/ui/main/MainActivity.kt

@@ -7,6 +7,7 @@
import android.os.Looper
import android.provider.Settings
import android.util.Log
import android.view.View
import android.widget.Toast
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.utils.*
@@ -40,6 +41,7 @@
import com.tbruyelle.rxpermissions2.RxPermissions
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.app_title.*
import kotlinx.android.synthetic.main.dialog_sure_and_del.view.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
@@ -155,12 +157,19 @@
                        DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                    })
                } else if (data.data.mandatory == 1) {
                    DialogUtil.getDelAndSureDialog(this, "版本已过时，是否强制升级?", {
                        EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                    var isOk = false
                    val delAndSureDialog = DialogUtil.getDelAndSureDialog(this, "版本已过时，是否强制升级?", {
                    }, {
                        isOk = true
                        DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                        ToastUtils.showShortToast(this, "后台开始下载，请等待")
                    })
                    val view = DialogUtil.getView(delAndSureDialog)
                    view.view_hint_close_base.visibility = View.INVISIBLE
                    delAndSureDialog.setOnDismissListener {
                        if (!isOk)
                            EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                    }
                }else{
//                    toast("已经是最新版本")
                }
@@ -377,18 +386,17 @@
    private fun updateVoice(filePath: String) {
        val ossUtil = OSSUtil(this)
        ossUtil.uploadSingleWithSize(filePath, object : OSSUtil.OSSUploadCallBack() {
            override fun onFinishWithSize(url: String?, size: Long) {
            override fun onFinishWithSize(url: String, size: Long) {
                super.onFinishWithSize(url, size)
                Log.e("mmp","录音保存路径：${url},大小:${size/1024}kb")
                val mapByAny = getMapByAny()
                mapByAny["fileFormat"] = "caf"
                mapByAny["fileName"] = url.substring(url.lastIndexOf("/"))
                mapByAny["fileLink"] = url
                mapByAny["fileSize"] = size/1024
                mapByAny["orderId"] = MyApplication.recordOrderId
                mapByAny["orderType"] = MyApplication.recordOrderType
                callNet(false,Api.tape,mapByAny){

                }
                callNet(false,Api.tape,mapByAny){}
            }

            override fun onFial(message: String?) {

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

@@ -134,7 +134,7 @@
            orderSimpleData?.let {
                if (it.status == 10 || it.status == 12) {
                    Handler(Looper.getMainLooper()).post {
                        toast("用户已取消订单")
//                        toast("用户已取消订单")
                        MyApplication.getTTsManager().setVideoText("用户已取消订单")
                        MyApplication.currentOrderType = ""
                        MyApplication.currentOrderId = ""

 app/src/main/java/com/future/driver/ui/main/add_order/AddCityOrderActivity.kt

@@ -1,5 +1,6 @@
package com.future.driver.ui.main.add_order

import android.content.Intent
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import cn.sinata.xldutils.utils.clickDelay
@@ -28,6 +29,7 @@
import kotlinx.android.synthetic.main.pop_select_type_to.view.*
import org.jetbrains.anko.toast
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult


/**
@@ -207,11 +209,11 @@
        }

        ll_select_car_line.clickDelay {
            if (startCityId.isEmpty() || endCityId.isEmpty()) {
                toast("请先选择起点和终点")
                return@clickDelay
            }
            startActivity<SelectLineActivity>("endId" to endCityId, "startId" to startCityId)
//            if (startCityId.isEmpty() || endCityId.isEmpty()) {
//                toast("请先选择起点和终点")
//                return@clickDelay
//            }
            startActivityForResult<SelectLineActivity>(1,"endId" to endCityId, "startId" to startCityId)
        }

        ll_start_point.clickDelay {
@@ -447,7 +449,6 @@
                classStartTime = data.startTime
                carId = data.carId.toString()
                driverId = data.driverId.toString()
                tv_select_class.text = data.allTime
                laveSeatNumber = data.laveSeatNumber
                totalSeat = data.totalSeat
                hasPeopleNum = data.laveSeat
@@ -455,6 +456,8 @@
                tv_driver.text = data.name
                tv_car_num.text = data.carLicensePlate
                clearByType(4)
                tv_select_class.text = data.allTime
                tv_line.text = lineName
            }

            BaseEvent.SELECT_POINT_SITE_DETAIL -> {
@@ -546,5 +549,18 @@

    }


    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
        if (data != null){
            startCityId = data.getStringExtra("startCityId")?:""
            startCityName = data.getStringExtra("startCity")?:""
            startSiteName = data.getStringExtra("startSite")?:""
            endCityId = data.getStringExtra("endCityId")?:""
            endCityName = data.getStringExtra("endCity")?:""
            endSiteName = data.getStringExtra("endSite")?:""
            lineId = data.getStringExtra("id")?:""
            lineName = data.getStringExtra("name")?:""
            startActivity<SelectClassActivity>("lineId" to lineId, "startCityName" to startSiteName, "endCityName" to endSiteName)
        }
    }
}

 app/src/main/java/com/future/driver/ui/main/add_order/SelectLineActivity.kt

@@ -1,5 +1,6 @@
package com.future.driver.ui.main.add_order

import android.content.Intent
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
@@ -45,8 +46,8 @@
    override fun mapObject(): HashMap<String?, Any?>? {
        var map = getMapByAny()
        map["driverId"] = getUserId()
        map["endId"] = endId
        map["startId"] = startId
//        map["endId"] = endId
//        map["startId"] = startId
        return map
    }

@@ -59,8 +60,13 @@
    }

    override fun setOnItemClickListener(view: View?, position: Int) {
        EventBus.getDefault().post(BaseEvent(BaseEvent.SELECT_LINE_SITE,selectLineAdapter.data[position].id.toString(),selectLineAdapter.data[position].name))
        onBackPressed()
        val itemData = selectLineAdapter.data[position]
        val intent = Intent()
        intent.putExtra("id",itemData.id.toString()).putExtra("name",itemData.name)
            .putExtra("startCity",itemData.startCityName).putExtra("startCityId",itemData.startCityId).putExtra("startSite",itemData.startSiteName)
            .putExtra("endCity",itemData.endCityName).putExtra("endCityId",itemData.endCityId).putExtra("endSite",itemData.endSiteName)
        setResult(RESULT_OK,intent)
        finish()
    }



 app/src/main/java/com/future/driver/ui/mine/LineClassManagerDetActivity.kt

@@ -1,6 +1,7 @@
package com.future.driver.ui.mine

import android.view.View
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import cn.sinata.xldutils.utils.textColor
@@ -70,7 +71,7 @@
        setTitleText("线路班次管理")
        var view = createView(R.layout.view_line_class,this)
        addTopView(view)
        view.recycler_view_top.layoutManager = LinearLayoutManager(this,LinearLayoutManager.HORIZONTAL,false)
        view.recycler_view_top.layoutManager = GridLayoutManager(this,3)
        view.recycler_view_top.adapter = timeSelectAdapter
        timeSelectAdapter.data.addAll(timeSelectAdapter.getAllDate(Calendar.getInstance()))
        timeSelectAdapter.setOnItemClickListener { view, position ->

 app/src/main/java/com/future/driver/ui/mine/QrCodeActivity.kt

@@ -32,15 +32,15 @@

    override fun initView() {
        setTitleText("二维码")
        tv_Right.text = "分享二维码"
//        tv_Right.text = "分享二维码"
        var bit = QRCodeUtil.createQRCodeBitmap("driverId:"+CacheKey.getUserId(), dp2px(220f), dp2px(220f))
        iv_qr_code.setImageBitmap(bit)
    }

    override fun setOnclick() {
        tv_Right.setOnClickListener {
            showShareDialog()
        }
//        tv_Right.setOnClickListener {
//            showShareDialog()
//        }

        iv_qr_code.setOnLongClickListener {
            try {

 app/src/main/java/com/future/driver/ui/mine/setting/SettingActivity.kt

@@ -1,5 +1,6 @@
package com.future.driver.ui.mine.setting

import android.view.View
import cn.sinata.xldutils.utils.Utils
import com.kuaiyun.emanagercar.ui.base.BaseWebActivity
import com.future.driver.R
@@ -19,6 +20,7 @@
import com.tencent.mm.opensdk.modelbase.BaseResp
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler
import kotlinx.android.synthetic.main.activity_setting.*
import kotlinx.android.synthetic.main.dialog_sure_and_del.view.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.toast

@@ -111,12 +113,19 @@
                        DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                    })
                } else if (data.data.mandatory == 1) {
                    DialogUtil.getDelAndSureDialog(this, "版本已过时，是否强制升级?", {
                        EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                    var isOk = false
                    val delAndSureDialog = DialogUtil.getDelAndSureDialog(this, "版本已过时，是否强制升级?", {
                    }, {
                        isOk = true
                        DownloadUtil(this).downloadAPK(data.data.url, "未来出行司机端")
                        ToastUtils.showShortToast(this, "后台开始下载，请等待")
                    })
                    val view = DialogUtil.getView(delAndSureDialog)
                    view.view_hint_close_base.visibility = View.INVISIBLE
                    delAndSureDialog.setOnDismissListener {
                        if (!isOk)
                            EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                    }
                }else{
//                    toast("已经是最新版本")
                }

 app/src/main/java/com/future/driver/ui/pub/BecomeDriverActivity.kt

@@ -104,7 +104,12 @@
            selectPhone = 2
            MyUtils.getInstans().hideKeyboard(ll_driver_two)
            showSelectPhone()
        }

        iv_face.setOnClickListener {
            selectPhone = 6
            MyUtils.getInstans().hideKeyboard(ll_driver_two)
            showSelectPhone()
        }

        iv_driver_img.setOnClickListener {
@@ -388,6 +393,7 @@
                return@let
            }
            upBean.headImgUrl = it.avatar
            upBean.faceImgUrl = it.faceImgUrl
            upBean.name = it.name
            upBean.driveCardImgUrl = it.driveCardImgUrl
            upBean.driverContactAddress = it.driverContactAddress_.replace(",","")
@@ -472,6 +478,11 @@
            currentNum--
            return
        }
        if (upBean.faceImgUrl.isNullOrEmpty()) {
            toast("请上传人脸照片")
            currentNum--
            return
        }
        if (rl_net_img.visibility == View.VISIBLE &&  upBean.networkCarlssueImg.isNullOrEmpty()) {
            toast("请上传网约车资格证照片")
            currentNum--
@@ -512,6 +523,7 @@
        map["driverContactAddress_"] = upBean.driverContactAddress_
        map["getDriverLicenseDate"] = upBean.getDriverLicenseDate
        map["headImgUrl"] = upBean.headImgUrl
        map["faceImgUrl"] = upBean.faceImgUrl
        map["idCard"] = upBean.idCard
        map["placeOfPractice"] = upBean.placeOfPractice
        map["idCardImgUrl1"] = upBean.idCardImgUrl1
@@ -585,6 +597,10 @@
                upBean.headImgUrl = url
                GlideUtil.load(this, url, iv_head, 1)
            }
            6 -> {
                upBean.faceImgUrl = url
                GlideUtil.load(this, url, iv_face, 1)
            }
            3 -> {
                upBean.driveCardImgUrl = url
                GlideUtil.load(this, url, iv_driver_img, 1)

 app/src/main/java/com/future/driver/ui/to_city/TripCityActivity.kt

@@ -31,8 +31,6 @@
import com.future.driver.ui.DialogUtil
import com.future.driver.ui.adapter.CityOverMoneyAdapter
import com.future.driver.ui.adapter.TripItemAdapter
import com.future.driver.ui.main.FillOutActivity
import com.future.driver.ui.main.OrderOverActivity
import com.future.driver.utils.DateUtil
import com.future.driver.utils.MyUtils
import com.google.gson.Gson
@@ -317,6 +315,9 @@
     * 全部完成 走流程
     */
    private fun allOver() {
        MyApplication.currentOrderType = ""
        MyApplication.currentOrderId = ""
        EventBus.getDefault().post(BaseEvent(BaseEvent.FINISH_RECORD))
        if (tripItemAdapter.data.size == 0) {
            toast("订单已取消")
            onBackPressed()
@@ -333,7 +334,6 @@
            iv_move.gone()
            iv_to_gd.gone()
            cl_over_view.visible()
            EventBus.getDefault().post(BaseEvent(BaseEvent.FINISH_RECORD))
            recycler_view_money.layoutManager = LinearLayoutManager(this)
            recycler_view_money.adapter = overAdapter
            orderBean?.let {
@@ -419,59 +419,6 @@
        }
    }


    private fun showMoneyTypeDialog() {
        var pop = DialogUtil.getPopupwindow(this, R.layout.dialog_select_pay_type)
        var payType = 1 //支付方式（1=快运平台收款，2=其他方式收款）
        pop.showDown(window.decorView)
        pop.contentView.tv_cancel.setOnClickListener {
            pop.dismiss()
        }
        pop.contentView.tv_ok.setOnClickListener {
            pop.dismiss()
            if (payType == 1) {
                callStatue(6,{
                    startActivity<FillOutActivity>("orderId" to orderId, "orderType" to orderType)
                    finish()
                }) {

                }
            } else {
                DialogUtil.getDelAndSureDialog(this, "请确定是否收款？", {}, {
                    pop.dismiss()
                    val map = getMapByAny()
                    map["orderId"] = orderId
                    map["orderType"] = orderType
                    map["type"] = payType
                    callStatue(6,{
                        callNet(Api.confirmFees, map) {
                            finish()
                            startActivity<OrderOverActivity>(
                                "orderId" to orderId,
                                "orderType" to orderType
                            )
                        }
                    }) {

                    }
                })
            }
        }
        pop.contentView.tv_select_ok.setOnClickListener {
            pop.contentView.tv_select_ok.alpha = 1f
            pop.contentView.tv_select_ok.textSize = 16f
            pop.contentView.tv_select_or.alpha = 0.6f
            pop.contentView.tv_select_or.textSize = 14f
            payType = 1
        }
        pop.contentView.tv_select_or.setOnClickListener {
            pop.contentView.tv_select_ok.alpha = 0.6f
            pop.contentView.tv_select_ok.textSize = 14f
            pop.contentView.tv_select_or.alpha = 1f
            pop.contentView.tv_select_or.textSize = 16f
            payType = 2
        }
    }


    /***

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

@@ -22,6 +22,7 @@
                android:layout_width="match_parent"
                android:layout_height="50dp"
                android:paddingStart="14dp"
                android:visibility="gone"
                android:paddingEnd="14dp"
                android:gravity="center_vertical"
                android:orientation="horizontal">
@@ -57,12 +58,14 @@

            </LinearLayout>

            <include layout="@layout/include_line_14"/>
            <include layout="@layout/include_line_14"
                android:visibility="gone"/>

            <LinearLayout
                android:id="@+id/ll_select_city_end"
                android:layout_width="match_parent"
                android:layout_height="50dp"
                android:visibility="gone"
                android:paddingStart="14dp"
                android:paddingEnd="14dp"
                android:gravity="center_vertical"
@@ -98,7 +101,8 @@

            </LinearLayout>

            <include layout="@layout/include_line_14"/>
            <include layout="@layout/include_line_14"
                android:visibility="gone"/>

            <LinearLayout
                android:id="@+id/ll_select_car_line"
@@ -147,6 +151,7 @@
                android:layout_width="match_parent"
                android:layout_height="50dp"
                android:paddingStart="14dp"
                android:visibility="gone"
                android:paddingEnd="14dp"
                android:gravity="center_vertical"
                android:orientation="horizontal">
@@ -181,7 +186,8 @@

            </LinearLayout>

            <include layout="@layout/include_line_14"/>
            <include layout="@layout/include_line_14"
                android:visibility="gone"/>




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

@@ -303,6 +303,7 @@
            android:id="@+id/rl_put_friend"
            android:layout_width="0dp"
            android:layout_weight="1"
            android:visibility="gone"
            android:gravity="center"
            android:layout_height="wrap_content">

@@ -317,6 +318,7 @@
                android:textSize="12sp" />

        </RelativeLayout>

        <RelativeLayout
            android:id="@+id/rl_call_server"
            android:layout_width="0dp"
@@ -336,14 +338,6 @@

        </RelativeLayout>

    </LinearLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/ll1"
        android:layout_marginTop="26dp"
        >
        <RelativeLayout
            android:id="@+id/ll_qr"
            android:layout_width="0dp"
@@ -362,6 +356,33 @@
                android:textSize="12sp" />

        </RelativeLayout>

    </LinearLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/ll1"
        android:layout_marginTop="26dp"
        >
<!--        <RelativeLayout-->
<!--            android:id="@+id/ll_qr"-->
<!--            android:layout_width="0dp"-->
<!--            android:layout_weight="1"-->
<!--            android:gravity="center"-->
<!--            android:layout_height="wrap_content">-->

<!--            <TextView-->
<!--                android:layout_width="wrap_content"-->
<!--                android:layout_height="wrap_content"-->
<!--                android:drawablePadding="8dp"-->
<!--                android:gravity="center"-->
<!--                android:drawableTop="@mipmap/icon_me_code"-->
<!--                android:text="二维码"-->
<!--                android:textColor="@color/textColor66"-->
<!--                android:textSize="12sp" />-->

<!--        </RelativeLayout>-->
        <RelativeLayout
            android:id="@+id/rl_setting"
            android:layout_width="0dp"
@@ -382,7 +403,7 @@
        </RelativeLayout>
        <RelativeLayout
            android:layout_width="0dp"
            android:layout_weight="2"
            android:layout_weight="3"
            android:gravity="center"
            android:layout_height="wrap_content">


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

@@ -406,6 +406,46 @@

    </RelativeLayout>

    <include layout="@layout/include_line"/>


    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="70dp">

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="9dp"
            android:text="人脸识别照片"
            android:textColor="#ff333333"
            android:textSize="14sp" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentBottom="true"
            android:layout_marginBottom="9dp"
            android:text="本人人脸照片，头像完整，五官清晰可见"
            android:textColor="#ffb0b0b0"
            android:textSize="14sp" />

        <ImageView
            android:id="@+id/iv_face"
            android:layout_width="70dp"
            android:layout_height="51dp"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:src="@mipmap/photo_update" />

        <include
            layout="@layout/include_line"
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_alignParentBottom="true" />

    </RelativeLayout>

    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="70dp">

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

@@ -22,6 +22,7 @@
            android:layout_height="wrap_content"
            android:text="今日8：00-18：00累计接单20单奖励20元；12/20"
            android:textColor="#ff333333"
            android:textStyle="bold"
            android:textSize="14sp"
            />


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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="100dp"
    android:orientation="vertical"
<RelativeLayout
    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
    android:orientation="horizontal"
    android:layout_height="match_parent">

    <TextView
@@ -16,4 +16,10 @@
        android:textSize="12sp"
        />

</LinearLayout>
    <View
        android:layout_width="1px"
        android:layout_height="match_parent"
        android:layout_alignParentEnd="true"
        android:background="@color/dividing_line_color"/>

</RelativeLayout>

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

@@ -48,9 +48,6 @@
            android:padding="5dp"
            android:textColor="@color/black"
            android:textSize="@dimen/textSize" />



        <Button
            android:id="@+id/btn_album"
            android:layout_width="fill_parent"
@@ -58,6 +55,7 @@
            android:background="@null"
            android:padding="5dp"
            android:text="微信支付"
            android:visibility="gone"
            android:textColor="@color/black"
            android:textSize="@dimen/textSize" />