android/OkGoinCar.git

parent: 341606fa | 补丁 | 提交 | ignore whitespace

liugl

2020-09-25 95231bd94b71c9c6435110cf6489761eaf75daed

9.14

5个文件已修改

	app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/slab_activity_main.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt

@@ -67,34 +67,11 @@
        }
    }

//    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
//        var map = getMapByAny()
//        map["identification"] = driverCertificate
//        callNet(context!!, Api.loginByIdentification, map) {
//            toast("登录成功")
//            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
//            CacheKey.putKeyStr("identification", driverCertificate!!)
//            CacheKey.putKeyStr("appid", bean.data.appid)
//            CacheKey.putKeyStr("token", bean.data.token)
//            CacheKey.putKeyStr("userId", bean.data.id.toString())
//            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//            Handler(Looper.getMainLooper()).post {
//                var intent = Intent()
//                intent.setClass(context, SlabMainActivity::class.java)
//                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
//                context.startActivity(intent)
//            }
//        }
//    }

    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        if (driverCertificate.isNullOrEmpty()){
//            toast("资格证号：空")
            toast("资格证号：空")
            return
        }else{
//            toast("资格证号："+driverCertificate)
        }
        map["taxiAptitudeCard"] = driverCertificate
        callNet(context!!, Api.loginByTaxiAptitudeCard, map) {

 app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt

@@ -17,6 +17,27 @@
import org.greenrobot.eventbus.EventBus
import java.lang.Exception

/***
 * 为了支持本页面所需的 MyApplication.currentOrderId 所以在订单列表获取处，订单页面，设置了这个常量的值
 *
 * 1：接单后 重车时无网
 *  --车载屏无反应
 *  缓存 订单开始状态
 *  来网后空车时 --》 查看是否有进行中id，是否有缓存
 *
 *
 * 2：接单后 空车时无网
 *
 *
 *
 * 3：接单后 正常状态
 *
 *
 *
 * 4：接单后 都没有网络
 *
 *
 */
class MoneyBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(contexts: Context?, intent: Intent?) {
        if (intent == null && contexts == null) {
@@ -66,7 +87,6 @@
                }
            }
        }


        fun callOver(contexts: Context, travelFee: Double) {
            if (MyApplication.currentOrderId.isEmpty()) {

 app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt

@@ -36,8 +36,8 @@

    override fun onResume() {
        super.onResume()
        if (!NetUtils.isNetworkConnected(this)){
           var dialog =  DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅，请稍后再登录"){
        if (!NetUtils.isNetworkConnected(this)) {
            var dialog = DialogUtil.getSlabSurePopWindow(this, "当前网络不通畅，请稍后再登录") {
                EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
            }
            dialog.showCenter(window.decorView)
@@ -46,32 +46,19 @@

    override fun setOnclick() {
        tv_login.clickDelay {
//            var map = getMapByAny()
//            map["jobNum"] = et_number.getContent().trim()
//            callNet(true, Api.loginByJobNumber, map) {
//                toast("登录成功")
//                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
//                CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
//                CacheKey.putKeyStr("appid", bean.data.appid)
//                CacheKey.putKeyStr("token", bean.data.token)
//                CacheKey.putKeyStr("userId", bean.data.id.toString())
//                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//                finish()
//                startActivity<SlabMainActivity>()
//            }
//            51168119911111447X  15928265276 11111q
            toLoginActivity(this,"450211198101280848")
            //            51168119911111447X  15928265276 11111q
//            450211198101280848 黄桥账号
            toLoginActivity(this, et_number.getContent())
        }
    }

    override fun setBlackMode(b:Boolean) {
    override fun setBlackMode(b: Boolean) {
        super.setBlackMode(b)
        if (b){
        if (b) {
            iv_back_login.setBackgroundResource(R.mipmap.bg_black)
            ll_center.setBackgroundResource(R.color.black_mode_383838)
            et_number.setBackgroundResource(R.drawable.bg_gray_4_line_black)
        }else{
        } else {
            iv_back_login.setBackgroundResource(R.mipmap.bg_lab_login)
            ll_center.setBackgroundResource(R.color.write)
            et_number.setBackgroundResource(R.drawable.bg_gray_4_line)
@@ -94,7 +81,7 @@
    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        map["taxiAptitudeCard"] = driverCertificate
        callNet(context!!,Api.loginByTaxiAptitudeCard,map){
        callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
            cn.sinata.xldutils.utils.toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("appid", bean.data.appid)
@@ -107,27 +94,4 @@
            }
        }
    }


//    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
//        var map = getMapByAny()
//        map["identification"] = driverCertificate
//        callNet(context!!, Api.loginByIdentification, map) {
//            toast("登录成功")
//            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
//            CacheKey.putKeyStr("identification", driverCertificate!!)
//            CacheKey.putKeyStr("appid", bean.data.appid)
//            CacheKey.putKeyStr("token", bean.data.token)
//            CacheKey.putKeyStr("userId", bean.data.id.toString())
//            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//            Handler(Looper.getMainLooper()).post {
//                var intent = Intent()
//                intent.setClass(context, SlabMainActivity::class.java)
//                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
//                context.startActivity(intent)
//            }
//        }
//    }

}

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -106,7 +106,7 @@
                callVersion()
            }
        }else{
            toast("无网络")
            showNoneNetDialog()
        }
    }

@@ -124,6 +124,15 @@

    override fun onResume() {
        super.onResume()
        showNoneNetDialog()
        try {
            mainFragment?.refresh()
        }catch (e:Exception){

        }
    }

    fun showNoneNetDialog(){
        if (!NetUtils.isNetworkConnected(this)){
            popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
                if (!NetUtils.isNetworkConnected(this)){
@@ -137,12 +146,6 @@
                popup?.showCenter(window.decorView)
            }
        }
        try {
            mainFragment?.refresh()
        }catch (e:Exception){

        }

    }

    fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit): EasyPopup {

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

@@ -92,7 +92,7 @@
        android:layout_height="91dp"
        android:layout_marginTop="30dp"
        android:gravity="center"
        android:text="网 络 不 通 畅"
        android:text="服 务 监 督 卡"
        android:textColor="#ED5F08"
        android:textSize="66sp"
        android:textStyle="bold"

			@@ -67,34 +67,11 @@
			}
			}

			// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			// var map = getMapByAny()
			// map["identification"] = driverCertificate
			// callNet(context!!, Api.loginByIdentification, map) {
			// toast("登录成功")
			// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("identification", driverCertificate!!)
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// Handler(Looper.getMainLooper()).post {
			// var intent = Intent()
			// intent.setClass(context, SlabMainActivity::class.java)
			// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
			// context.startActivity(intent)
			// }
			// }
			// }

			private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			var map = getMapByAny()
			if (driverCertificate.isNullOrEmpty()){
			// toast("资格证号：空")
			toast("资格证号：空")
			return
			}else{
			// toast("资格证号："+driverCertificate)
			}
			map["taxiAptitudeCard"] = driverCertificate
			callNet(context!!, Api.loginByTaxiAptitudeCard, map) {

			@@ -17,6 +17,27 @@
			import org.greenrobot.eventbus.EventBus
			import java.lang.Exception

			/***
			* 为了支持本页面所需的 MyApplication.currentOrderId 所以在订单列表获取处，订单页面，设置了这个常量的值
			*
			* 1：接单后重车时无网
			* --车载屏无反应
			* 缓存订单开始状态
			* 来网后空车时 --》查看是否有进行中id，是否有缓存
			*
			*
			* 2：接单后空车时无网
			*
			*
			*
			* 3：接单后正常状态
			*
			*
			*
			* 4：接单后都没有网络
			*
			*
			*/
			class MoneyBroadCastReceiver : BroadcastReceiver() {
			override fun onReceive(contexts: Context?, intent: Intent?) {
			if (intent == null && contexts == null) {
			@@ -66,7 +87,6 @@
			}
			}
			}


			fun callOver(contexts: Context, travelFee: Double) {
			if (MyApplication.currentOrderId.isEmpty()) {

			@@ -36,8 +36,8 @@

			override fun onResume() {
			super.onResume()
			if (!NetUtils.isNetworkConnected(this)){
			var dialog = DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅，请稍后再登录"){
			if (!NetUtils.isNetworkConnected(this)) {
			var dialog = DialogUtil.getSlabSurePopWindow(this, "当前网络不通畅，请稍后再登录") {
			EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
			}
			dialog.showCenter(window.decorView)
			@@ -46,32 +46,19 @@

			override fun setOnclick() {
			tv_login.clickDelay {
			// var map = getMapByAny()
			// map["jobNum"] = et_number.getContent().trim()
			// callNet(true, Api.loginByJobNumber, map) {
			// toast("登录成功")
			// var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// finish()
			// startActivity<SlabMainActivity>()
			// }
			// 51168119911111447X 15928265276 11111q
			toLoginActivity(this,"450211198101280848")
			// 51168119911111447X 15928265276 11111q
			// 450211198101280848 黄桥账号
			toLoginActivity(this, et_number.getContent())
			}
			}

			override fun setBlackMode(b:Boolean) {
			override fun setBlackMode(b: Boolean) {
			super.setBlackMode(b)
			if (b){
			if (b) {
			iv_back_login.setBackgroundResource(R.mipmap.bg_black)
			ll_center.setBackgroundResource(R.color.black_mode_383838)
			et_number.setBackgroundResource(R.drawable.bg_gray_4_line_black)
			}else{
			} else {
			iv_back_login.setBackgroundResource(R.mipmap.bg_lab_login)
			ll_center.setBackgroundResource(R.color.write)
			et_number.setBackgroundResource(R.drawable.bg_gray_4_line)
			@@ -94,7 +81,7 @@
			private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			var map = getMapByAny()
			map["taxiAptitudeCard"] = driverCertificate
			callNet(context!!,Api.loginByTaxiAptitudeCard,map){
			callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
			cn.sinata.xldutils.utils.toast("登录成功")
			var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("appid", bean.data.appid)
			@@ -107,27 +94,4 @@
			}
			}
			}


			// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			// var map = getMapByAny()
			// map["identification"] = driverCertificate
			// callNet(context!!, Api.loginByIdentification, map) {
			// toast("登录成功")
			// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("identification", driverCertificate!!)
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// Handler(Looper.getMainLooper()).post {
			// var intent = Intent()
			// intent.setClass(context, SlabMainActivity::class.java)
			// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
			// context.startActivity(intent)
			// }
			// }
			// }

			}

			@@ -106,7 +106,7 @@
			callVersion()
			}
			}else{
			toast("无网络")
			showNoneNetDialog()
			}
			}

			@@ -124,6 +124,15 @@

			override fun onResume() {
			super.onResume()
			showNoneNetDialog()
			try {
			mainFragment?.refresh()
			}catch (e:Exception){

			}
			}

			fun showNoneNetDialog(){
			if (!NetUtils.isNetworkConnected(this)){
			popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
			if (!NetUtils.isNetworkConnected(this)){
			@@ -137,12 +146,6 @@
			popup?.showCenter(window.decorView)
			}
			}
			try {
			mainFragment?.refresh()
			}catch (e:Exception){

			}

			}

			fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit): EasyPopup {

			@@ -92,7 +92,7 @@
			android:layout_height="91dp"
			android:layout_marginTop="30dp"
			android:gravity="center"
			android:text="网络不通畅"
			android:text="服务监督卡"
			android:textColor="#ED5F08"
			android:textSize="66sp"
			android:textStyle="bold"