| app/src/main/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/base/MyApplication.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/base/gaode/AMapKit.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/base/local/BaseLoginActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/ui/main/MainActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/ui/main/TripActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/ui/main/add_order/SelectClassActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/ui/pub/ForgetPwdActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/AndroidManifest.xml
@@ -137,7 +137,7 @@ </provider> <meta-data android:name="com.amap.api.v2.apikey" android:value="7491e654ecbf6cf486c292aa656b2bd0" /> android:value="7ae005093662e33037ab20788f68929d" /> <activity android:name="com.jxonlinecar.driver.base.gaode.gpsnav.GPSNaviActivity" />
@@ -10,6 +10,7 @@ import cn.sinata.xldutils.BaseApplication import cn.sinata.xldutils.utils.sysErr import com.amap.api.location.AMapLocation import com.amap.api.maps.MapsInitializer import com.google.gson.Gson import com.tencent.bugly.crashreport.CrashReport import com.umeng.commonsdk.UMConfigure @@ -27,6 +28,7 @@ import com.jxonlinecar.driver.ui.main.GetOrderFragment import com.jxonlinecar.driver.ui.main.VoiceOrderFragment import com.jxonlinecar.driver.ui.pub.LoginActivity import com.jxonlinecar.driver.utils.Cache.CacheKey import com.jxonlinecar.driver.utils.Cache.CacheUtil import com.jxonlinecar.driver.utils.LogUtils import org.greenrobot.eventbus.EventBus @@ -63,8 +65,16 @@ registerActivityLifecycleCallbacks(this) initSocket() // CrashReport.initCrashReport(this, "06c8612c1a", true) updateAMapPrivacy() } //更新高德地图隐私协议状态 fun updateAMapPrivacy() { if (CacheKey.getKeyStr("isAgreen") == "1") { MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) } } fun initPersionDate(){ UMConfigure.init( this, app/src/main/java/com/jxonlinecar/driver/base/gaode/AMapKit.kt
@@ -38,7 +38,7 @@ object AMapKit { fun initLocation(context: Context, lisener: AMapLocationListener) { //初始化定位 fun initLocation(context: Context, lisener: AMapLocationListener): AMapLocationClient { //初始化定位 var mlocationClient = AMapLocationClient(context) //初始化定位参数 var mLocationOption = AMapLocationClientOption() @@ -55,8 +55,16 @@ // 在定位结束后，在合适的生命周期调用onDestroy()方法 // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除 mlocationClient.startLocation() //启动定位 return mlocationClient; } ///结束定位 fun stopLocation(locationClient: AMapLocationClient?) { locationClient?.also { it.stopLocation() it.onDestroy() } } fun initMap(savedInstanceState: Bundle?, mapView: MapView): AMap { mapView.onCreate(savedInstanceState) val aMap = mapView.map app/src/main/java/com/jxonlinecar/driver/base/local/BaseLoginActivity.kt
@@ -14,6 +14,7 @@ import com.jxonlinecar.driver.R import com.jxonlinecar.driver.base.BaseEvent import com.jxonlinecar.driver.base.InnerJsInterface import com.jxonlinecar.driver.base.MyApplication import com.jxonlinecar.driver.base.MyBaseActivity import com.jxonlinecar.driver.bean.AgreeBean import com.jxonlinecar.driver.netUtls.Api @@ -88,7 +89,6 @@ public fun showYsDialog() { var isAgreen = CacheKey.getKeyStr("isAgreen") if (isAgreen.isEmpty()) { CacheKey.putKeyStr("isAgreen", "1") var dialog = DialogUtil.getDialog(this, R.layout.item_ys) var view = DialogUtil.getView(dialog) callys { @@ -101,6 +101,8 @@ EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP)) } view.tv_agreet.clickDelay { CacheKey.putKeyStr("isAgreen", "1") MyApplication.getInstance()?.updateAMapPrivacy() dialog.dismiss() } view.tv_yx.clickDelay { app/src/main/java/com/jxonlinecar/driver/ui/main/MainActivity.kt
@@ -1,5 +1,6 @@ package com.jxonlinecar.driver.ui.main //import com.tencent.bugly.crashreport.CrashReport import android.Manifest import android.content.ActivityNotFoundException import android.content.ClipData @@ -16,33 +17,32 @@ import cn.sinata.rxnetty.NettyClient import cn.sinata.xldutils.utils.* import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationListener import com.amap.api.maps.MapsInitializer import com.google.gson.Gson import com.jxonlinecar.driver.R import com.jxonlinecar.driver.base.BaseEvent import com.jxonlinecar.driver.base.Const import com.jxonlinecar.driver.base.MyApplication import com.jxonlinecar.driver.base.MyBaseActivity import com.jxonlinecar.driver.base.gaode.AMapKit import com.jxonlinecar.driver.bean.* import com.jxonlinecar.driver.netUtls.* import com.jxonlinecar.driver.ui.DialogUtil import com.jxonlinecar.driver.ui.adapter.OrderHallAdapter import com.jxonlinecar.driver.ui.main.event.MineEventActivity import com.jxonlinecar.driver.ui.mine.MineActivity import com.jxonlinecar.driver.ui.mine.MsgActivity import com.jxonlinecar.driver.ui.mine.RechargeActivity import com.jxonlinecar.driver.utils.Cache.CacheKey import com.jxonlinecar.driver.utils.DateUtil import com.jxonlinecar.driver.utils.download.DownloadUtil import com.google.gson.Gson import com.lljjcoder.style.citylist.Toast.ToastUtils import com.lzf.easyfloat.EasyFloat import com.lzf.easyfloat.enums.ShowPattern import com.lzf.easyfloat.enums.SidePattern import com.lzf.easyfloat.interfaces.OnInvokeView import com.tbruyelle.rxpermissions2.RxPermissions //import com.tencent.bugly.crashreport.CrashReport import com.jxonlinecar.driver.bean.* import com.jxonlinecar.driver.netUtls.* import com.jxonlinecar.driver.ui.adapter.OrderHallAdapter import com.jxonlinecar.driver.ui.mine.RechargeActivity import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_title.* import kotlinx.android.synthetic.main.dialog_sure_and_del.view.* @@ -78,13 +78,12 @@ private val EasyFloatTag = "BACKGROUND" private var floater: EasyFloat.Builder? = null //浮窗 private var paused: Boolean = false var locationClient: AMapLocationClient? = null private var timeHandler = Handler(Looper.getMainLooper()) //用于检测小程序订单时间 override fun initView() { MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) // var packageName = "com.android.providers.downloads"; // var intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); // intent.setData(Uri.parse("package:" + packageName)); @@ -125,7 +124,7 @@ iv_right_title.setImageResource(R.mipmap.icon_nav_news) addFragment(smallFragment, R.id.rl_container) // addFragment(mainFragment, R.id.rl_container) AMapKit.initLocation(this, this) locationClient = AMapKit.initLocation(this, this) MyApplication.isLogin = true beOnDuty(false) initCall() @@ -320,6 +319,7 @@ if (timeHandler != null) { timeHandler.removeCallbacksAndMessages(0) } AMapKit.stopLocation(locationClient) }
@@ -6,6 +6,7 @@ import android.os.PersistableBundle import android.view.View import cn.sinata.xldutils.utils.* import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationListener import com.amap.api.maps.AMap import com.amap.api.maps.model.LatLng @@ -67,7 +68,7 @@ var markerLine: Polyline? = null lateinit var aMap: AMap lateinit var orderBean: OrderBean var locationClient: AMapLocationClient? = null override fun setContentView() { setContentView(R.layout.activity_trip) @@ -320,7 +321,7 @@ * 定位时司机与线路的改变 */ private fun initMineLocation() { AMapKit.initLocation(this, AMapLocationListener { locationClient = AMapKit.initLocation(this, AMapLocationListener { it?.let { MyApplication.aMapLocation = it carMarker!!.position = LatLng(it.latitude, it.longitude) @@ -567,6 +568,7 @@ closeTimeStart() MyApplication.removeOrderView(this) map_view.onDestroy() AMapKit.stopLocation(locationClient) } override fun onPause() { app/src/main/java/com/jxonlinecar/driver/ui/main/add_order/SelectClassActivity.kt
@@ -4,6 +4,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import cn.sinata.xldutils.utils.callPhone import cn.sinata.xldutils.utils.clickDelay import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationListener import com.jxonlinecar.driver.R import com.jxonlinecar.driver.base.BaseEvent @@ -53,6 +54,7 @@ val timeSelectAdapter by lazy { TimeSelectAdapter() } var locationClient: AMapLocationClient? = null override fun setContentView() { setContentView(R.layout.activity_select_class) @@ -112,7 +114,7 @@ } private fun getCityCode() { AMapKit.initLocation(this, AMapLocationListener { locationClient = AMapKit.initLocation(this, AMapLocationListener { if (it.errorCode == 0) { AMapKit.getAddress(this,it.latitude,it.longitude){ cityCode = it @@ -178,4 +180,9 @@ } return h } override fun onDestroy() { super.onDestroy() AMapKit.stopLocation(locationClient) } } app/src/main/java/com/jxonlinecar/driver/ui/pub/ForgetPwdActivity.kt
@@ -3,6 +3,7 @@ import android.widget.TextView import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.getString import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationListener import com.example.emanagercar.ui.base.Local.BaseLoginActivity import com.jxonlinecar.driver.R @@ -21,7 +22,7 @@ class ForgetPwdActivity: BaseLoginActivity() { var first = false var locationClient: AMapLocationClient? = null override fun tvInit(tv_code: TextView) { et_login_code_send.text = "获取验证码" } @@ -39,7 +40,7 @@ override fun initView() { setTitleText("忘记密码") AMapKit.initLocation(this, AMapLocationListener { locationClient = AMapKit.initLocation(this, AMapLocationListener { if (!first && it != null){ getPhone(it.adCode) } @@ -119,4 +120,9 @@ } } } override fun onDestroy() { super.onDestroy() AMapKit.stopLocation(locationClient) } }
