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

opt

Browse Source
This commit is contained in:
wangcongtao
2021-01-21 15:01:05 +08:00
parent 948a487ffc
commit 425ddf1489
87 changed files with 174 additions and 9643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OCH/mogo-och-taxi/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$och.java
View File

@@ -1,18 +0,0 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.mogo.och.taxi.MogoOCHTaxi;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Group$$och implements IRouteGroup {
@Override
public void loadInto(Map<String, RouteMeta> atlas) {
atlas.put("/och/api", RouteMeta.build(RouteType.PROVIDER, MogoOCHTaxi.class, "/och/api", "och", null, -1, -2147483648));
}
}

18
OCH/mogo-och-taxi/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogoochtaxi.java
View File

@@ -1,18 +0,0 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IProviderGroup;
import com.mogo.och.taxi.MogoOCHTaxi;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Providers$$mogoochtaxi implements IProviderGroup {
@Override
public void loadInto(Map<String, RouteMeta> providers) {
providers.put("com.mogo.och.IMogoOCH", RouteMeta.build(RouteType.PROVIDER, MogoOCHTaxi.class, "/och/api", "och", null, -1, -2147483648));
}
}

17
OCH/mogo-och-taxi/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogoochtaxi.java
View File

@@ -1,17 +0,0 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.alibaba.android.arouter.facade.template.IRouteRoot;
import java.lang.Class;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Root$$mogoochtaxi implements IRouteRoot {
@Override
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
routes.put("och", ARouter$$Group$$och.class);
}
}

18
OCH/mogo-och-taxi/build/generated/source/buildConfig/debug/com/mogo/och/taxi/BuildConfig.java
View File

@@ -1,18 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.och.taxi;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.och.taxi";
/**
* @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.och.taxi";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0.0";
}

12
OCH/mogo-och-taxi/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
View File

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

1
OCH/mogo-och-taxi/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
View File

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

1
OCH/mogo-och-taxi/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
View File

@@ -1 +0,0 @@
{"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
OCH/mogo-och-taxi/build/intermediates/compile_library_classes/debug/classes.jar
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
View File

Binary file not shown.

2
OCH/mogo-och-taxi/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
View File

@@ -1,2 +0,0 @@
<?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-base-services-apk/src/main/jniLibs"/></dataSet><dataSet config="debug" 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-base-services-apk/src/debug/jniLibs"/></dataSet></merger>

2
OCH/mogo-och-taxi/build/intermediates/incremental/mergeDebugShaders/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/httpdns-tencent/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/src/debug/shaders"/></dataSet></merger>

2
OCH/mogo-och-taxi/build/intermediates/incremental/packageDebugAssets/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/httpdns-tencent/src/main/assets"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/src/debug/assets"/></dataSet></merger>

2
OCH/mogo-och-taxi/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
View File

@@ -1,2 +0,0 @@
#Mon Jan 18 16:01:59 CST 2021
/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_fragment.xml=/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/build/intermediates/packaged_res/debug/layout/module_och_taxi_fragment.xml

2
OCH/mogo-och-taxi/build/intermediates/incremental/packageDebugResources/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/OCH/mogo-och-taxi/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/build/generated/res/resValues/debug"/></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/OCH/mogo-och-taxi/src/main/res"><file name="module_och_taxi_fragment" path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_fragment.xml" qualifiers="" type="layout"/></source><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$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/OCH/mogo-och-taxi/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/OCH/mogo-och-taxi/src/debug/res"/></dataSet><mergedItems/></merger>

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$och.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogoochtaxi.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogoochtaxi.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/BuildConfig.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/IMogoOCHTaxiArriveCallback.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxi.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$1.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$2.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$3.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$4.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$LocationListener.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$OCHArriveNotifyCallback.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$OrderMsgListener.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel$OrderStatusMsgListener.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/MogoOCHTaxiModel.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHOrderStatus.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHOrderStatusCallback.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse$1.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse$OCHTaxiStation$1.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse$OCHTaxiStation.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse2$1.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderResponse2.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderStatus.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiOrderStatusResponse.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/OCHTaxiServiceApi.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/ui/OCHTaxiFragment.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/ui/OCHTaxiPresenter.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/ui/OCHTaxiUiController.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/javac/debug/classes/com/mogo/och/taxi/ui/OCHTaxiView.class
View File

Binary file not shown.

BIN
OCH/mogo-och-taxi/build/intermediates/library_java_res/debug/res.jar
View File

Binary file not shown.

12
OCH/mogo-och-taxi/build/intermediates/library_manifest/debug/AndroidManifest.xml
View File

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

5
OCH/mogo-och-taxi/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
View File

@@ -1,5 +0,0 @@
R_DEF: Internal format may change without notice
local
id autoPilot
id orderInfo
layout module_och_taxi_fragment

14
OCH/mogo-och-taxi/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
View File

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

1
OCH/mogo-och-taxi/build/intermediates/merged_manifests/debug/output.json
View File

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

21
OCH/mogo-och-taxi/build/intermediates/packaged_res/debug/layout/module_och_taxi_fragment.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/orderInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="kong"
android:textColor="#FFFFFF"
android:textSize="20px" />
<Button
android:id="@+id/autoPilot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开启自动驾驶" />
</LinearLayout>

2794
OCH/mogo-och-taxi/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
View File

File diff suppressed because it is too large Load Diff

BIN
OCH/mogo-och-taxi/build/intermediates/runtime_library_classes/debug/classes.jar
View File

Binary file not shown.

3496
OCH/mogo-och-taxi/build/intermediates/symbols/debug/R.txt
View File

File diff suppressed because it is too large Load Diff

37
OCH/mogo-och-taxi/build/outputs/logs/manifest-merger-debug-report.txt
View File

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

18
OCH/mogo-och/build/generated/source/buildConfig/debug/com/mogo/och/BuildConfig.java
View File

@@ -1,18 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.och;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.och";
/**
* @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.och";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0.0";
}

12
OCH/mogo-och/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
View File

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

1
OCH/mogo-och/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
View File

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

1
OCH/mogo-och/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
View File

@@ -1 +0,0 @@
{"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
OCH/mogo-och/build/intermediates/compile_library_classes/debug/classes.jar
View File

Binary file not shown.

BIN
OCH/mogo-och/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
View File

Binary file not shown.

2
OCH/mogo-och/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
View File

@@ -1,2 +0,0 @@
<?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-base-services-apk/src/main/jniLibs"/></dataSet><dataSet config="debug" 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-base-services-apk/src/debug/jniLibs"/></dataSet></merger>

2
OCH/mogo-och/build/intermediates/incremental/mergeDebugShaders/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/httpdns-tencent/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/src/debug/shaders"/></dataSet></merger>

2
OCH/mogo-och/build/intermediates/incremental/packageDebugAssets/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/httpdns-tencent/src/main/assets"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-tencent/src/debug/assets"/></dataSet></merger>

1
OCH/mogo-och/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
View File

@@ -1 +0,0 @@
#Sun Dec 13 11:11:42 CST 2020

2
OCH/mogo-och/build/intermediates/incremental/packageDebugResources/merger.xml
View File

@@ -1,2 +0,0 @@
<?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/httpdns-base/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-base/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-base/build/generated/res/resValues/debug"/></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/httpdns-base/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-base/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/foudations/httpdns-base/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$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/httpdns-base/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$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/httpdns-base/src/debug/res"/></dataSet><mergedItems/></merger>

BIN
OCH/mogo-och/build/intermediates/javac/debug/classes/com/mogo/och/BuildConfig.class
View File

Binary file not shown.

BIN
OCH/mogo-och/build/intermediates/javac/debug/classes/com/mogo/och/IMogoOCH.class
View File

Binary file not shown.

BIN
OCH/mogo-och/build/intermediates/javac/debug/classes/com/mogo/och/OCHConstants.class
View File

Binary file not shown.

BIN
OCH/mogo-och/build/intermediates/library_java_res/debug/res.jar
View File

Binary file not shown.

12
OCH/mogo-och/build/intermediates/library_manifest/debug/AndroidManifest.xml
View File

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

2
OCH/mogo-och/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
View File

@@ -1,2 +0,0 @@
R_DEF: Internal format may change without notice
local

14
OCH/mogo-och/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
View File

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

1
OCH/mogo-och/build/intermediates/merged_manifests/debug/output.json
View File

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

1270
OCH/mogo-och/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
View File

File diff suppressed because it is too large Load Diff

BIN
OCH/mogo-och/build/intermediates/runtime_library_classes/debug/classes.jar
View File

Binary file not shown.

1703
OCH/mogo-och/build/intermediates/symbols/debug/R.txt
View File

File diff suppressed because it is too large Load Diff

37
OCH/mogo-och/build/outputs/logs/manifest-merger-debug-report.txt
View File

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

224
foudations/mogo-utils/src/main/java/com/mogo/utils/CoordinateUtils.java
View File

@@ -1,80 +1,84 @@
package com.mogo.utils;
import org.jetbrains.annotations.NotNull;
import java.math.BigDecimal;
/**
* @author donghongyu
*/
public class CoordinateUtils {
private static double a = 6378245.0;
private static double ee = 0.00669342162296594323;
/**
* 手机GPS坐标转火星坐标
*
* @return
*/
public static double[] transformFromWGSToGCJ( double lat, double lon ) {
//如果在国外，则默认不进行转换
if ( outOfChina( lat, lon ) ) {
return new double[]{lat, lon};
}
double dLat = transformLat( lon - 105.0, lat - 35.0 );
double dLon = transformLon( lon - 105.0, lat - 35.0 );
double radLat = lat / 180.0 * Math.PI;
double magic = Math.sin( radLat );
magic = 1 - ee * magic * magic;
double sqrtMagic = Math.sqrt( magic );
dLat = ( dLat * 180.0 ) / ( ( a * ( 1 - ee ) ) / ( magic * sqrtMagic ) * Math.PI );
dLon = ( dLon * 180.0 ) / ( a / sqrtMagic * Math.cos( radLat ) * Math.PI );
return new double[]{lat + dLat, lon + dLon};
}
public static double transformLat( double x, double y ) {
double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt( x > 0 ? x : -x );
ret += ( 20.0 * Math.sin( 6.0 * x * Math.PI ) + 20.0 * Math.sin( 2.0 * x * Math.PI ) ) * 2.0 / 3.0;
ret += ( 20.0 * Math.sin( y * Math.PI ) + 40.0 * Math.sin( y / 3.0 * Math.PI ) ) * 2.0 / 3.0;
ret += ( 160.0 * Math.sin( y / 12.0 * Math.PI ) + 320 * Math.sin( y * Math.PI / 30.0 ) ) * 2.0 / 3.0;
return ret;
}
public static double transformLon( double x, double y ) {
double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt( x > 0 ? x : -x );
ret += ( 20.0 * Math.sin( 6.0 * x * Math.PI ) + 20.0 * Math.sin( 2.0 * x * Math.PI ) ) * 2.0 / 3.0;
ret += ( 20.0 * Math.sin( x * Math.PI ) + 40.0 * Math.sin( x / 3.0 * Math.PI ) ) * 2.0 / 3.0;
ret += ( 150.0 * Math.sin( x / 12.0 * Math.PI ) + 300.0 * Math.sin( x / 30.0 * Math.PI ) ) * 2.0 / 3.0;
return ret;
}
public static boolean outOfChina( double lat, double lon ) {
if ( lon < 72.004 || lon > 137.8347 )
return true;
if ( lat < 0.8293 || lat > 55.8271 )
return true;
return false;
}
public static final double[] transformGcj02toWgs84( double lat, double lng ) {
double[] var10000;
if ( outOfChina( lat, lng ) ) {
var10000 = new double[]{lng, lat};
} else {
double dlat = transformLat( lng - 105.0D, lat - 35.0D );
double dlng = transformLon( lng - 105.0D, lat - 35.0D );
double radlat = lat / 180.0D * Math.PI;
double magic = Math.sin( radlat );
magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
double sqrtmagic = Math.sqrt( magic );
dlat = dlat * 180.0D / ( 6335552.717000426D / ( magic * sqrtmagic ) * Math.PI );
dlng = dlng * 180.0D / ( 6378245.0D / sqrtmagic * Math.cos( radlat ) * Math.PI );
double mglat = lat + dlat;
double mglng = lng + dlng;
var10000 = new double[]{lng * ( double ) 2 - mglng, lat * ( double ) 2 - mglat};
}
return var10000;
}
// private static double a = 6378245.0;
// private static double ee = 0.00669342162296594323;
//
// /**
// * 手机GPS坐标转火星坐标
// *
// * @return
// */
// public static double[] transformFromWGSToGCJ( double lat, double lon ) {
//
// //如果在国外，则默认不进行转换
// if ( outOfChina( lat, lon ) ) {
// return new double[]{lat, lon};
// }
// double dLat = transformLat( lon - 105.0, lat - 35.0 );
// double dLon = transformLon( lon - 105.0, lat - 35.0 );
// double radLat = lat / 180.0 * Math.PI;
// double magic = Math.sin( radLat );
// magic = 1 - ee * magic * magic;
// double sqrtMagic = Math.sqrt( magic );
// dLat = ( dLat * 180.0 ) / ( ( a * ( 1 - ee ) ) / ( magic * sqrtMagic ) * Math.PI );
// dLon = ( dLon * 180.0 ) / ( a / sqrtMagic * Math.cos( radLat ) * Math.PI );
//
// return new double[]{lat + dLat, lon + dLon};
// }
//
// public static double transformLat( double x, double y ) {
// double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt( x > 0 ? x : -x );
// ret += ( 20.0 * Math.sin( 6.0 * x * Math.PI ) + 20.0 * Math.sin( 2.0 * x * Math.PI ) ) * 2.0 / 3.0;
// ret += ( 20.0 * Math.sin( y * Math.PI ) + 40.0 * Math.sin( y / 3.0 * Math.PI ) ) * 2.0 / 3.0;
// ret += ( 160.0 * Math.sin( y / 12.0 * Math.PI ) + 320 * Math.sin( y * Math.PI / 30.0 ) ) * 2.0 / 3.0;
// return ret;
// }
//
// public static double transformLon( double x, double y ) {
// double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt( x > 0 ? x : -x );
// ret += ( 20.0 * Math.sin( 6.0 * x * Math.PI ) + 20.0 * Math.sin( 2.0 * x * Math.PI ) ) * 2.0 / 3.0;
// ret += ( 20.0 * Math.sin( x * Math.PI ) + 40.0 * Math.sin( x / 3.0 * Math.PI ) ) * 2.0 / 3.0;
// ret += ( 150.0 * Math.sin( x / 12.0 * Math.PI ) + 300.0 * Math.sin( x / 30.0 * Math.PI ) ) * 2.0 / 3.0;
// return ret;
// }
//
// public static boolean outOfChina( double lat, double lon ) {
// if ( lon < 72.004 || lon > 137.8347 )
// return true;
// if ( lat < 0.8293 || lat > 55.8271 )
// return true;
// return false;
// }
//
// public static final double[] transformGcj02toWgs84( double lat, double lng ) {
// double[] var10000;
// if ( outOfChina( lat, lng ) ) {
// var10000 = new double[]{lng, lat};
// } else {
// double dlat = transformLat( lng - 105.0D, lat - 35.0D );
// double dlng = transformLon( lng - 105.0D, lat - 35.0D );
// double radlat = lat / 180.0D * Math.PI;
// double magic = Math.sin( radlat );
// magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
// double sqrtmagic = Math.sqrt( magic );
// dlat = dlat * 180.0D / ( 6335552.717000426D / ( magic * sqrtmagic ) * Math.PI );
// dlng = dlng * 180.0D / ( 6378245.0D / sqrtmagic * Math.cos( radlat ) * Math.PI );
// double mglat = lat + dlat;
// double mglng = lng + dlng;
// var10000 = new double[]{lng * ( double ) 2 - mglng, lat * ( double ) 2 - mglat};
// }
//
// return var10000;
// }
/**
* @param lon1
@@ -116,4 +120,84 @@ public class CoordinateUtils {
}
}
// ------
private static final double x_PI = 52.35987755982988D;
private static final double PI = 3.141592653589793D;
private static final double a = 6378245.0D;
private static final double ee = 0.006693421622965943D;
public static final boolean outOfChina( double lat, double lng ) {
return lng <= 73.66D || lng >= 135.05D || lat <= 3.86D || lat >= 53.55D;
}
private static final double transformLat( double lng, double lat ) {
double ret = -100.0D + 2.0D * lng + 3.0D * lat + 0.2D * lat * lat + 0.1D * lng * lat + 0.2D * Math.sqrt( Math.abs( lng ) );
ret += ( 20.0D * Math.sin( 6.0D * lng * 3.141592653589793D ) + 20.0D * Math.sin( 2.0D * lng * 3.141592653589793D ) ) * 2.0D / 3.0D;
ret += ( 20.0D * Math.sin( lat * 3.141592653589793D ) + 40.0D * Math.sin( lat / 3.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
ret += ( 160.0D * Math.sin( lat / 12.0D * 3.141592653589793D ) + ( double ) 320 * Math.sin( lat * 3.141592653589793D / 30.0D ) ) * 2.0D / 3.0D;
return ret;
}
private static final double transformLon( double lng, double lat ) {
double ret = 300.0D + lng + 2.0D * lat + 0.1D * lng * lng + 0.1D * lng * lat + 0.1D * Math.sqrt( Math.abs( lng ) );
ret += ( 20.0D * Math.sin( 6.0D * lng * 3.141592653589793D ) + 20.0D * Math.sin( 2.0D * lng * 3.141592653589793D ) ) * 2.0D / 3.0D;
ret += ( 20.0D * Math.sin( lng * 3.141592653589793D ) + 40.0D * Math.sin( lng / 3.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
ret += ( 150.0D * Math.sin( lng / 12.0D * 3.141592653589793D ) + 300.0D * Math.sin( lng / 30.0D * 3.141592653589793D ) ) * 2.0D / 3.0D;
return ret;
}
@NotNull
// World Geodetic System ==> Mars Geodetic System
public static final double[] transformWgsToGcj( double wgLat, double wgLon ) {
double[] point = new double[2];
if ( outOfChina( wgLat, wgLon ) ) {
point[0] = wgLon;
point[1] = wgLat;
return point;
} else {
double dLat = transformLat( wgLon - 105.0D, wgLat - 35.0D );
double dLon = transformLon( wgLon - 105.0D, wgLat - 35.0D );
double radLat = wgLat / 180.0D * 3.141592653589793D;
double magic = Math.sin( radLat );
magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
double sqrtMagic = Math.sqrt( magic );
dLat = dLat * 180.0D / ( 6335552.717000426D / ( magic * sqrtMagic ) * 3.141592653589793D );
dLon = dLon * 180.0D / ( 6378245.0D / sqrtMagic * Math.cos( radLat ) * 3.141592653589793D );
double mgLat = wgLat + dLat;
double mgLon = wgLon + dLon;
point[0] = dealRound( mgLon );
point[1] = dealRound( mgLat );
return point;
}
}
@NotNull
public static final double[] transformGcj02toWgs84( double lat, double lng ) {
double[] var10000;
if ( outOfChina( lat, lng ) ) {
var10000 = new double[]{lng, lat};
} else {
double dlat = transformLat( lng - 105.0D, lat - 35.0D );
double dlng = transformLon( lng - 105.0D, lat - 35.0D );
double radlat = lat / 180.0D * 3.141592653589793D;
double magic = Math.sin( radlat );
magic = ( double ) 1 - 0.006693421622965943D * magic * magic;
double sqrtmagic = Math.sqrt( magic );
dlat = dlat * 180.0D / ( 6335552.717000426D / ( magic * sqrtmagic ) * 3.141592653589793D );
dlng = dlng * 180.0D / ( 6378245.0D / sqrtmagic * Math.cos( radlat ) * 3.141592653589793D );
double mglat = lat + dlat;
double mglng = lng + dlng;
var10000 = new double[]{dealRound( lng * ( double ) 2 - mglng ), dealRound( lat * ( double ) 2 - mglat )};
}
return var10000;
}
private static final double dealRound( double value ) {
BigDecimal bg = new BigDecimal( value );
double result = bg.setScale( 6, 4 ).doubleValue();
return result;
}
}

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.9.8'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.9.9'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
}

3
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -190,6 +190,7 @@ public class AMapViewWrapper implements IMogoMapView,
mMapView.setOnMapTouchListener( this );
mMapView.setOnMapClickListener( this );
mMapView.getLocationClient().registerListener( this );
// mMapView.getLocationClient().registerGpsListener( this );
mMapView.registerListener( this, MapAutoApi.LISTENER_TYPE_ZOOM );
mMapView.registerListener( this, MapAutoApi.LISTENER_TYPE_ROTATE );
mMapView.registerListener( this, MapAutoApi.LISTENER_TYPE_3D );
@@ -955,7 +956,7 @@ public class AMapViewWrapper implements IMogoMapView,
public void rtkEnable( boolean enable ) {
try {
mRtkEnable = !mRtkEnable;
TipToast.shortTip( mRtkEnable ? "已开启gps道路匹配" : "已开启rtk道路匹配" );
TipToast.shortTip( mRtkEnable ? "已开启rtk道路匹配" : "已开启gps道路匹配" );
mMapView.getLocationClient().rtkEnable( mRtkEnable );
} catch ( Exception e ) {
Logger.e( TAG, e, "rtkEnable" );

2
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java
View File

@@ -72,7 +72,7 @@ public class ALocationClient implements IMogoLocationClient {
destroyWarming();
return;
}
if ( mClient != null && mClient.isStarted() ) {
if ( mClient != null && mClient.isAGpsStarted() ) {
mClient.stop();
}
}

1
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
View File

@@ -207,6 +207,7 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen
long interval = cloudRoadData.getSystemTime() - lastPosition.getSystemTime();
long interval2 = cloudRoadData.getSatelliteTime() - lastPosition.getSatelliteTime();
interval2 = interval < interval2 || interval2 == 0 ? interval : interval2;
interval2 = interval2 > 1_000L ? 1_000L : interval2;
marker.startSmoothInMs( points, interval2 );
Logger.d( TAG, "平滑移动 - %s duration = %s", uniqueKey, interval2 );
}

6
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
View File

@@ -36,10 +36,10 @@ public class CloudLocationInfo implements Parcelable {
}
public void convertCoor2GCJ02(){
double[] amapCoord = CoordinateUtils.transformFromWGSToGCJ( lat, lon );
double[] amapCoord = CoordinateUtils.transformWgsToGcj( lat, lon );
if ( amapCoord != null ) {
this.lat = amapCoord[0];
this.lon = amapCoord[1];
this.lat = amapCoord[1];
this.lon = amapCoord[0];
}
}

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -467,8 +467,8 @@ public class MockIntentHandler implements IntentHandler {
{40.20254135131836, 116.7392807006836}};
for ( double[] coor : coors ) {
double lat = coor[0], lon = coor[1];
double[] translateCoor = CoordinateUtils.transformFromWGSToGCJ( lat, lon );
double[] originCoor = CoordinateUtils.transformGcj02toWgs84( translateCoor[0], translateCoor[1] );
double[] translateCoor = CoordinateUtils.transformWgsToGcj( lat, lon );
double[] originCoor = CoordinateUtils.transformGcj02toWgs84( translateCoor[1], translateCoor[0] );
double delta = CoordinateUtils.calculateLineDistance( lon, lat, originCoor[0], originCoor[1] );
Logger.d( TAG, "偏差值：%s", delta );
}

4
modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
View File

@@ -8,8 +8,8 @@
<dimen name="module_small_map_view_width">250px</dimen>
<dimen name="module_small_map_view_height">250px</dimen>
<dimen name="module_small_map_view_x">1490px</dimen>
<dimen name="module_small_map_view_y">650px</dimen>
<dimen name="module_small_map_view_x">1525px</dimen>
<dimen name="module_small_map_view_y">695px</dimen>
<dimen name="module_small_map_big_view_x">0px</dimen>
<dimen name="module_small_map_big_view_y">0px</dimen>

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
View File

@@ -293,10 +293,10 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
if (ObuConfig.useObuLocation) {
MogoLocation currentLocation = new MogoLocation();
double coor[] = CoordinateUtils.transformFromWGSToGCJ(locationInfo.getLat(), locationInfo.getLon());
double coor[] = CoordinateUtils.transformWgsToGcj(locationInfo.getLat(), locationInfo.getLon());
currentLocation.setLatitude(coor[0]);
currentLocation.setLongitude(coor[1]);
currentLocation.setLatitude(coor[1]);
currentLocation.setLongitude(coor[0]);
currentLocation.setBearing(computeCarAngle(currentLocation));
V2XObuEventScenario.getInstance().updateLocation(currentLocation);

10
services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java
View File

@@ -72,10 +72,10 @@ class AdasObjectUtils {
result.uuid = rectBean.getUuid();
double amapCoord[] = CoordinateUtils.transformFromWGSToGCJ( rectBean.getLat(), rectBean.getLon() );
double amapCoord[] = CoordinateUtils.transformWgsToGcj( rectBean.getLat(), rectBean.getLon() );
if ( amapCoord != null ) {
result.lat = amapCoord[0];
result.lon = amapCoord[1];
result.lat = amapCoord[1];
result.lon = amapCoord[0];
} else {
result.lat = rectBean.getLat();
result.lon = rectBean.getLon();
@@ -120,8 +120,8 @@ class AdasObjectUtils {
recognizedListResult.distanceX = model.getDistance_x();
recognizedListResult.distanceY = model.getDistance_y();
}
double amapCoord[] = CoordinateUtils.transformFromWGSToGCJ( model.getLat(), model.getLon() );
recognizedListResult.latLonList.add( new ADASRecognizedListResult.LatLon( amapCoord[0], amapCoord[1] ) );
double amapCoord[] = CoordinateUtils.transformWgsToGcj( model.getLat(), model.getLon() );
recognizedListResult.latLonList.add( new ADASRecognizedListResult.LatLon( amapCoord[1], amapCoord[0] ) );
}
}
if ( result.isEmpty() ) {