From 6891d97505cb73fe9279572525ebbcf1afd28bb9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 23 Feb 2021 14:59:16 +0800 Subject: [PATCH] opt --- libraries/tanlulib/build.gradle | 2 +- .../service/CarCorderController.kt | 10 +- .../common/entity/MogoSnapshotSetData.aidl | 2 +- .../IMachineVisionInterface.aidl | 2 +- modules/mogo-module-share/build.gradle | 2 +- modules/mogo-modules-mvision/.gitignore | 1 - modules/mogo-modules-mvision/build.gradle | 60 ------ .../mogo-modules-mvision/consumer-rules.pro | 0 .../mogo-modules-mvision/gradle.properties | 3 - .../mogo-modules-mvision/proguard-rules.pro | 21 -- .../vision/ExampleInstrumentedTest.java | 26 --- .../src/main/AndroidManifest.xml | 10 - .../vision/IMogoMachineVisionProvider.java | 15 -- .../vision/MachineVisionMapService.java | 182 ------------------ .../machine/vision/MachineVisionMapView.java | 38 ---- .../vision/MachineVisionMapViewHandler.java | 62 ------ .../vision/MogoMachineVisionProvider.java | 61 ------ .../res/layout/module_mvision_layout_view.xml | 16 -- .../src/main/res/values-xhdpi/dimens.xml | 12 -- .../machine/vision/ExampleUnitTest.java | 17 -- 20 files changed, 12 insertions(+), 530 deletions(-) delete mode 100644 modules/mogo-modules-mvision/.gitignore delete mode 100644 modules/mogo-modules-mvision/build.gradle delete mode 100644 modules/mogo-modules-mvision/consumer-rules.pro delete mode 100644 modules/mogo-modules-mvision/gradle.properties delete mode 100644 modules/mogo-modules-mvision/proguard-rules.pro delete mode 100644 modules/mogo-modules-mvision/src/androidTest/java/com/mogo/module/machine/vision/ExampleInstrumentedTest.java delete mode 100644 modules/mogo-modules-mvision/src/main/AndroidManifest.xml delete mode 100644 modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/IMogoMachineVisionProvider.java delete mode 100644 modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapService.java delete mode 100644 modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapView.java delete mode 100644 modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java delete mode 100644 modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MogoMachineVisionProvider.java delete mode 100644 modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml delete mode 100644 modules/mogo-modules-mvision/src/main/res/values-xhdpi/dimens.xml delete mode 100644 modules/mogo-modules-mvision/src/test/java/com/mogo/module/machine/vision/ExampleUnitTest.java diff --git a/libraries/tanlulib/build.gradle b/libraries/tanlulib/build.gradle index 9cb0c7210b..8ade04975a 100644 --- a/libraries/tanlulib/build.gradle +++ b/libraries/tanlulib/build.gradle @@ -66,7 +66,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.uploadroadinfo + implementation rootProject.ext.dependencies.mogoaicloudtanlu if (Boolean.valueOf(RELEASE)) { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 2f824402d2..717902edcf 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -44,6 +44,12 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { private var mLatitude: Double = 0.0 private var mSpeed: Float = 0f + private var mAddress: String = "" + private var mDirection: Float = 0f + private var mAreaCode: String = "" + private var mCityCode: String = "" + + private var getVideoFailed: (() -> Unit)? = null private var interceptors: ArrayList = ArrayList(1) @@ -130,8 +136,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { // } else { //失败了，传空地址，发起请求 val entity = TakeEntity(isCustom, id, fromType) - videoAndThumbMap["video"] = "" - videoAndThumbMap["thumb"] = "" +// videoAndThumbMap["video"] = "" +// videoAndThumbMap["thumb"] = "" // CosStatusController().sendInformationDirectly( // INFO_TYPE_VIDEO, diff --git a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/entity/MogoSnapshotSetData.aidl b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/entity/MogoSnapshotSetData.aidl index 52a9105824..4666fc2730 100644 --- a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/entity/MogoSnapshotSetData.aidl +++ b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/entity/MogoSnapshotSetData.aidl @@ -1,3 +1,3 @@ // ShapshotSetData.aidl -package com.mogo.module.common.entity; +package com.mogo.realtime.entity; parcelable MogoSnapshotSetData; diff --git a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl index c456abaca1..a1b52ff1de 100644 --- a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl +++ b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl @@ -1,6 +1,6 @@ // IMachineVisionInterface.aidl package com.mogo.module.common.machinevision; -import com.mogo.module.common.entity.MogoSnapshotSetData; +import com.mogo.realtime.entity.MogoSnapshotSetData; // Declare any non-default types here with import statements diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index ff0ca393b8..1c1221a11e 100644 --- a/modules/mogo-module-share/build.gradle +++ b/modules/mogo-module-share/build.gradle @@ -46,7 +46,7 @@ dependencies { kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.uploadroadinfo + implementation rootProject.ext.dependencies.mogoaicloudtanlu if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils diff --git a/modules/mogo-modules-mvision/.gitignore b/modules/mogo-modules-mvision/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/modules/mogo-modules-mvision/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/modules/mogo-modules-mvision/build.gradle b/modules/mogo-modules-mvision/build.gradle deleted file mode 100644 index ebff9c6729..0000000000 --- a/modules/mogo-modules-mvision/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.alibaba.arouter' - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName()] - } - } - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 - } - -} -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler - if (Boolean.valueOf(RELEASE)) { - api rootProject.ext.dependencies.mogomap - api rootProject.ext.dependencies.mogomapapi - api rootProject.ext.dependencies.mogoutils - api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.modulecommon - } else { - api project(":libraries:mogo-map") - api project(":libraries:mogo-map-api") - api project(":foudations:mogo-utils") - api project(":foudations:mogo-commons") - api project(':services:mogo-service-api') - implementation project(':modules:mogo-module-common') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-modules-mvision/consumer-rules.pro b/modules/mogo-modules-mvision/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/mogo-modules-mvision/gradle.properties b/modules/mogo-modules-mvision/gradle.properties deleted file mode 100644 index d905dbfdd1..0000000000 --- a/modules/mogo-modules-mvision/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-machine-vision -VERSION_CODE=1 diff --git a/modules/mogo-modules-mvision/proguard-rules.pro b/modules/mogo-modules-mvision/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/modules/mogo-modules-mvision/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/androidTest/java/com/mogo/module/machine/vision/ExampleInstrumentedTest.java b/modules/mogo-modules-mvision/src/androidTest/java/com/mogo/module/machine/vision/ExampleInstrumentedTest.java deleted file mode 100644 index 3b66fb5c01..0000000000 --- a/modules/mogo-modules-mvision/src/androidTest/java/com/mogo/module/machine/vision/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.module.machine.vision; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals( "com.mogo.module.machine.vision.test", appContext.getPackageName() ); - } -} \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/main/AndroidManifest.xml b/modules/mogo-modules-mvision/src/main/AndroidManifest.xml deleted file mode 100644 index 4188fe3b46..0000000000 --- a/modules/mogo-modules-mvision/src/main/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/IMogoMachineVisionProvider.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/IMogoMachineVisionProvider.java deleted file mode 100644 index f87f55e13a..0000000000 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/IMogoMachineVisionProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.module.machine.vision; - -import com.mogo.service.module.IMogoModuleProvider; - -public -/** - * @author congtaowang - * @since 2020/10/27 - *

- * 描述 - */ -interface IMogoMachineVisionProvider extends IMogoModuleProvider { - - String path = "/machinevision/api"; -} diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapService.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapService.java deleted file mode 100644 index 7bb820473b..0000000000 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapService.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.mogo.module.machine.vision; - -import android.app.Service; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; -import android.os.RemoteException; -import android.view.Gravity; -import android.view.View; -import android.view.WindowManager; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.mogo.module.common.entity.MogoSnapshotSetData; -import com.mogo.module.common.machinevision.IMachineVisionInterface; -import com.mogo.module.common.wm.WindowManagerView; -import com.mogo.utils.UiThreadHandler; -import com.mogo.utils.logger.Logger; - -public -/** - * @author congtaowang - * @since 2020/10/26 - * - * 描述 - */ -class MachineVisionMapService extends Service { - - private static final String TAG = "MachineVisionMapService"; - - private IBinder mBinder; - - private WindowManagerView mMachineVisionMapViewManager; - private View mRootView; - private View mClickView; - private MachineVisionMapView mMapView; - - @Nullable - @Override - public IBinder onBind( Intent intent ) { - mBinder = new MachineVisionMapServiceBinder(); - addMachineVisionMapView(); - Logger.d( TAG, "onBind" ); - return mBinder; - } - - @Override - public boolean onUnbind( Intent intent ) { - if ( mMachineVisionMapViewManager != null && mMachineVisionMapViewManager.isShowing() ) { - mMachineVisionMapViewManager.dismiss(); - } - MachineVisionMapViewHandler.getInstance().destroyMapView(); - mMachineVisionMapViewManager = null; - Logger.d( TAG, "onUnbind" ); - return true; - } - - @Override - public void onRebind( Intent intent ) { - super.onRebind( intent ); - addMachineVisionMapView(); - Logger.d( TAG, "onRebind" ); - } - - @Override - public void onCreate() { - super.onCreate(); - } - - public class MachineVisionMapServiceBinder extends IMachineVisionInterface.Stub { - - private static final String TAG = "MachineVisionMapServiceBinder"; - - @Override - public void postData( MogoSnapshotSetData data ) throws RemoteException { - Logger.d( TAG, "current Thread：%s", Thread.currentThread().getName() ); - MachineVisionMapViewHandler.getInstance().renderSnapshotSetData( data ); - } - - @Override - public void linkToDeath( @NonNull DeathRecipient recipient, int flags ) { - super.linkToDeath( recipient, flags ); - } - - @Override - public boolean unlinkToDeath( @NonNull DeathRecipient recipient, int flags ) { - return super.unlinkToDeath( recipient, flags ); - } - - @Override - public void hideViewIfExist() throws RemoteException { - if ( mRootView != null ) { - Logger.d( TAG, "hideViewIfExist" ); - UiThreadHandler.post( () -> { - if ( mRootView != null ) { - mRootView.setVisibility( View.GONE ); - } - } ); - } - } - - @Override - public void showViewIfExist() throws RemoteException { - if ( mRootView != null ) { - Logger.d( TAG, "showViewIfExist" ); - UiThreadHandler.post( () -> { - if ( mRootView != null ) { - mRootView.setVisibility( View.VISIBLE ); - } - } ); - } - } - } - - private boolean isSmall = true; - - private void addMachineVisionMapView() { - mMachineVisionMapViewManager = new WindowManagerView.Builder( getApplicationContext() ) - .contentView( R.layout.module_mvision_layout_view ) - .size( - WindowManager.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.WRAP_CONTENT - ) - .position( - getResources().getDimensionPixelOffset( R.dimen.module_mvision_view_x ), - getResources().getDimensionPixelOffset( R.dimen.module_mvision_view_y ) - ) - .gravity( Gravity.TOP | Gravity.LEFT ) - .showInWindowManager(); - mRootView = mMachineVisionMapViewManager.findViewById( R.id.module_mvision_map_root ); - mClickView = mMachineVisionMapViewManager.findViewById(R.id.module_mvision_map_click); - mMapView = mMachineVisionMapViewManager.findViewById(R.id.module_mvision_map_view); - MachineVisionMapViewHandler.getInstance().setMachineVisionMapView( mMapView ); - mMachineVisionMapViewManager.show(); - - mClickView.setOnClickListener(v -> { - int width, height, x, y; - if (isSmall) { - // 变大 - isSmall = false; - width = getResources().getDimensionPixelSize(R.dimen.module_mvision_big_view_width); - height = getResources().getDimensionPixelSize(R.dimen.module_mvision_big_view_height); - x = getResources().getDimensionPixelSize(R.dimen.module_mvision_big_view_x); - y = getResources().getDimensionPixelSize(R.dimen.module_mvision_big_view_y); - }else{ - // 变小 - isSmall = true; - width = getResources().getDimensionPixelSize(R.dimen.module_mvision_view_width); - height = getResources().getDimensionPixelSize(R.dimen.module_mvision_view_height); - x = getResources().getDimensionPixelSize(R.dimen.module_mvision_view_x); - y = getResources().getDimensionPixelSize(R.dimen.module_mvision_view_y); - } - mRootView.getLayoutParams().width = width; - mRootView.getLayoutParams().height = height; - mRootView.setLayoutParams(mRootView.getLayoutParams()); - - mClickView.getLayoutParams().width = width; - mClickView.getLayoutParams().height = height; - mClickView.setLayoutParams(mClickView.getLayoutParams()); - - mMapView.getLayoutParams().width = width; - mMapView.getLayoutParams().height = height; - mMapView.setLayoutParams(mMapView.getLayoutParams()); - - mMachineVisionMapViewManager.exchangeSizeAndPosition(width, height, x, y); - Logger.d(TAG, "zoom out map view"); - }); - } - - @Override - public void onDestroy() { - super.onDestroy(); - MachineVisionMapViewHandler.getInstance().release(); - if ( mMachineVisionMapViewManager != null ) { - mMachineVisionMapViewManager.dismiss(); - mRootView = null; - mClickView = null; - mMapView = null; - } - } -} diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapView.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapView.java deleted file mode 100644 index 6b70ef1b3b..0000000000 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapView.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mogo.module.machine.vision; - -import android.content.Context; -import android.util.AttributeSet; - -import androidx.annotation.Nullable; - -import com.mogo.map.MogoBaseMapView; -import com.mogo.utils.logger.Logger; - -public -/** - * @author congtaowang - * @since 2020/10/26 - * - * 描述 - */ -class MachineVisionMapView extends MogoBaseMapView { - - private static final String TAG = "MachineVisionMapView"; - - public MachineVisionMapView( Context context ) { - this( context, null ); - } - - public MachineVisionMapView( Context context, @Nullable AttributeSet attrs ) { - this( context, attrs, 0 ); - } - - public MachineVisionMapView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { - super( context, attrs, defStyleAttr ); - } - - @Override - protected void addMapView( Context context ) { - Logger.d(TAG, "addMapView"); - } -} diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java deleted file mode 100644 index b918a60d6b..0000000000 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.mogo.module.machine.vision; - -import com.mogo.module.common.drawer.SnapshotSetDataDrawer; -import com.mogo.module.common.entity.MogoSnapshotSetData; - -public -/** - * @author congtaowang - * @since 2020/10/27 - * - * 描述 - */ -class MachineVisionMapViewHandler { - - private static volatile MachineVisionMapViewHandler sInstance; - - private MachineVisionMapViewHandler() { - } - - public static MachineVisionMapViewHandler getInstance() { - if ( sInstance == null ) { - synchronized ( MachineVisionMapViewHandler.class ) { - if ( sInstance == null ) { - sInstance = new MachineVisionMapViewHandler(); - } - } - } - return sInstance; - } - - public synchronized void release() { - sInstance = null; - mMachineVisionMapView = null; - } - - private Object readResolve() { - // 阻止反序列化，必须实现 Serializable 接口 - return sInstance; - } - - private MachineVisionMapView mMachineVisionMapView; - - public void setMachineVisionMapView( MachineVisionMapView mMachineVisionMapView ) { - this.mMachineVisionMapView = mMachineVisionMapView; - } - - public void destroyMapView(){ - if ( mMachineVisionMapView != null ) { - mMachineVisionMapView.onDestroy(); - } - } - - public void renderSnapshotSetData( MogoSnapshotSetData data ) { - if ( data == null ) { - return; - } - if ( mMachineVisionMapView == null ) { - return; - } - SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, true ); - } -} diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MogoMachineVisionProvider.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MogoMachineVisionProvider.java deleted file mode 100644 index a33c945ccc..0000000000 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MogoMachineVisionProvider.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.mogo.module.machine.vision; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.AbsMogoApplication; - -public -/** - * @author congtaowang - * @since 2020/10/27 - * - * 描述 - */ -@Route( path = IMogoMachineVisionProvider.path) -class MogoMachineVisionProvider implements IMogoMachineVisionProvider { - - private static final String TAG = "MogoMachineVisionProvider"; - - private Intent mMachineVisionServiceIntent; - - @Override - public Fragment createFragment( Context context, Bundle data ) { - return null; - } - - @Override - public View createView( Context context ) { - return null; - } - - @NonNull - @Override - public String getModuleName() { - return null; - } - - @Override - public int getType() { - return 0; - } - - @Override - public void init( Context context ) { - mMachineVisionServiceIntent = new Intent( context, MachineVisionMapService.class ); - context.startService( mMachineVisionServiceIntent ); - } - - @Override - public void onDestroy() { - if ( mMachineVisionServiceIntent != null ) { - AbsMogoApplication.getApp().stopService( mMachineVisionServiceIntent ); - } - } -} diff --git a/modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml b/modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml deleted file mode 100644 index ca3cd5c8a5..0000000000 --- a/modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-modules-mvision/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index d7917ae5cf..0000000000 --- a/modules/mogo-modules-mvision/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 460px - 460px - 204px - 368px - - 0px - 0px - 1920px - 1080px - \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/test/java/com/mogo/module/machine/vision/ExampleUnitTest.java b/modules/mogo-modules-mvision/src/test/java/com/mogo/module/machine/vision/ExampleUnitTest.java deleted file mode 100644 index fefd93d5cd..0000000000 --- a/modules/mogo-modules-mvision/src/test/java/com/mogo/module/machine/vision/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.module.machine.vision; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file