diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3837de6..f92d6ae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -126,6 +126,11 @@ android:configChanges="keyboardHidden|orientation|locale" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" /> + + @@ -447,23 +453,19 @@ - + android:process=":remote"> - + android:permission="android.permission.BIND_JOB_SERVICE"> - + android:permission="android.permission.BIND_JOB_SERVICE"> - + android:permission="android.permission.BIND_JOB_SERVICE"> + android:exported="false" + android:process=":pushcore"> @@ -498,7 +500,7 @@ + android:exported="false"> diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/CarsAdapter.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/CarsAdapter.kt index c39e524..fa6384e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/CarsAdapter.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/CarsAdapter.kt @@ -32,7 +32,7 @@ class CarsAdapter() : ) setGone(R.id.tvNotic, - !(item?.roadLicenseValidityOverdue=="1"||item?.licenseValidityOverdue=="1") + !(item?.roadLicenseValidityOverdue=="1") ) ImageLoader.getInstance() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillAdapter.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillAdapter.kt index 732e833..4478eee 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillAdapter.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillAdapter.kt @@ -42,7 +42,9 @@ class WaybillAdapter : R.id.tvRate, """交易 ${shipperTransactionVolume} 好评率 ${shipperPositiveReviewRate}""" ) - setText(R.id.tvProduct, """${vehicleLength}/${vehicleType}/""") +// setText(R.id.tvProduct, """${vehicleLength}/${vehicleType}/""") + setText(R.id.tvProduct, """${item.goodsList[0].goodItemGrossWeight}/${item.goodsList[0].goodName}""") + setText(R.id.tvProduct, """${if (item.goodsList.isNotEmpty()) item.goodsList[0].goodItemGrossWeight+"/"+ item.goodsList[0].goodName else ""}""") setText(R.id.tvModel, """${if (orderType == "0") "一装一卸" else "一装多卸"}""") setText(R.id.btnOk, OrderUtils.getInstance().getOrderStatu(orderStatus)) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt index 3eaf36a..76bc472 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt @@ -40,6 +40,9 @@ class WaybillListAdapter(var isCap: Boolean) : } else if (it.driverEvaluationStatus != "1" && (it.orderStatus == "102060" || it.orderStatus == "102070" || it.orderStatus == "102090")) { //三种状态下 并且未评论为 true显示 setGone(R.id.btnOk, false) + }else if (it.orderStatus == "103000"){ + setGone(R.id.btnOk, true) + setTextColorRes(R.id.tvStatu,R.color.color_9) } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/WebRichTextActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/WebRichTextActivity.kt new file mode 100644 index 0000000..625154b --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/WebRichTextActivity.kt @@ -0,0 +1,164 @@ +package com.arpa.hndahesudintocctmsdriver.base + +import android.os.Bundle +import android.text.TextUtils +import android.view.View +import android.webkit.WebView +import android.widget.FrameLayout +import android.widget.TextView +import com.arpa.hndahesudintocctmsdriver.databinding.ActivityWebBinding +import com.arpa.hndahesudintocctmsdriver.utils.SPUtils +import com.arpa.mylibrary.R +import com.arpa.mylibrary.base.BaseActivity +import com.just.agentweb.AgentWeb +import com.just.agentweb.AgentWebUIControllerImplBase +import com.just.agentweb.WebChromeClient + +/** + * @ClassName WebActivity + * @Author john + * @Date 2024/2/1 15:08 + * @Description TODO + */ +class WebRichTextActivity : BaseActivity() { + + var mTextRight: TextView? = null + private var mAgentWeb: AgentWeb? = null + + private var mTitle = "" + private var mUrl = "" + + override fun initView(savedInstanceState: Bundle?) { + mTitle = intent.extras?.getString("title").toString() + mUrl = intent.extras?.getString("url").toString() + + setStatusBarColor(R.color.colorWhite) + setTitleBar(mTitle) { v: View? -> if (!mAgentWeb!!.back()) finish() } + + mAgentWeb = AgentWeb.with(this) + .setAgentWebParent(binding.WebViewLayout, FrameLayout.LayoutParams(-1, -1)) + .useDefaultIndicator() + .setWebChromeClient(mWebChromeClient) + .setSecurityType(AgentWeb.SecurityType.DEFAULT_CHECK) + .setAgentWebUIController(AgentWebUIControllerImplBase()) + .createAgentWeb() + .ready() + .go(mUrl) + if (mUrl == "https://support.qq.com/products/335639") { + val userInfo = SPUtils.instance.getUserInfo(mContext) + var postData = + """nickname=${if (userInfo?.idcardName.isNullOrEmpty()) "游客" else userInfo?.idcardName}&avatar=${userInfo?.avatar}&openid=${userInfo?.contactPhone}""" + mAgentWeb?.webCreator?.webView?.postUrl(mUrl, postData.toByteArray()) + } + +// mAgentWeb?.jsInterfaceHolder?.addJavaObject("phone", AndroidInterfaceWeb()) + } + + override fun initDate() { + + } + + fun initOpinion() { + binding.run { +// val ub: UserBean? = SPUtils.instance.getUserInfo(mContext) +// wv.getSettings().setJavaScriptEnabled(true) +// wv.getSettings().setDomStorageEnabled(true) // 这个要加上 +// val openid: String = ub.getData().getUname() // 用户的openid +// val nickname: String = StringUtil.isNull(ub.getData().getRname(), "游客") // 用户的nickname +// val headimgurl: String = +// StringUtil.isNull(ub.getData().getHeadportraitUrl(), "") // 用户的头像url +// +// /* 获得 webview url，请注意url单词是product而不是products，products是旧版本的参数，用错地址将不能成功提交 */ +// val url = "https://support.qq.com/products/335639" // 把1221数字换成你的产品ID，否则会不成功 +// /* 准备post参数 */ +// val postData = +// "nickname=$nickname&avatar=$headimgurl&openid=$openid" +// wv.postUrl(url, postData.toByteArray()) +// wv.setWebChromeClient(chromeClient) +// wv.setWebViewClient(object : android.webkit.WebViewClient() { +// override fun shouldOverrideUrlLoading( +// view: WebView, +// request: WebResourceRequest +// ): Boolean { +// return super.shouldOverrideUrlLoading(view, request) +// } +// +// override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { +// //返回值是true的时候控制去WebView打开，为false调用系统浏览器或第三方浏览器 +// view.loadUrl(url) +// return true +// } +// }) + } + + } + + private val mWebChromeClient: WebChromeClient = object : WebChromeClient() { + override fun onProgressChanged(view: WebView, newProgress: Int) { + super.onProgressChanged(view, newProgress) + } + + override fun onReceivedTitle(view: WebView, title: String) { + super.onReceivedTitle(view, title) + setTitleBar( + if (TextUtils.isEmpty(mTitle)) title else mTitle + ) { if (!mAgentWeb!!.back()) finish() } + } + } + +// private val mWebViewClient: WebViewClient = object : WebViewClient() { +// override fun onPageStarted(view: WebView, url: String, favicon: Bitmap) { +// super.onPageStarted(view, url, favicon) +// } +// +// override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { +// return super.shouldOverrideUrlLoading(view, request) +// } // @Override +// // public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { +// // //该方法在Build.VERSION_CODES.LOLLIPOP以后有效 +// // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { +// // String url = request.getUrl().toString(); +// // Log.i(TAG, "shouldOverrideUrlLoading: " + url); +// // } +// // return false; +// // } +// } + + + // @OnClick({R.id.common_toolBar_text_right, R.id.common_toolBar_image_right}) + // public void onClick(View view) { + // if (view.getId() == R.id.common_toolBar_text_right) { + // } else if (view.getId() == R.id.common_toolBar_image_right) { + // } + // } + override fun onPause() { + mAgentWeb?.webLifeCycle?.onPause() + super.onPause() + } + + override fun onResume() { + mAgentWeb?.webLifeCycle?.onResume() + super.onResume() + } + + override fun onDestroy() { + mAgentWeb?.webLifeCycle?.onDestroy() + super.onDestroy() + } + + override fun onBackPressed() { +// super.onBackPressed() + if (!mAgentWeb!!.back()) finish() + } + + +// internal class AndroidInterfaceWeb { +// @JavascriptInterface +// fun gohome() { +// val intent = Intent(mContext, HomeActivity::class.java) +// intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) +// mContext.startActivity(intent) +// } +// } + +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt index 94f1ee4..1d76519 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt @@ -334,7 +334,7 @@ class AuthDrivingActivity : BaseActivity() { }) ) }else{ - DataManager.getInstance().bindCar(CarBean(carId = upDrivingInfoBean.carId)) + DataManager.getInstance().bindCar(CarBean(carId = t.data.carId)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt index aa0c855..54b065d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt @@ -172,6 +172,9 @@ class AuthTrailerActivity : BaseActivity() { approvedLoad = if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else "" } + binding.run { + etHdzzz.setText(upDrivingInfoBean.approvedLoad) + } //车长 if (it.overallDimension.contains("mm")) { @@ -206,6 +209,7 @@ class AuthTrailerActivity : BaseActivity() { if (binding.tvCarType.text.isNullOrEmpty() || binding.etCarNum.text.isNullOrEmpty() || binding.tvCarColor.text.isNullOrEmpty() || + binding.etHdzzz.text.isNullOrEmpty() || upDrivingInfoBean.licenseFaceUrl.isNullOrEmpty() || upDrivingInfoBean.licenseBackUrl.isNullOrEmpty() ) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt index e593253..200159f 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt @@ -132,6 +132,7 @@ class EditTrailerActivity : BaseActivity() { .loadRoundImage(mContext, data.licenseBackUrl, 12, ivBack) ImageLoader.getInstance() + etHdzzz.setText(data.approvedLoad) etCarNum.setText(data.vehicleNum) tvCarType.text = data.vehicleType @@ -218,6 +219,9 @@ class EditTrailerActivity : BaseActivity() { approvedLoad = if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else "" } + binding.run { + etHdzzz.setText(upDrivingInfoBean.approvedLoad) + } //车长 if (it.overallDimension.contains("mm")) { @@ -255,6 +259,7 @@ class EditTrailerActivity : BaseActivity() { if (binding.tvCarType.text.isNullOrEmpty() || binding.etCarNum.text.isNullOrEmpty() || binding.tvCarColor.text.isNullOrEmpty() || + binding.etHdzzz.text.isNullOrEmpty() || upDrivingInfoBean.licenseFaceUrl.isNullOrEmpty() || upDrivingInfoBean.licenseBackUrl.isNullOrEmpty() ) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt index 9bcb400..3cb550e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt @@ -37,6 +37,7 @@ import com.arpa.mylibrary.base.BaseFragment import com.arpa.mylibrary.callback.RefreshCallBack import com.arpa.mylibrary.net.CommonResponseBean import com.arpa.mylibrary.utils.ActivityUtils +import com.arpa.mylibrary.utils.BaseUtils import com.arpa.mylibrary.utils.ImageLoader import com.arpa.mylibrary.utils.PhoneFormatCheckUtils import com.arpa.mylibrary.utils.ToastUtils @@ -204,7 +205,8 @@ class MineFragment : BaseFragment(), View.OnClickListener, } 2 -> { - ToastUtils.showToast(mContext, plats[pos].title) + BaseUtils.callPhone(activity as AppCompatActivity?,"拨打电话","13783631930") +// ToastUtils.showToast(mContext, plats[pos].title) } 3 -> { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/ComProDetailActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/ComProDetailActivity.kt index ab651f6..b30bac2 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/ComProDetailActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/ComProDetailActivity.kt @@ -1,7 +1,12 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity +import android.graphics.Bitmap import android.os.Bundle import android.text.Html +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.FrameLayout import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig.DATA import com.arpa.hndahesudintocctmsdriver.bean.ProBean @@ -12,9 +17,13 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean import com.google.gson.Gson +import com.just.agentweb.AgentWeb +import com.just.agentweb.AgentWebUIControllerImplBase +import com.just.agentweb.WebChromeClient import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers + /** * @ClassName ComProActivity * @Author john @@ -22,10 +31,22 @@ import io.reactivex.rxjava3.schedulers.Schedulers * @Description 问题详情 */ class ComProDetailActivity : BaseActivity() { - + private var mAgentWeb: AgentWeb? = null override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("常见问题", true) + + + mAgentWeb = AgentWeb.with(this) + .setAgentWebParent(binding.WebViewLayout, FrameLayout.LayoutParams(-1, -1)) + .useDefaultIndicator() + .setWebChromeClient(mWebChromeClient) + .setSecurityType(AgentWeb.SecurityType.DEFAULT_CHECK) + .setAgentWebUIController(AgentWebUIControllerImplBase()) + .createAgentWeb() + .ready() + .go("") + } override fun initDate() { @@ -42,9 +63,24 @@ class ComProDetailActivity : BaseActivity() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) binding.run { - tvContent.text = Html.fromHtml(t.data.contentData) + mAgentWeb?.webCreator?.webView?.loadDataWithBaseURL(null,t.data.contentData,"text/html" , "utf-8", null) +// mAgentWeb?.webCreator?.webView?.postUrl(mUrl, postData.toByteArray()) } } })) } + + private val mWebChromeClient: WebChromeClient = object : WebChromeClient() { + override fun onProgressChanged(view: WebView, newProgress: Int) { + super.onProgressChanged(view, newProgress) + } + + override fun onReceivedTitle(view: WebView, title: String) { + super.onReceivedTitle(view, title) +// setTitleBar( +// if (TextUtils.isEmpty(mTitle)) title else mTitle +// ) { if (!mAgentWeb!!.back()) finish() } + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/QueDetailActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/QueDetailActivity.kt index ccb4462..5b7dc65 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/QueDetailActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/QueDetailActivity.kt @@ -2,6 +2,8 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity import android.os.Bundle import android.text.Html +import android.webkit.WebView +import android.widget.FrameLayout import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig.DATA import com.arpa.hndahesudintocctmsdriver.bean.QueDetail @@ -13,6 +15,9 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean import com.google.gson.Gson +import com.just.agentweb.AgentWeb +import com.just.agentweb.AgentWebUIControllerImplBase +import com.just.agentweb.WebChromeClient import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers @@ -23,10 +28,19 @@ import io.reactivex.rxjava3.schedulers.Schedulers * @Description 安全课堂详情 */ class QueDetailActivity : BaseActivity() { - + private var mAgentWeb: AgentWeb? = null override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("安全课堂", true) + mAgentWeb = AgentWeb.with(this) + .setAgentWebParent(binding.WebViewLayout, FrameLayout.LayoutParams(-1, -1)) + .useDefaultIndicator() + .setWebChromeClient(mWebChromeClient) + .setSecurityType(AgentWeb.SecurityType.DEFAULT_CHECK) + .setAgentWebUIController(AgentWebUIControllerImplBase()) + .createAgentWeb() + .ready() + .go("") } override fun initDate() { @@ -40,9 +54,23 @@ class QueDetailActivity : BaseActivity() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) binding.run { - tvContent.text = Html.fromHtml(t.data.contentData) +// tvContent.text = Html.fromHtml(t.data.contentData) + mAgentWeb?.webCreator?.webView?.loadDataWithBaseURL(null,t.data.contentData,"text/html" , "utf-8", null) } } })) } + + private val mWebChromeClient: WebChromeClient = object : WebChromeClient() { + override fun onProgressChanged(view: WebView, newProgress: Int) { + super.onProgressChanged(view, newProgress) + } + + override fun onReceivedTitle(view: WebView, title: String) { + super.onReceivedTitle(view, title) +// setTitleBar( +// if (TextUtils.isEmpty(mTitle)) title else mTitle +// ) { if (!mAgentWeb!!.back()) finish() } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt index 19468a6..0298ca7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt @@ -141,6 +141,7 @@ class WaybillAppraiseActivity : BaseActivity() { tvWaybillNum.text = """运单号:${orderBean.orderNum}""" tvWaybillStatu.text = OrderUtils.getInstance().getOrderStatu(orderBean.orderStatus) + btnRight.visibility = if (orderBean.orderStatus=="103000") View.GONE else View.VISIBLE tvTime.text = orderBean.receiverDeadline tvComName.text = orderBean.realCompanyName//货主 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt index 86827f6..bd7b63c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillDetailActivity.kt @@ -107,7 +107,7 @@ class WaybillDetailActivity : BaseActivity() { )} 卸货""" tvCom.text = t.data.receiverBusinessName tvUnloadDis.text = t.data.distance + "km" - tvCarType.text = """${t.data.vehicleLength} ${t.data.vehicleType}""" + tvCarType.text = """${t.data.vehicleLength}/${t.data.vehicleType}""" if (!t.data.requirement.isNullOrEmpty()) tvRemark.text = t.data.requirement if (!distance.isNullOrEmpty()) tvLoadDis.text = distance tvConsignor.text = t.data.realCompanyName diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt index 98d4fab..3f3cb8b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt @@ -160,7 +160,7 @@ class WaybillUnlLoadActivity : BaseActivity() { tvCom.text = orderBean?.receiverBusinessName//收货方 tvFreight.text = orderBean?.driverFreight.toString() - tvCarInfo.text = """${t.data.vehicleLength} ${t.data.vehicleType}""" + tvCarInfo.text = """${t.data.vehicleLength}/${t.data.vehicleType}""" tvGoods.text = goods tvReceTime.text = orderBean.waybillInfo.receivingOrderTime diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt index bc76d46..9aaa020 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt @@ -64,7 +64,7 @@ class CommonPopUtils private constructor() { .dismissOnTouchOutside(false) .asCustom( AgreementAlert( - context, "https://agreement.dahehuoyun.com/huawei/#/private", + context, "http://agreement.dahehuoyun.com/huawei/#/private", "http://agreement.dahehuoyun.com/#/user", listener ) ) diff --git a/app/src/main/res/layout/activity_auth_trailer.xml b/app/src/main/res/layout/activity_auth_trailer.xml index f90b989..1d21123 100644 --- a/app/src/main/res/layout/activity_auth_trailer.xml +++ b/app/src/main/res/layout/activity_auth_trailer.xml @@ -202,6 +202,36 @@ tools:text="王海生"> + + + + + + + - + + + + + + + android:layout_marginTop="@dimen/dp_12"> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_que_detail.xml b/app/src/main/res/layout/activity_que_detail.xml index 83b5282..b6321bb 100644 --- a/app/src/main/res/layout/activity_que_detail.xml +++ b/app/src/main/res/layout/activity_que_detail.xml @@ -7,13 +7,21 @@ - + + + + + + + + + + android:layout_marginTop="@dimen/dp_12"> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_waybill2.xml b/app/src/main/res/layout/item_waybill2.xml index 8790421..16b5d96 100644 --- a/app/src/main/res/layout/item_waybill2.xml +++ b/app/src/main/res/layout/item_waybill2.xml @@ -159,11 +159,14 @@ android:layout_height="wrap_content" android:gravity="center" android:text="20吨/螺纹钢" + android:maxLines="1" + android:ellipsize="end" + android:maxWidth="@dimen/dp_200" android:textColor="@color/color_6" android:textSize="@dimen/sp_15" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9349528..6d6b1db 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,7 @@ #EEEEEE #333333 #666666 + #999999 #cccccc #ED4C19 diff --git a/mylibrary/src/main/java/com/arpa/mylibrary/utils/BaseUtils.java b/mylibrary/src/main/java/com/arpa/mylibrary/utils/BaseUtils.java index ee3a0a4..e2e5bbf 100644 --- a/mylibrary/src/main/java/com/arpa/mylibrary/utils/BaseUtils.java +++ b/mylibrary/src/main/java/com/arpa/mylibrary/utils/BaseUtils.java @@ -99,7 +99,43 @@ public class BaseUtils { viewHolder.setOnClickListener(R.id.ok, new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(Intent.ACTION_CALL); + Intent intent = new Intent(Intent.ACTION_DIAL); + Uri data = Uri.parse("tel:" + phoneNum); + intent.setData(data); + context.startActivity(intent); + baseNiceDialog.dismiss(); + } + }); + viewHolder.setOnClickListener(R.id.cancel, new View.OnClickListener() { + @Override + public void onClick(View v) { + baseNiceDialog.dismiss(); + } + }); + } + }) + .setWidth(260).show(context.getSupportFragmentManager()); + + } + + + /** + * 拨打电话（直接拨打电话） + * @param phoneNum 电话号码 + */ + public static void callPhone(AppCompatActivity context ,String title, String phoneNum){ + + NiceDialog.init() + .setLayoutId(R.layout.dialog_phone) + .setConvertListener(new ViewConvertListener() { + @Override + protected void convertView(ViewHolder viewHolder, BaseNiceDialog baseNiceDialog) { + viewHolder.setText(R.id.message, phoneNum); + viewHolder.setText(R.id.title, title); + viewHolder.setOnClickListener(R.id.ok, new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(Intent.ACTION_DIAL); Uri data = Uri.parse("tel:" + phoneNum); intent.setData(data); context.startActivity(intent);