commit

唐浩

2020-07-18 6bed01a5a2468cd389d4e483dbeb90347b701310

commit

 .idea/inspectionProfiles/Project_Default.xml

New file
@@ -0,0 +1,36 @@
<component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="TOP_LEVEL_CLASS_OPTIONS">
        <value>
          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
          <option name="REQUIRED_TAGS" value="" />
        </value>
      </option>
      <option name="INNER_CLASS_OPTIONS">
        <value>
          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
          <option name="REQUIRED_TAGS" value="" />
        </value>
      </option>
      <option name="METHOD_OPTIONS">
        <value>
          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
        </value>
      </option>
      <option name="FIELD_OPTIONS">
        <value>
          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
          <option name="REQUIRED_TAGS" value="" />
        </value>
      </option>
      <option name="IGNORE_DEPRECATED" value="false" />
      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
      <option name="myAdditionalJavadocTags" value="date" />
    </inspection_tool>
  </profile>
</component>

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 1
        versionName "1.0"
        versionCode 14
        versionName "14.0"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/AndroidManifest.xml

@@ -68,12 +68,25 @@
        </provider>


        <receiver android:name=".base.MainBroadCastReceiver">
            <intent-filter>
        <receiver android:name=".base.MainBroadCastReceiver"
            android:enabled="true"
            android:exported="true"
            >
            <intent-filter android:priority="1000">
                <action android:name="Action" />
                <!--                //司机信息-->
                <action android:name="wisdom.intent.action.driverInfo" />
                <!--                //顶灯-->
                <action android:name="wisdom.intent.action.topLight" />
                <!--                //空重车状态-->
                <action android:name="wisdom.intent.action.ledLight" />
                <!--                //计价器  司机登退签状态改变时-->
                <action android:name="wisdom.intent.action.priceDevice" />
            </intent-filter>
        </receiver>



        <meta-data
            android:name="design_width_in_dp"
            android:value="1280" />

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

@@ -31,9 +31,9 @@
        //设置定位回调监听
        mlocationClient.setLocationListener(lisener)
        //设置为高精度定位模式
        mLocationOption.isNeedAddress = true
//        mLocationOption.isNeedAddress = true
        mLocationOption.interval = 5000
        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy
        mLocationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Device_Sensors
        //设置定位参数
        mlocationClient.setLocationOption(mLocationOption)
        // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，

 app/src/main/java/com/okgoincar/base/BaseEvent.java

@@ -30,6 +30,7 @@

    public static final int  BACK_CAR_OVER = 11021; //重打车结束页面返回到首页

    public static final int  REQUEST_CAR_INFO = 11024; //收到显示屏信息

    private String msg;
    private int code;

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

@@ -3,10 +3,35 @@
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.os.Handler
import android.os.Looper
import cn.sinata.xldutils.utils.toast
import com.okgoincar.slab.SlabLoginActivity
import com.okgoincar.utils.Cache.CacheUtil
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity

class MainBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(context: Context?, intent: Intent?) {
        toast("获取的action="+intent!!.getStringExtra("isLogin"))
        toast("收到广播1")
        Handler(Looper.getMainLooper()).post {
            val b = intent!!.getBooleanExtra("isLogin",false)
            val driverName = intent!!.getStringExtra("driverName")
            toast("司机名字=$driverName")
            if (!b){
                toast("LED退出登录")
                CacheUtil.get().clear()
                EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
//                context?.startActivity<SlabLoginActivity>()
            }else{
                toast("开始登录")
            }
            var heay = intent.getBooleanExtra("isHeavy",false)
            toast("获取的网约=$heay") //顶灯
            var price = intent.getDoubleExtra("price",0.0)
            toast("收到的显示价格$price")
            var mileage = intent.getDoubleExtra("mileage",0.0)
            toast("收到的显示价格$mileage")
        }
    }
}

 app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java

@@ -28,6 +28,7 @@

import com.okgoincar.R;
import com.okgoincar.base.BaseEvent;
import com.okgoincar.base.MyApplication;
import com.okgoincar.slab.util.DialogUtil;
import com.github.zackratos.ultimatebar.UltimateBar;
import com.google.gson.Gson;
@@ -96,18 +97,18 @@

    Handler heartHandler;
    private void settest() {
//        tv_test.setVisibility(VISIBLE);
//        if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
//            tv_test.setText(
//                    "定位位置：lat="+MyApplication.Companion.getLocation().getLatitude()+"  lng="+MyApplication.Companion.getLocation().getLongitude()
//                            + "  心跳数量（）="+MyApplication.Companion.getTestHeartNunm()+"  收到的websocket数量="+MyApplication.Companion.getTestReceiveNum()
//                    +"  方向角="+MyApplication.Companion.getLocation().getBearing()+"  海拔"+MyApplication.Companion.getLocation().getAltitude()
//            );
//        }
//        if (heartHandler == null) {
//            heartHandler = new Handler(getMainLooper());
//        }
//        heartHandler.postDelayed(this::settest,1000);
        tv_test.setVisibility(VISIBLE);
        if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
            tv_test.setText(
                    "定位位置：lat="+MyApplication.Companion.getLocation().getLatitude()+"  lng="+MyApplication.Companion.getLocation().getLongitude()
                            + "  心跳数量（）="+MyApplication.Companion.getTestHeartNunm()+"  收到的websocket数量="+MyApplication.Companion.getTestReceiveNum()
                    +"  方向角="+MyApplication.Companion.getLocation().getBearing()+"  海拔"+MyApplication.Companion.getLocation().getAltitude()
            );
        }
        if (heartHandler == null) {
            heartHandler = new Handler(getMainLooper());
        }
        heartHandler.postDelayed(this::settest,2000);
    }



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

@@ -1,5 +1,10 @@
package com.okgoincar.slab

import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
@@ -40,6 +45,7 @@
    override fun setContentView() {
        setContentView(R.layout.slab_activity_main)
    }


    override fun setBlackMode(b: Boolean?) {
        super.setBlackMode(b)
@@ -142,8 +148,17 @@
            mainFragment.autoRefresh()
        }

        tv_name.clickDelay {

        }

        tv_car_num.clickDelay {

        }

        tv_star_num.clickDelay {

        }

        ll_task.clickDelay {
            startActivity<SlabMineEventActivity>()
@@ -174,6 +189,7 @@
    private
    var mBackAppTime: Long = 0


    override fun onBackPressed() {
        if (System.currentTimeMillis() - mBackAppTime > 2000) {
            Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT)
@@ -190,13 +206,27 @@
            BaseEvent.START_CAR -> {
                initCall()
            }
            BaseEvent.REQUEST_CAR_INFO -> {
                Handler(Looper.getMainLooper()).post {
                    toast("收到显示屏信息")
                }
            }
        }
    }

    override fun onLocationChanged(p0: AMapLocation?) {
        if (p0?.errorCode == 0) {
        if (p0 == null){
            toast("高德位置是空的")
            return
        }
        if (p0.errorCode == 0) {
            toast("定位成功")
            MyApplication.aMapLocation = p0
            CacheKey.putKeyStr("location", Gson().toJson(p0))
        }else{
            p0.let {
                toast("定位失败"+it.errorCode.toString())
            }
        }
    }
}

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

@@ -5,9 +5,13 @@
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import com.okgoincar.netUtls.getToken
import com.okgoincar.R
import com.okgoincar.base.BaseEvent
import com.okgoincar.base.Const
import com.okgoincar.netUtls.getToken
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import org.jetbrains.anko.startActivity

class SlabStartActivity : AppCompatActivity() {
@@ -17,6 +21,7 @@
        super.onCreate(savedInstanceState)
        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
        setContentView(R.layout.activity_start)
        EventBus.getDefault().register(this)
        setRxpermiss()
    }

@@ -51,5 +56,16 @@
        }
    }

    override fun onDestroy() {
        super.onDestroy()
        EventBus.getDefault().unregister(this)
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
    fun onEventMainThread(event: BaseEvent) {
        when (event.code) {
            BaseEvent.OUT_APP -> finish()
        }
    }

}

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

@@ -1,5 +1,6 @@
package com.okgoincar.slab

import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
@@ -456,6 +457,8 @@
        getAllMark(it)
        when (it.data.orderState) {
            2, 3 -> {
                toast("点亮网约")
                clickBroad()
                iv_to_gd.visible()
                makeMarker?.isVisible = true
                carMarker?.isVisible = true
@@ -470,6 +473,8 @@
                }
            }
            4 -> {
                toast("点亮网约")
                clickBroad()
                iv_to_gd.gone()
                closeLine()
                carMarker?.isVisible = true
@@ -498,6 +503,13 @@
        }
    }

    fun clickBroad(){
        var intent =  Intent();
        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK;
        intent.action = "wisdom.intent.action.topLight";
        intent.putExtra("state",0)
        sendBroadcast(intent);
    }

    private fun startTimeStart(waitTime: Int) {
        if (!isTimeStart) {