From 8e75ff791232fd6655440c252d500e9d7f1fbb37 Mon Sep 17 00:00:00 2001 From: leiyun Date: Wed, 19 Oct 2022 15:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 9 ++- .../main/java/com/yzx/escreen/MainActivity.kt | 2 +- .../yzx/escreen/adapter/VisitorListAdapter.kt | 50 +++++++++++---- .../java/com/yzx/escreen/config/Config.kt | 1 + .../com/yzx/escreen/config/YzxInterface.kt | 2 + .../com/yzx/escreen/fragment/MyFragment.kt | 10 ++- .../yzx/escreen/fragment/VisitorFragment.kt | 42 ++++++++++--- .../main/java/com/yzx/escreen/model/QrCode.kt | 8 +++ .../java/com/yzx/escreen/model/Visitor.kt | 1 + .../yzx/escreen/presenter/VisitorPresenter.kt | 62 +++++++++++++++++- .../escreen/presenter/base/JsonCallBack.java | 13 ++-- .../java/com/yzx/escreen/utils/Monitor.kt | 5 +- .../com/yzx/escreen/widget/VisitorDialog.kt | 63 ++++++++++++++----- app/src/main/res/layout/dialog_visitor.xml | 19 ++++++ app/src/main/res/layout/fragment_visitor.xml | 10 +++ .../main/res/layout/layout_visitor_table.xml | 25 +++++++- 16 files changed, 262 insertions(+), 60 deletions(-) create mode 100644 app/src/main/java/com/yzx/escreen/model/QrCode.kt diff --git a/app/build.gradle b/app/build.gradle index cd6adfd..289f956 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 14 - versionName "2.1.0" + versionCode 16 + versionName "2.1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // ndk { @@ -71,6 +71,7 @@ android { buildConfigField "String", "M_URL", '"https://m.qbjjyyun.net"' buildConfigField "String", "OA_URL", '"https://oa.qbjjyyun.net"' buildConfigField "String", "APP_NAME", '"一体化平台"' + buildConfigField "String", "MP_APPID", '"wx358f1c471740cb95"' // buildConfigField "String", "BASE_URL", '"http://192.168.69.99:9009"' // buildConfigField "String", "M_URL", '"http://192.168.69.99:8098"' @@ -91,7 +92,8 @@ android { // buildConfigField "String", "OA_URL", '"http://192.168.69.114:3000"' buildConfigField "String", "M_URL", '"https://m.live.educlouddata.com/"' buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' - buildConfigField "String", "APP_NAME", '"家校互通（开发）"' + buildConfigField "String", "APP_NAME", '"一体化平台（开发）"' + buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' } yzx_test { @@ -104,6 +106,7 @@ android { buildConfigField "String", "BASE_URL", '"http://192.168.69.99:9009"' buildConfigField "String", "M_URL", '"http://192.168.69.99:8098"' buildConfigField "String", "APP_NAME", '"家校互通（测试）"' + buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' } applicationVariants.all { variant -> diff --git a/app/src/main/java/com/yzx/escreen/MainActivity.kt b/app/src/main/java/com/yzx/escreen/MainActivity.kt index abac12d..57bc8c0 100644 --- a/app/src/main/java/com/yzx/escreen/MainActivity.kt +++ b/app/src/main/java/com/yzx/escreen/MainActivity.kt @@ -239,7 +239,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus dialogList.add(dialog) } - //接收访客消息 + //接收查看图片消息 @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(detail: ViewImage) { removeOld(detail.id,3) diff --git a/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt b/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt index 547a47c..f222c64 100644 --- a/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt +++ b/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt @@ -22,21 +22,49 @@ class VisitorListAdapter(list: MutableList) : @SuppressLint("SetTextI18n") override fun convert(holder: BaseViewHolder, item: Visitor) { holder.itemView.userName.text = item.user_name - if (item.face_key.isNullOrBlank()) { - holder.itemView.faceEmpty.visibility = View.VISIBLE - holder.itemView.faceImg.visibility = View.GONE - } else { + if (item.face_key.isNotEmpty()) { holder.itemView.faceImg.visibility = View.VISIBLE holder.itemView.faceEmpty.visibility = View.GONE holder.itemView.faceImg.setSrc(item.face_identity, item.face_key) - } - if (item.health_code_key.isNullOrBlank()) { - holder.itemView.healthCodeEmpty.visibility = View.VISIBLE - holder.itemView.healthCodeImg.visibility = View.GONE } else { - holder.itemView.healthCodeImg.visibility = View.VISIBLE - holder.itemView.healthCodeEmpty.visibility = View.GONE - holder.itemView.healthCodeImg.setSrc(item.health_code_identity, item.health_code_key) + holder.itemView.faceEmpty.visibility = View.VISIBLE + holder.itemView.faceImg.visibility = View.GONE + } + when { + item.health_code_status >= 0 -> { + holder.itemView.healthCodeStatusLayout.visibility = View.VISIBLE + holder.itemView.healthCodeImg.visibility = View.GONE + holder.itemView.healthCodeEmpty.visibility = View.GONE + when (item.health_code_status) { + 0 -> { + holder.itemView.healthCodeStatus.text = "状态：绿码" + holder.itemView.healthCodeStatus.textColor = Color.parseColor("#5DAD64") + } + 1 -> { + holder.itemView.healthCodeStatus.text = "状态：黄码" + holder.itemView.healthCodeStatus.textColor = Color.parseColor("#FCCF13") + } + 10 -> { + holder.itemView.healthCodeStatus.text = "状态：红码" + holder.itemView.healthCodeStatus.textColor = Color.parseColor("#FC0416") + } + } + } + item.health_code_key.isNotEmpty() -> { + holder.itemView.healthCodeStatusLayout.visibility = View.GONE + holder.itemView.healthCodeImg.visibility = View.VISIBLE + holder.itemView.healthCodeEmpty.visibility = View.GONE + holder.itemView.healthCodeImg.setSrc( + item.health_code_identity, + item.health_code_key + ) + + } + else -> { + holder.itemView.healthCodeStatusLayout.visibility = View.GONE + holder.itemView.healthCodeEmpty.visibility = View.VISIBLE + holder.itemView.healthCodeImg.visibility = View.GONE + } } if (item.trip_code_key.isNullOrBlank()) { holder.itemView.tripCodeEmpty.visibility = View.VISIBLE diff --git a/app/src/main/java/com/yzx/escreen/config/Config.kt b/app/src/main/java/com/yzx/escreen/config/Config.kt index 01a2308..7f0ae2c 100644 --- a/app/src/main/java/com/yzx/escreen/config/Config.kt +++ b/app/src/main/java/com/yzx/escreen/config/Config.kt @@ -8,6 +8,7 @@ object Config { var APP_NAME = BuildConfig.APP_NAME var M_URL = BuildConfig.M_URL var OA_URL = BuildConfig.OA_URL + var MP_APPID = BuildConfig.MP_APPID val APP_ID = 602 diff --git a/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt b/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt index 9f0f12c..e32d953 100644 --- a/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt +++ b/app/src/main/java/com/yzx/escreen/config/YzxInterface.kt @@ -5,6 +5,8 @@ object YzxInterface { const val FILE_UPLOAD_URL = "https://fileupload.oa.qbjjyyun.net/edufile/fileUpload" const val INTERFACE_REFRESH_TOKEN = "/login/user2/refreshToken"// 刷新token + const val INTERFACE_GET_ACCESS_TOKEN= "/rights/weixin/getAccessTokenByAppId" // 通过app_id获取access_token + const val INTERFACE_GET_MINI_CODE= "/parent/mini/getMiniCode" // 获取小程序二维码 /** * 学生请假 diff --git a/app/src/main/java/com/yzx/escreen/fragment/MyFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/MyFragment.kt index 7f46e38..5a5e1ca 100644 --- a/app/src/main/java/com/yzx/escreen/fragment/MyFragment.kt +++ b/app/src/main/java/com/yzx/escreen/fragment/MyFragment.kt @@ -16,9 +16,7 @@ import com.yzx.escreen.model.User import com.yzx.escreen.presenter.MyPresenter import com.yzx.escreen.presenter.MyView import com.yzx.escreen.utils.hideNavigationBar -import kotlinx.android.synthetic.main.fragment_change.* import kotlinx.android.synthetic.main.fragment_my.* -import kotlinx.android.synthetic.main.fragment_my.timeView import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -119,10 +117,10 @@ class MyFragment : BaseFragment(), MyView { override fun initPresenter(): MyPresenter = MyPresenter(this) override fun onUserInfoSuccess(info: TeacherInfo) { userName.text = info.teacher_name - sex.text = if (info.sex == 1) { - "男" - } else { - "女" + sex.text = when (info.sex) { + 1 -> "男" + 2 -> "女" + else -> "--" } phone.text = info.phone idCard.text = info.card_no diff --git a/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt index 70a811f..98d8a0b 100644 --- a/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt +++ b/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt @@ -56,6 +56,7 @@ class VisitorFragment : BaseFragment(), VisitorView, private val mShowList = mutableListOf() private val mShowDialogList = mutableListOf() private var isRefresh = false + private var mQrCode: QrCode? = null private val refreshRun = Runnable { refreshData() @@ -72,11 +73,11 @@ class VisitorFragment : BaseFragment(), VisitorView, preTxtBtn.setOnClickListener { pre() } nextTxtBtn.setOnClickListener { next() } - allBtn.setOnClickListener { changeStatus(10,0) } - status1Btn.setOnClickListener { changeStatus(0,1) } - status2Btn.setOnClickListener { changeStatus(1,2) } - status3Btn.setOnClickListener { changeStatus(2,3) } - status4Btn.setOnClickListener { changeStatus(-1,4) } + allBtn.setOnClickListener { changeStatus(10, 0) } + status1Btn.setOnClickListener { changeStatus(0, 1) } + status2Btn.setOnClickListener { changeStatus(1, 2) } + status3Btn.setOnClickListener { changeStatus(2, 3) } + status4Btn.setOnClickListener { changeStatus(-1, 4) } statusBtnList.add(allBtn) statusBtnList.add(status1Btn) statusBtnList.add(status2Btn) @@ -101,7 +102,7 @@ class VisitorFragment : BaseFragment(), VisitorView, var lastClickTime = TimeUtils.getNowMills() mAdapter.setOnItemClickListener { adapter, view, position -> val curr = TimeUtils.getNowMills() - if(curr - lastClickTime > 500){ + if (curr - lastClickTime > 500) { lastClickTime = curr mPresenter?.getDetail(mAdapter.getItem(position).id) } @@ -155,6 +156,19 @@ class VisitorFragment : BaseFragment(), VisitorView, filterLayout.setOnClickListener { KeyboardUtils.hideSoftInput(keywordInput) } + codeBtn.setOnClickListener { + showVisitorQRCode() + } + } + + private fun showVisitorQRCode() { + if (mQrCode != null) { + mQrCode?.apply { + EventBus.getDefault().post(ViewImage(1, identity, key)) + } + } else { + mPresenter?.getQrcodeWithAccessToken() + } } @@ -185,7 +199,7 @@ class VisitorFragment : BaseFragment(), VisitorView, } } - private fun changeStatus(status: Int,index:Int) { + private fun changeStatus(status: Int, index: Int) { KeyboardUtils.hideSoftInput(keywordInput) if (isLoading) { return @@ -272,7 +286,7 @@ class VisitorFragment : BaseFragment(), VisitorView, @SuppressLint("SetTextI18n") override fun onListSuccess(list: MutableList, pager: Pager) { pageTv?.apply { - if(isRefresh){ + if (isRefresh) { toast("刷新成功！") isRefresh = false } @@ -316,7 +330,7 @@ class VisitorFragment : BaseFragment(), VisitorView, override fun onListError(error: String) { isLoading = false - if(isRefresh){ + if (isRefresh) { toast("刷新失败，请重试！") isRefresh = false } @@ -376,6 +390,16 @@ class VisitorFragment : BaseFragment(), VisitorView, } + override fun onQrCodeSuccess(qrCode: QrCode) { + LogUtils.d(qrCode) + mQrCode = qrCode + EventBus.getDefault().post(ViewImage(1, qrCode.identity, qrCode.key)) + } + + override fun onQrCodeError(error: String) { + toast("二维码获取失败，请重试！") + } + //接收消息 @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(event: MessageEventAuto) { diff --git a/app/src/main/java/com/yzx/escreen/model/QrCode.kt b/app/src/main/java/com/yzx/escreen/model/QrCode.kt new file mode 100644 index 0000000..40ce2fb --- /dev/null +++ b/app/src/main/java/com/yzx/escreen/model/QrCode.kt @@ -0,0 +1,8 @@ +package com.yzx.escreen.model +data class QrCode( + val identity: String = "", + val key: String = "" +) +data class AccessToken( + val access_token: String = "" +) \ No newline at end of file diff --git a/app/src/main/java/com/yzx/escreen/model/Visitor.kt b/app/src/main/java/com/yzx/escreen/model/Visitor.kt index f147792..6ae7584 100644 --- a/app/src/main/java/com/yzx/escreen/model/Visitor.kt +++ b/app/src/main/java/com/yzx/escreen/model/Visitor.kt @@ -12,6 +12,7 @@ data class Visitor( val face_key: String = "", val health_code_identity: String = "", val health_code_key: String = "", + val health_code_status: Int = -1, val history_num: Int = 0, val id: Int = 0, val in_out_num: Int = 0, diff --git a/app/src/main/java/com/yzx/escreen/presenter/VisitorPresenter.kt b/app/src/main/java/com/yzx/escreen/presenter/VisitorPresenter.kt index 2c07312..5db8a97 100644 --- a/app/src/main/java/com/yzx/escreen/presenter/VisitorPresenter.kt +++ b/app/src/main/java/com/yzx/escreen/presenter/VisitorPresenter.kt @@ -5,9 +5,7 @@ import com.lzy.okgo.OkGo import com.lzy.okgo.model.Response import com.yzx.escreen.config.Config import com.yzx.escreen.config.YzxInterface -import com.yzx.escreen.model.Pager -import com.yzx.escreen.model.User -import com.yzx.escreen.model.Visitor +import com.yzx.escreen.model.* import com.yzx.escreen.presenter.base.BasePresenter import com.yzx.escreen.presenter.base.IView import com.yzx.escreen.presenter.base.JsonCallBack @@ -72,6 +70,62 @@ class VisitorPresenter(view: VisitorView) : BasePresenter(view) { }) } + + fun getQrcodeWithAccessToken(){ + if(User.getUser().token.isEmpty()){ + return + } + val url = "${Config.BASE_URL}${YzxInterface.INTERFACE_GET_ACCESS_TOKEN}" + OkGo.post>(url) + .tag(this) + .params("app_id", Config.MP_APPID) + .execute(object : JsonCallBack>() { + + + override fun onSuccess(response: Response>?) { + LogUtils.d(response) + if (response?.isSuccessful == true) { + getQrCode(response.body().data.access_token) + } + } + + override fun onError(response: Response>?) { + super.onError(response) + LogUtils.d(response) + mView?.onQrCodeError(response?.body()?.msg ?: "") + } + }) + } + + fun getQrCode(accessToken:String){ + if(User.getUser().token.isEmpty()){ + return + } + val url = "${Config.BASE_URL}${YzxInterface.INTERFACE_GET_MINI_CODE}" + val unitId = User.getUser().school_id + OkGo.post>(url) + .tag(this) + .params("page_url", "pages/accesscontrol/apply/index") + .params("scene", "_${unitId}") + .params("access_token", accessToken) + .execute(object : JsonCallBack>() { + + + override fun onSuccess(response: Response>?) { + LogUtils.d(response) + if (response?.isSuccessful == true) { + mView?.onQrCodeSuccess(response.body().data) + } + } + + override fun onError(response: Response>?) { + super.onError(response) + LogUtils.d(response) + mView?.onQrCodeError(response?.body()?.msg ?: "") + } + }) + } + } @@ -81,4 +135,6 @@ interface VisitorView : IView { fun onListError(error: String) fun onDetailSuccess(detail: Visitor) fun onDetailError(error: String) + fun onQrCodeSuccess(qrCode: QrCode) + fun onQrCodeError(error: String) } \ No newline at end of file diff --git a/app/src/main/java/com/yzx/escreen/presenter/base/JsonCallBack.java b/app/src/main/java/com/yzx/escreen/presenter/base/JsonCallBack.java index f0b93bb..1d55fe5 100644 --- a/app/src/main/java/com/yzx/escreen/presenter/base/JsonCallBack.java +++ b/app/src/main/java/com/yzx/escreen/presenter/base/JsonCallBack.java @@ -3,7 +3,6 @@ package com.yzx.escreen.presenter.base; import android.content.Intent; import com.blankj.utilcode.util.ActivityUtils; -import com.blankj.utilcode.util.AppUtils; import com.blankj.utilcode.util.LogUtils; import com.google.gson.stream.JsonReader; import com.lzy.okgo.callback.AbsCallback; @@ -17,7 +16,6 @@ import com.yzx.escreen.config.RefreshToken; import com.yzx.escreen.model.User; import com.yzx.escreen.utils.Monitor; - import org.json.JSONArray; import org.json.JSONObject; @@ -183,7 +181,14 @@ public abstract class JsonCallBack extends AbsCallback { @Override public void onError(com.lzy.okgo.model.Response response) { super.onError(response); - sb.append("异常信息：").append(response.getException().getMessage()); - Monitor.INSTANCE.postNetError(sb); + String msg = response.getException().getMessage(); + if(msg==null){ + msg = ""; + } + //登录相关信息不上报 + if(!msg.contains("错误代码：406") && !msg.contains("token信息不存在！")){ + sb.append("异常信息：").append(msg); + Monitor.INSTANCE.postNetError(sb); + } } } diff --git a/app/src/main/java/com/yzx/escreen/utils/Monitor.kt b/app/src/main/java/com/yzx/escreen/utils/Monitor.kt index deba011..087fcb7 100644 --- a/app/src/main/java/com/yzx/escreen/utils/Monitor.kt +++ b/app/src/main/java/com/yzx/escreen/utils/Monitor.kt @@ -10,7 +10,6 @@ import com.lzy.okgo.callback.StringCallback import com.lzy.okgo.model.HttpHeaders import com.lzy.okgo.model.Response import com.yzx.escreen.model.User -import java.lang.StringBuilder import java.text.SimpleDateFormat import java.util.* @@ -82,7 +81,7 @@ object Monitor { fun postNetError(errorInfo:StringBuilder){ val stringBuffer = StringBuffer() - stringBuffer.append("墨水屏接口上报:").append("\n") + stringBuffer.append("电子屏异常上报:").append("\n") stringBuffer.append("异常类型：").append("接口异常").append("\n") stringBuffer.append("系统信息：").append(AppUtils.getAppInfo().versionName).append("\n") val user = User.getUser() @@ -124,7 +123,7 @@ object Monitor { class MonitorInfo( val msgtype: String = "text", - val text: MonitorText = MonitorText("墨水屏异常上报") + val text: MonitorText = MonitorText("电子屏异常上报") ) class MonitorText(val content: String = "") diff --git a/app/src/main/java/com/yzx/escreen/widget/VisitorDialog.kt b/app/src/main/java/com/yzx/escreen/widget/VisitorDialog.kt index d26f9ed..c24aac0 100644 --- a/app/src/main/java/com/yzx/escreen/widget/VisitorDialog.kt +++ b/app/src/main/java/com/yzx/escreen/widget/VisitorDialog.kt @@ -19,6 +19,7 @@ import com.yzx.escreen.model.Visitor import com.yzx.escreen.utils.setSrc import com.yzx.escreen.utils.toDay import com.yzx.escreen.utils.toTime +import kotlinx.android.synthetic.main.dialog_visitor.view.* import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.find import org.jetbrains.anko.textColor @@ -37,7 +38,7 @@ class VisitorDialog( val adapter: VisitorDialogStepAdapter by lazy { VisitorDialogStepAdapter(mutableListOf()) } - var onCloseClick: (view:View) -> Unit = {} + var onCloseClick: (view: View) -> Unit = {} init { val view = LayoutInflater.from(context).inflate(R.layout.dialog_visitor, null) @@ -50,7 +51,7 @@ class VisitorDialog( view.layoutParams = layoutParams addView(view) background = ContextCompat.getDrawable(context, R.color.dialog_bg) - setOnClickListener { } //阻止事件冒泡 + setOnClickListener { } //阻止事件冒泡 } @SuppressLint("SetTextI18n") @@ -68,19 +69,44 @@ class VisitorDialog( find(R.id.face_img).visibility = View.GONE } find(R.id.face_img).setOnClickListener { - EventBus.getDefault().post(ViewImage(detail.id,detail.face_identity,detail.face_key)) + EventBus.getDefault().post(ViewImage(detail.id, detail.face_identity, detail.face_key)) } - if (detail.health_code_key.isNotEmpty()) { - val img = find(R.id.health_img) - img.setSrc(detail.health_code_identity, detail.health_code_key) - img.visibility = View.VISIBLE - find(R.id.health_empty).visibility = View.GONE - } else { - find(R.id.health_empty).visibility = View.VISIBLE - find(R.id.health_img).visibility = View.GONE + when { + detail.health_code_status >= 0 -> { + healthCodeStatusLayout.visibility = VISIBLE + health_empty.visibility = GONE + health_img.visibility = GONE + when (detail.health_code_status) { + 0 -> { + healthCodeStatus.text = "状态：绿码" + healthCodeStatus.textColor = Color.parseColor("#5DAD64") + } + 1 -> { + healthCodeStatus.text = "状态：黄码" + healthCodeStatus.textColor = Color.parseColor("#FCCF13") + } + 10 -> { + healthCodeStatus.text = "状态：红码" + healthCodeStatus.textColor = Color.parseColor("#FC0416") + } + } + } + detail.health_code_key.isNotEmpty() -> { + healthCodeStatusLayout.visibility = GONE + val img = find(R.id.health_img) + img.setSrc(detail.health_code_identity, detail.health_code_key) + img.visibility = View.VISIBLE + find(R.id.health_empty).visibility = View.GONE + } + else -> { + healthCodeStatusLayout.visibility = GONE + find(R.id.health_empty).visibility = View.VISIBLE + find(R.id.health_img).visibility = View.GONE + } } find(R.id.health_img).setOnClickListener { - EventBus.getDefault().post(ViewImage(detail.id,detail.health_code_identity,detail.health_code_key)) + EventBus.getDefault() + .post(ViewImage(detail.id, detail.health_code_identity, detail.health_code_key)) } if (detail.trip_code_key.isNotEmpty()) { val img = find(R.id.trip_img) @@ -92,7 +118,8 @@ class VisitorDialog( find(R.id.trip_img).visibility = View.GONE } find(R.id.trip_img).setOnClickListener { - EventBus.getDefault().post(ViewImage(detail.id,detail.trip_code_identity,detail.trip_code_key)) + EventBus.getDefault() + .post(ViewImage(detail.id, detail.trip_code_identity, detail.trip_code_key)) } find(R.id.reception_user).text = "${detail.reception_user}" find(R.id.visit_reason).text = "${detail.visit_reason}" @@ -101,12 +128,13 @@ class VisitorDialog( 0 -> "否" else -> "--" } - if(detail.is_drive==1){ + if (detail.is_drive == 1) { find(R.id.carLayout).visibility = View.VISIBLE find(R.id.doorLayout).visibility = View.GONE find(R.id.license_plate).text = "${detail.license_plate}" - find(R.id.car_in_time).text = "${detail.car_in_time.toTime()} - ${detail.car_out_time.toTime()}" - }else{ + find(R.id.car_in_time).text = + "${detail.car_in_time.toTime()} - ${detail.car_out_time.toTime()}" + } else { find(R.id.carLayout).visibility = View.GONE find(R.id.doorLayout).visibility = View.VISIBLE find(R.id.audit_status_str).text = when (detail.audit_status) { @@ -123,7 +151,8 @@ class VisitorDialog( -1 -> Color.parseColor("#999999") else -> Color.parseColor("#333333") } - find(R.id.start_time).text = "${detail.start_time.toDay()} - ${detail.end_time.toDay()} 可进出${detail.in_out_num}次" + find(R.id.start_time).text = + "${detail.start_time.toDay()} - ${detail.end_time.toDay()} 可进出${detail.in_out_num}次" } find(R.id.statusImg).setSrc(detail.getStatusImg()) diff --git a/app/src/main/res/layout/dialog_visitor.xml b/app/src/main/res/layout/dialog_visitor.xml index 6293ab1..10d63ac 100644 --- a/app/src/main/res/layout/dialog_visitor.xml +++ b/app/src/main/res/layout/dialog_visitor.xml @@ -140,6 +140,25 @@ android:gravity="center" android:text="健康码" android:textSize="@dimen/sp20"/> + + + + + + - + + + + + app:qmui_corner_radius="@dimen/d_5" + android:visibility="gone"/> + app:qmui_radius="@dimen/d_5" + android:visibility="gone"/>