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

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source 
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
This commit is contained in:
董宏宇
2020-01-09 16:35:19 +08:00
parent 51b77c52e2 0c3563692f
commit ed98d3684f
42 changed files with 647 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/mogo-module-main/src/androidTest/java/com/mogo/module/main/ExampleInstrumentedTest.java
View File

@@ -1,27 +0,0 @@
package com.mogo.module.main;
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 <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@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.main.test", appContext.getPackageName() );
}
}

11
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -22,8 +22,6 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.main.MainActivity;
import com.mogo.module.main.receiver.MogoReceiver;
import com.mogo.module.service.ServiceConst;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.module.ModuleType;
@@ -439,6 +437,15 @@ public class MogoModulesManager implements MogoModulesHandler,
mEnableModuleName = null;
}
@Override
public void onCalculateSuccess() {
}
@Override
public void onoCalculateFailed() {
}
@Override
public void onMarkerReceive(IMogoMarker marker) {
for (IMogoModuleProvider value : mModuleProviders.values()) {

17
modules/mogo-module-main/src/test/java/com/mogo/module/main/ExampleUnitTest.java
View File

@@ -1,17 +0,0 @@
package com.mogo.module.main;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals( 4, 2 + 2 );
}
}