yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: UI-859

Browse Source
This commit is contained in:
wangcongtao
2020-07-23 16:28:48 +08:00
parent 88a500be59
commit 8bdd11c480
34 changed files with 3167 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

63
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -2,6 +2,7 @@ package com.mogo.launcher;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import com.alibaba.android.arouter.launcher.ARouter;
@@ -9,6 +10,7 @@ import com.auto.zhidao.logsdk.CrashSystem;
import com.bytedance.boost_multidex.BoostMultiDex;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.Utils;
import com.mogo.commons.storage.SpStorage;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.carchatting.card.CallChatConstant;
@@ -97,28 +99,53 @@ public class MogoApplication extends AbsMogoApplication {
@Override
protected void init() {
super.init();
UiThreadHandler.postDelayed( () -> {
final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() );
apis.getPassportManagerApi().requestTicket( new IMogoTicketCallback() {
@Override
public void onSuccess( String ticket ) {
Logger.d( TAG, "ticket = %s", ticket );
SpStorage.setTicket( ticket );
}
prepareBaseService();
}
@Override
public void onError( int code, String msg ) {
Logger.w( TAG, "code = %s, msg = %s", code, msg );
}
} );
apis.getLocationInfoApi().start();
apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> {
apis.getLocationInfoApi().provideLocation( location );
} );
/**
* 基础服务：passport、location、socket
*/
private void prepareBaseService(){
UiThreadHandler.postDelayed( ()->{
final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
// 第三方平台的sn是服务端生成的，所以必须在返回后才能开启
if ( TextUtils.isEmpty( Utils.getSn() ) ) {
preparePassportEnvironment( apis, ()->{
prepareSocketAndLocationServices( apis );
} );
} else {
preparePassportEnvironment( apis, null );
prepareSocketAndLocationServices( apis );
}
}, 2_000L );
}
private void preparePassportEnvironment( IMogoServiceApis apis, Runnable after ) {
apis.getPassportManagerApi().requestTicket( new IMogoTicketCallback() {
@Override
public void onSuccess( String ticket ) {
Logger.d( TAG, "ticket = %s", ticket );
SpStorage.setTicket( ticket );
if ( after != null ) {
after.run();
}
}
@Override
public void onError( int code, String msg ) {
Logger.w( TAG, "code = %s, msg = %s", code, msg );
}
} );
}
private void prepareSocketAndLocationServices(IMogoServiceApis apis){
apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() );
apis.getLocationInfoApi().start();
apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> {
apis.getLocationInfoApi().provideLocation( location );
} );
}
@Override
protected void attachBaseContext( Context base ) {
super.attachBaseContext( base );

4
foudations/mogo-base-services-sdk/build.gradle
View File

@@ -30,9 +30,9 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation rootProject.ext.dependencies.arouter
// 上报位置
implementation 'com.zhidao.locupload:loc-upload-sdk:1.0.9'
implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.1'
// 长链
implementation 'com.zhidao.socket:built-in-socket:1.0.13'
implementation 'com.zhidao.socket:built-in-socket:1.0.15'
// passport
implementation 'com.zhidao.tcloginsdk:tclogin:1.0.9'

16
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java Normal file
View File

@@ -0,0 +1,16 @@
package com.mogo.base.services;
public
/**
* @author congtaowang
* @since 2020/7/23
*
* 描述
*/
interface BaseServicesConstants {
/**
* 建立长链的通道ID
*/
String SOCKET_CHANNEL_ID = "dataCrawler";
}

10
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import androidx.annotation.Keep;
import com.elegant.spi.annotations.Service;
import com.mogo.base.services.BaseServicesConstants;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.location.MogoLocation;
import com.mogo.service.locationinfo.IMogoLocationInfoService;
@@ -52,7 +53,7 @@ class MogoLocationInfoServices implements IMogoLocationInfoService {
@Override
public void provideLocation( MogoLocation location ) {
mLocation = location;
Logger.d(TAG, "sdk - provideLocation");
Logger.d( TAG, "sdk - provideLocation" );
}
public MogoLocation getLocation() {
@@ -62,25 +63,26 @@ class MogoLocationInfoServices implements IMogoLocationInfoService {
@Override
public void start() {
LocUploadManager.getInstance().startUpload();
Logger.d(TAG, "sdk - start");
Logger.d( TAG, "sdk - start" );
}
@Override
public void stop() {
LocUploadManager.getInstance().stopUpload();
Logger.d(TAG, "sdk - stop");
Logger.d( TAG, "sdk - stop" );
}
@Override
public void init( Context context ) {
LocUploadConfig.instance().
setAppId( DebugConfig.getSocketAppId() ).
setSocketChannelId( BaseServicesConstants.SOCKET_CHANNEL_ID ).
setContext( context.getApplicationContext() ).
setLocEnvironment( getEnvironment() ).
setLoggable( DebugConfig.isDebug() ).
setPlatform( Platform.car ).
setLocInterval( 2000L );
Logger.d(TAG, "sdk - init");
Logger.d( TAG, "sdk - init" );
}
private LocEnvironment getEnvironment() {

7
foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
View File

@@ -7,7 +7,9 @@ import androidx.annotation.NonNull;
import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import com.mogo.base.services.BaseServicesConstants;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.Utils;
import com.mogo.service.connection.IMogoMsgAckListener;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.connection.IMogoSocketManager;
@@ -86,8 +88,9 @@ class SocketManager implements IMogoSocketManager, Callback {
.setAppContext( context.getApplicationContext() )
.setEnvironment( getEnvironment() )
.setClient( Platform.getClient( Platform.car ) )
.setAppId( appId )
// .setOpenAnalytics( true )
.setChannelId( BaseServicesConstants.SOCKET_CHANNEL_ID )
.setOpenAnalytics( true )
.setSn( Utils.getSn() )
.setDebug( DebugConfig.isDebug() );
SocketMessageDispatcher.getInstance().start( context );
}

18
foudations/mogo-connection/build/generated/source/buildConfig/release/com/mogo/connection/BuildConfig.java Normal file
View File

@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.connection;
public final class BuildConfig {
public static final boolean DEBUG = false;
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.connection";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "com.mogo.connection";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.2.1.9";
}

11
foudations/mogo-connection/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.connection"
android:versionCode="1"
android:versionName="1.2.1.9" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
</manifest>

1
foudations/mogo-connection/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.2.1.9","enabled":true,"outputFile":"mogo-connection-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.connection","split":""}}]

1
foudations/mogo-connection/build/intermediates/annotation_processor_list/release/annotationProcessors.json Normal file
View File

@@ -0,0 +1 @@
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}

BIN
foudations/mogo-connection/build/intermediates/compile_library_classes/release/classes.jar Normal file
View File

Binary file not shown.

BIN
foudations/mogo-connection/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar Normal file
View File

Binary file not shown.

2
foudations/mogo-connection/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/release/jniLibs"/></dataSet></merger>

2
foudations/mogo-connection/build/intermediates/incremental/mergeReleaseShaders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/release/shaders"/></dataSet></merger>

2
foudations/mogo-connection/build/intermediates/incremental/packageReleaseAssets/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/assets"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/release/assets"/></dataSet></merger>

1
foudations/mogo-connection/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties Normal file
View File

@@ -0,0 +1 @@
#Thu Jul 23 14:49:55 CST 2020

4
foudations/mogo-connection/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">mogo-connection</string>
</resources>

2
foudations/mogo-connection/build/intermediates/incremental/packageReleaseResources/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/build/generated/res/rs/release"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/res"><file path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">mogo-connection</string></file></source><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/build/generated/res/rs/release"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/release/res"/></dataSet><mergedItems/></merger>

BIN
foudations/mogo-connection/build/intermediates/incremental/release-mergeNativeLibs/merge-state Normal file
View File

Binary file not shown.

BIN
foudations/mogo-connection/build/intermediates/javac/release/classes/com/mogo/connection/BuildConfig.class Normal file
View File

Binary file not shown.

BIN
foudations/mogo-connection/build/intermediates/javac/release/classes/com/mogo/connection/socket/MsgBody.class Normal file
View File

Binary file not shown.

BIN
foudations/mogo-connection/build/intermediates/javac/release/classes/com/mogo/connection/socket/SocketManager.class Normal file
View File

Binary file not shown.

BIN
foudations/mogo-connection/build/intermediates/library_java_res/release/res.jar Normal file
View File

Binary file not shown.

11
foudations/mogo-connection/build/intermediates/library_manifest/release/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.connection"
android:versionCode="1"
android:versionName="1.2.1.9" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
</manifest>

3
foudations/mogo-connection/build/intermediates/local_only_symbol_list/release/parseReleaseLibraryResources/R-def.txt Normal file
View File

@@ -0,0 +1,3 @@
R_DEF: Internal format may change without notice
local
string app_name

13
foudations/mogo-connection/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt Normal file
View File

@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.mogo.connection"
4 android:versionCode="1"
5 android:versionName="1.2.1.9" >
6
7 <uses-sdk
8 android:minSdkVersion="19"
8-->/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
9 android:targetSdkVersion="22" />
9-->/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
10
11</manifest>

1
foudations/mogo-connection/build/intermediates/merged_manifests/release/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.2.1.9","enabled":true,"outputFile":"mogo-connection-release.aar","fullName":"release","baseName":"release"},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.mogo.connection","split":""}}]

4
foudations/mogo-connection/build/intermediates/packaged_res/release/values/values.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">mogo-connection</string>
</resources>

1259
foudations/mogo-connection/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
foudations/mogo-connection/build/intermediates/runtime_library_classes/release/classes.jar Normal file
View File

Binary file not shown.

1712
foudations/mogo-connection/build/intermediates/symbols/release/R.txt Normal file
View File

File diff suppressed because it is too large Load Diff

37
foudations/mogo-connection/build/outputs/logs/manifest-merger-release-report.txt Normal file
View File

@@ -0,0 +1,37 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
package
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:2:5-34
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:versionName
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:versionCode
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:1-2:37
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
ADDED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml
INJECTED from /Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/mogo-connection/src/main/AndroidManifest.xml

7
modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java
View File

@@ -1,5 +1,9 @@
package com.mogo.module.gps.simulator;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.utils.storage.SharedPrefsMgr;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -15,6 +19,9 @@ class Utils {
public static final String PROPERTIES = "android.os.SystemProperties";
public static String getSn() {
if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
}
return getSystemProperties( GSM_SERIAL );
}

2
services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoSocketManager.java
View File

@@ -16,7 +16,7 @@ public interface IMogoSocketManager extends IProvider {
* 初始化，各模块不用关心
*
* @param context 上下文
* @param appId 一般为包名
* @param appId 一般为包名，不参与通道的建立，一般用于发消息
*/
void init( Context context, String appId );