Skip to content

Commit cf61b50

Browse files
LuckyJayceLuckyJayce
committed
删除未用到的类
1 parent 84c6f14 commit cf61b50

File tree

87 files changed

+23
-5946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+23
-5946
lines changed

‎app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ dependencies {
4242
implementation rootProject.ext.dependencies["pulltorefresh"]
4343
implementation rootProject.ext.dependencies["okhttp"]
4444
implementation rootProject.ext.dependencies["okio"]
45-
implementation rootProject.ext.dependencies["okio"]
45+
implementation rootProject.ext.dependencies["MVCHelper-Task-Core"]
46+
implementation rootProject.ext.dependencies["MVCHelper-Tasks"]
47+
implementation rootProject.ext.dependencies["MVCHelper-OkHttp"]
48+
implementation rootProject.ext.dependencies["MVCHelper-TestCase"]
4649

4750
// compile 'com.shizhefei:MVCHelper-Library:1.0.3'
4851
// compile 'com.shizhefei:MVCHelper-Pullrefreh:1.0.2'
4952
// compile 'com.shizhefei:MVCHelper-SwipeRefresh:1.0.2'
5053
// compile 'com.shizhefei:MVCHelper-UltraRefresh:1.0.2'
5154
implementation project(':mvchelper_library')
52-
implementation project(':mvchelper_tasks')
5355
implementation project(':mvcswiperefreshhelper')
5456
implementation project(':mvcultrahelper')
5557
implementation project(':mvcpullrefshhelper')
56-
implementation project(':mvchelper_okhttp')
57-
implementation project(':mvchelper_testcase')
5858
implementation project(':mvccoolhelper')
5959

6060
debugImplementation rootProject.ext.dependencies["leakcanary-android"]

‎app/src/main/java/com/shizhefei/test/controllers/TestCaseFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.shizhefei.test.models.datasource.BookDetailDataSource;
99
import com.shizhefei.test.models.datasource.okhttp.BooksOkHttpNormal_DataSource;
1010
import com.shizhefei.test.models.datasource.SearchBookDataSource;
11-
import com.shizhefei.test.models.task.LoginAsyncTask;
11+
import com.shizhefei.test.models.task.LoginTask;
1212
import com.shizhefei.utils.ArrayListMap;
1313

1414
import java.util.ArrayList;
@@ -20,7 +20,7 @@ public class TestCaseFragment extends ABSTestCaseFragment {
2020
@Override
2121
protected List<TestCaseData> getTestCaseDatas() {
2222
List<TestCaseData> datas = new ArrayList<TestCaseData>();
23-
TestCaseData caseData = new TestCaseData("测试登录", new LoginAsyncTask("LuckyJayce", "111"));
23+
TestCaseData caseData = new TestCaseData("测试登录", new LoginTask("LuckyJayce", "111"));
2424
caseData.addParamGet(new String[]{"name", "password"}, new IAsyncTask<Map<String, String>>() {
2525

2626
@Override

‎app/src/main/java/com/shizhefei/test/controllers/task/LoginActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.shizhefei.task.TaskHelper;
1515
import com.shizhefei.test.models.enties.User;
1616
import com.shizhefei.test.models.exception.BizException;
17-
import com.shizhefei.test.models.task.LoginAsyncTask;
17+
import com.shizhefei.test.models.task.LoginTask;
1818
import com.shizhefei.test.models.task.UploadTask;
1919
import com.shizhefei.test.view.callback.UploadCallback;
2020
import com.shizhefei.view.mvc.demo.R;
@@ -56,7 +56,7 @@ public void onClick(View v) {
5656
if (v == loginButton) {
5757
String name = nameEditText.getText().toString();
5858
String password = pwEditText.getText().toString();
59-
taskHelper.execute(new LoginAsyncTask(name, password), loginCallback);
59+
taskHelper.execute(new LoginTask(name, password), loginCallback);
6060
} else if (v == uploadButton) {
6161
taskHelper.execute(new UploadTask(), new UploadCallback(taskHelper, LoginActivity.this, false));
6262
}

‎app/src/main/java/com/shizhefei/test/controllers/task/TaskDemoActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.shizhefei.test.models.datasource.okhttp.BooksOkHttp_SyncDataSource;
2020
import com.shizhefei.test.models.enties.Book;
2121
import com.shizhefei.test.models.enties.User;
22-
import com.shizhefei.test.models.task.LoginAsyncTask;
2322
import com.shizhefei.test.models.task.LoginTask;
2423
import com.shizhefei.view.mvc.demo.R;
2524

@@ -142,7 +141,7 @@ public void onPostExecute(Object task, Code code, Exception exception, List<Book
142141
}
143142
});
144143
} else if (v == asyncTaskButton) {
145-
taskHelper.execute(new LoginAsyncTask("LuckyJayce", "111"), new SimpleCallback<User>() {
144+
taskHelper.execute(new LoginTask("LuckyJayce", "111"), new SimpleCallback<User>() {
146145
@Override
147146
public void onPreExecute(Object task) {
148147
super.onPreExecute(task);

‎app/src/main/java/com/shizhefei/test/models/task/LoginAsyncTask.java

-61
This file was deleted.

‎app/src/main/java/com/shizhefei/test/models/task/LoginTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public User execute(ProgressSender progressSender) throws Exception {
2929
if (TextUtils.isEmpty(password)) {
3030
throw new BizException("请输入密码");
3131
}
32-
if (name.equals("aaa") && password.equals("111")) {
32+
if (name.equals("LuckyJayce") && password.equals("111")) {
3333
return new User("1", "aaa", 23, "中国人");
3434
} else {
3535
throw new BizException("用户名或者密码不正确");

‎config.gradle

+9-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ext {
2828
versionName : "2.6.0"]
2929

3030
supportVersion = "28.0.0"
31+
mvcHelperVersion = "1.4.0"
3132

3233
dependencies = ["appcompat-v7" : "com.android.support:appcompat-v7:${supportVersion}",
3334
"support-v4" : "com.android.support:support-v4:${supportVersion}",
@@ -47,12 +48,14 @@ ext {
4748
"okio" : "com.squareup.okio:okio:1.9.0",
4849
"butterknife" : "com.jakewharton:butterknife:7.0.1",
4950
"otto" : "com.squareup:otto:1.3.8",
50-
"mvchelper-core" : "com.shizhefei:MVCHelper-Library:1.0.6",
51-
"mvchelper-swipe" : "com.shizhefei:MVCHelper-SwipeRefresh:1.0.6",
52-
"mvchelper-ultra" : "com.shizhefei:MVCHelper-UltraRefresh:1.0.6",
53-
"mvchelper-testcase" : "com.shizhefei:MVCHelper-TestCase:1.0.6",
54-
"mvchelper-pull" : "com.shizhefei:MVCHelper-Pullrefresh:1.0.6",
55-
"mvchelper-okhttp" : "com.shizhefei:MVCHelper-OkHttp:1.0.6",
51+
"MVCHelper-Task-Core" : "com.shizhefei:MVCHelper-Task-Core:${mvcHelperVersion}",
52+
"MVCHelper-Library" : "com.shizhefei:MVCHelper-Library:${mvcHelperVersion}",
53+
"MVCHelper-SwipeRefresh" : "com.shizhefei:MVCHelper-SwipeRefresh:${mvcHelperVersion}",
54+
"MVCHelper-UltraRefresh" : "com.shizhefei:MVCHelper-UltraRefresh:${mvcHelperVersion}",
55+
"MVCHelper-TestCase" : "com.shizhefei:MVCHelper-TestCase:${mvcHelperVersion}",
56+
"MVCHelper-Pullrefresh" : "com.shizhefei:MVCHelper-Pullrefresh:${mvcHelperVersion}",
57+
"MVCHelper-OkHttp" : "com.shizhefei:MVCHelper-OkHttp:${mvcHelperVersion}",
58+
"MVCHelper-Tasks" : "com.shizhefei:MVCHelper-Tasks:${mvcHelperVersion}",
5659
"ultra" : "in.srain.cube:ultra-ptr:1.0.11",
5760
"pulltorefresh" : "com.shizhefei:pulltorefresh:1.0.1",
5861
"ViewPagerIndicator" : "com.shizhefei:ViewPagerIndicator:1.0.7",

‎mvchelper_library/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply from: rootProject.file("library.gradle")
44
dependencies {
55
implementation fileTree(include: ['*.jar'], dir: 'libs')
66
compileOnly rootProject.ext.dependencies["recyclerview-v7"]
7-
api project(':mvchelper_task_core')
7+
api rootProject.ext.dependencies["MVCHelper-Task-Core"]
88
}
99

1010
////添加

‎mvchelper_okhttp/.gitignore

-1
This file was deleted.

‎mvchelper_okhttp/build.gradle

-20
This file was deleted.

‎mvchelper_okhttp/src/main/AndroidManifest.xml

-4
This file was deleted.

‎mvchelper_okhttp/src/main/java/com/shizhefei/mvc/http/AbsHttpMethod.java

-79
This file was deleted.

0 commit comments

Comments
 (0)