| app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/okgoincar/base/MyApplication.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/okgoincar/base/gpsnav/util/TTSController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/okgoincar/bean/websocket/HeartBean.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/okgoincar/netUtls/Api.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/okgoincar/utils/Cache/CacheKey.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/build.gradle
@@ -25,8 +25,8 @@ applicationId "com.okgoincar" minSdkVersion 19 targetSdkVersion 29 versionCode 13 versionName "13" versionCode 16 versionName "16" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -3,13 +3,11 @@ import android.app.Activity import android.app.Application import android.content.Context import android.location.Location import android.os.Build import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.Looper import android.util.Log import androidx.annotation.RequiresApi import androidx.multidex.MultiDex import cn.sinata.rxnetty.NettyClient import cn.sinata.xldutils.BaseApplication @@ -17,11 +15,10 @@ import com.amap.api.location.AMapLocation import com.amap.api.track.AMapTrackClient import com.amap.api.track.ErrorCode import com.amap.api.track.OnTrackLifecycleListener import com.amap.api.track.TrackParam import com.amap.api.track.query.model.* import com.okgoincar.netUtls.getUserId import com.okgoincar.utils.Cache.CacheKey import com.amap.api.track.query.model.AddTerminalRequest import com.amap.api.track.query.model.QueryTerminalRequest import com.amap.api.track.query.model.QueryTerminalResponse import com.google.gson.Gson import com.okgoincar.base.gpsnav.util.TTSController import com.okgoincar.bean.CarLocationBean @@ -29,11 +26,9 @@ import com.okgoincar.bean.OrderSimpleData import com.okgoincar.bean.websocket.HeartBean import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.getUserId import com.okgoincar.slab.MySlabBaseActivity import com.okgoincar.slab.SlabLoginActivity import com.okgoincar.utils.Cache.CacheUtil import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.startActivity import com.okgoincar.utils.Cache.CacheKey import org.jetbrains.anko.toast import org.json.JSONObject import java.security.SecureRandom @@ -100,10 +95,15 @@ testReceiveNum++ } Const.SOCKET_METHOD.OFFLINE -> { CacheUtil.get().clear() NettyClient.getInstance().stopService() EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP)) toast("您的账号已在其他平台登录") // CacheUtil.get().clear() // NettyClient.getInstance().stopService() // var intent = Intent() // intent.setClass(this, SlabLoginActivity::class.java) // intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) // startActivity(intent) // Handler(Looper.getMainLooper()).post { // toast("您的账号已在其他平台登录") // } } Const.SOCKET_METHOD.ORDER_STATUS -> { val orderSimpleData = @@ -306,8 +306,8 @@ return appContext } fun getTTsManager():TTSController{ if (mTtsManager == null){ fun getTTsManager(): TTSController { if (mTtsManager == null) { mTtsManager = TTSController.getInstance(getInstance()) mTtsManager?.init() } @@ -399,14 +399,23 @@ override fun onActivityStopped(activity: Activity?) { showNum-- Handler(Looper.getMainLooper()).postDelayed({ if (showNum == 0){ getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。") if (showNum == 0) { setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。") // getTTsManager().setVideoText("OK出行司机已置于后台，可能会导致听单异常，里程计费差异，请勿切换。") } },600) }, 600) } override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) { activities.add(activity) } fun setVideoText(s: String?) { val intent = Intent() intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.action = "com.wisdom.gps.action.tts" intent.putExtra("msg", s) sendBroadcast(intent) } } app/src/main/java/com/okgoincar/base/gpsnav/util/TTSController.java
@@ -1,6 +1,7 @@ package com.okgoincar.base.gpsnav.util; import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -130,12 +131,18 @@ ttsManager = null; } public void setVideoText(String s){ try { tts.playText(s); }catch (Exception e){ } public void setVideoText(String s) { // try { // tts.playText(s); // }catch (Exception e){ // // } Intent intent = new Intent(); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setAction("com.wisdom.gps.action.tts"); intent.putExtra("msg", s); mContext.sendBroadcast(intent); // sendBroadcast(intent); } /**************************************************************************** app/src/main/java/com/okgoincar/bean/websocket/HeartBean.java
@@ -2,6 +2,7 @@ import com.okgoincar.netUtls.NetKitKt; import com.okgoincar.utils.Cache.CacheKey; public class HeartBean { private int code = 200; @@ -45,11 +46,13 @@ private int type = 2; private int userId = NetKitKt.getUserId(); private String device = "carDevice"; private String token; public DataBean() { type = 2; userId = NetKitKt.getUserId(); device = "carDevice"; token = CacheKey.INSTANCE.getToken(); } }
@@ -7,14 +7,14 @@ public class Api { //内网 // public static final String BASE_URL = "http://192.168.0.80:80/driver/"; // public static final String SOCKET_SERVER = "192.168.0.80"; // public static final int SOCKET_PORT = 8888; public static final String BASE_URL = "http://192.168.0.80:80/driver/"; public static final String SOCKET_SERVER = "192.168.0.80"; public static final int SOCKET_PORT = 9999; //外网 public static final String BASE_URL = "http://39.108.148.228:80/driver/"; public static final String SOCKET_SERVER = "39.108.148.228"; public static final int SOCKET_PORT = 8888; // public static final String BASE_URL = "http://39.108.148.228:80/driver/"; // public static final String SOCKET_SERVER = "39.108.148.228"; // public static final int SOCKET_PORT = 8888; public static final int SUCCESS = 200; /** app/src/main/java/com/okgoincar/utils/Cache/CacheKey.kt
@@ -57,8 +57,8 @@ fun getAppId(){ getKeyStr("appid") } fun getToken(){ getKeyStr("token") fun getToken():String{ return getKeyStr("token") } fun getServerId():String{ return getKeyStr("serverId")
