diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1f5251d..b7c9404 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/AppHome/build.gradle b/AppHome/build.gradle index c11b3dd..b126d01 100644 --- a/AppHome/build.gradle +++ b/AppHome/build.gradle @@ -40,7 +40,7 @@ dependencies { //载入界面 implementation 'com.kaopiz:kprogresshud:1.1.0' - compile project(path: ':BaseModel') - compile project(path: ':ResModl') - compile project(path: ':RefreshRecyclerView') + api project(path: ':BaseModel') + api project(path: ':ResModl') + api project(path: ':RefreshRecyclerView') } diff --git a/BaseModel/build.gradle b/BaseModel/build.gradle index 5364eee..5a7732b 100644 --- a/BaseModel/build.gradle +++ b/BaseModel/build.gradle @@ -66,5 +66,5 @@ dependencies { //毛玻璃 implementation 'jp.wasabeef:glide-transformations:3.0.0' // compile project(path: ':app') - compile project(path: ':ResModl') + api project(path: ':ResModl') } diff --git a/GameDataModel/build.gradle b/GameDataModel/build.gradle index a9b5e47..ab3abc5 100644 --- a/GameDataModel/build.gradle +++ b/GameDataModel/build.gradle @@ -33,5 +33,5 @@ dependencies { androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' - implementation project(path: ':ResModl') + api project(path: ':ResModl') } diff --git a/MgListModel/build.gradle b/MgListModel/build.gradle index 6b6523e..4b3730e 100644 --- a/MgListModel/build.gradle +++ b/MgListModel/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'com.github.limedroid:XRichText:v1.0.0' //富文本 implementation 'com.github.limedroid:XRichText:v1.0.0' - compile project(path: ':BaseModel') - compile project(path: ':ResModl') - compile project(path: ':RefreshRecyclerView') + api project(path: ':BaseModel') + api project(path: ':ResModl') + api project(path: ':RefreshRecyclerView') } diff --git a/RefreshRecyclerView/build.gradle b/RefreshRecyclerView/build.gradle index eb4902b..131020c 100644 --- a/RefreshRecyclerView/build.gradle +++ b/RefreshRecyclerView/build.gradle @@ -19,7 +19,7 @@ android { } dependencies { - compile 'com.android.support:recyclerview-v7:26+' + implementation 'com.android.support:recyclerview-v7:26+' } ext { diff --git a/UserModel/src/androidTest/java/com/jobs/usermodel/ExampleInstrumentedTest.java b/UserModel/src/androidTest/java/com/jobs/usermodel/ExampleInstrumentedTest.java deleted file mode 100644 index 88c03e2..0000000 --- a/UserModel/src/androidTest/java/com/jobs/usermodel/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jobs.usermodel; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.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.getTargetContext(); - - assertEquals("com.jobs.usermodel.test", appContext.getPackageName()); - } -} diff --git a/UserModel/src/main/java/Interfaces/BaseActivityInterface.java b/UserModel/src/main/java/Interfaces/BaseActivityInterface.java new file mode 100644 index 0000000..bbfc063 --- /dev/null +++ b/UserModel/src/main/java/Interfaces/BaseActivityInterface.java @@ -0,0 +1,31 @@ +package Interfaces; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.KeyEvent; +import android.view.MotionEvent; +import android.widget.LinearLayout; + + +/** + * Created by 58381 on 2018/2/27. + */ + +public interface BaseActivityInterface { + void onCreate(Bundle savedInstanceState, LinearLayout layout, Context context, Intent intent); + void onRestart(); + void onResume(); + void onPause(); + void onDestroy(); + void getIntent(Intent intent); + boolean onKeyDown(int keyCode, KeyEvent event); + boolean onKeyUp(int keyCode, KeyEvent event); + boolean onTouchEvent(MotionEvent event); + Data getData(); + class Data{ + private String type; + private String url; + + } +} diff --git a/UserModel/src/main/java/Interfaces/BaseFragmeneInerface.java b/UserModel/src/main/java/Interfaces/BaseFragmeneInerface.java new file mode 100644 index 0000000..65e2eee --- /dev/null +++ b/UserModel/src/main/java/Interfaces/BaseFragmeneInerface.java @@ -0,0 +1,15 @@ +package Interfaces; + +import android.content.Context; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +public interface BaseFragmeneInerface { + void init(Context context); + View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState); + void setIntent(); + +} diff --git a/UserModel/src/test/java/com/jobs/usermodel/ExampleUnitTest.java b/UserModel/src/test/java/com/jobs/usermodel/ExampleUnitTest.java deleted file mode 100644 index e9b7258..0000000 --- a/UserModel/src/test/java/com/jobs/usermodel/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jobs.usermodel; - -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 diff --git a/app/build.gradle b/app/build.gradle index 39233c6..d38a4c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,10 +63,10 @@ dependencies { //毛玻璃 implementation 'jp.wasabeef:glide-transformations:3.0.0' // - compile project(path: ':BaseModel') - implementation project(path: ':GameDataModel') - implementation project(path: ':AppHome') - implementation project(path: ':MgListModel') - implementation project(path: ':ResModl') + api project(path: ':BaseModel') + api project(path: ':GameDataModel') + api project(path: ':AppHome') + api project(path: ':MgListModel') + api project(path: ':ResModl') }