Skip to content

Commit 0d2e783

Browse files
committed
优化数组解析
1 parent b546de7 commit 0d2e783

File tree

422 files changed

+19878
-138
lines changed

Some content is hidden

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

422 files changed

+19878
-138
lines changed

.idea/caches/build_file_checksums.ser

99 Bytes
Binary file not shown.

.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion rootProject.ext.android.compileSdkVersion
55
defaultConfig {
6-
applicationId "com.example.kson.moduledemo"
7-
minSdkVersion 16
8-
targetSdkVersion 27
9-
versionCode 1
10-
versionName "1.0"
6+
applicationId rootProject.ext.android.applicationId
7+
minSdkVersion rootProject.ext.android.minSdkVersion
8+
targetSdkVersion rootProject.ext.android.targetSdkVersion
9+
versionCode rootProject.ext.android.versionCode
10+
versionName rootProject.ext.android.versionName
11+
multiDexEnabled true
1112
javaCompileOptions {
1213
annotationProcessorOptions {
1314
arguments = [ AROUTER_MODULE_NAME : project.getName() ]
@@ -40,7 +41,7 @@ dependencies {
4041

4142
}
4243
annotationProcessor rootProject.ext.dependencies["arouterCompile"]
43-
implementation project(':lib-net')
44+
implementation project(':lib-core')
4445
}
4546
configurations.all {
4647
resolutionStrategy.eachDependency { DependencyResolveDetails details ->

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
<category android:name="android.intent.category.LAUNCHER"/>
2020
</intent-filter>
2121
</activity>
22-
<activity android:name="com.example.kson.module_home.Main2Activity"/>
22+
<activity android:name="com.example.kson.module_im.Main2Activity"/>
2323
<activity android:name="com.example.kson.module_push.PushActivity"/>
24-
<activity android:name=".Main2Activity">
25-
</activity>
2624
</application>
2725

2826
</manifest>

app/src/main/java/com/example/kson/moduledemo/Main2Activity.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/src/main/java/com/example/kson/moduledemo/MainActivity.java

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
import com.example.kson.lib_core.base.mvp.BaseMvpActivity;
99
import com.example.kson.lib_core.base.mvp.BasePresenter;
10-
import com.example.kson.lib_core.utils.ToastUtils;
11-
import com.example.kson.lib_net.network.BaseResponse;
12-
import com.example.kson.lib_net.network.http.HttpRequestPresenter;
13-
import com.example.kson.lib_net.network.http.ModelCallback;
14-
import com.example.kson.lib_net.network.rx.RxManager;
1510
import com.example.kson.lib_net.utils.publickeytool.RsaCoder;
1611
import com.example.kson.moduledemo.contract.LoginContract;
1712
import com.example.kson.moduledemo.entity.UserEntity;
@@ -32,18 +27,19 @@ protected void initView() {
3227
public void onClick(View view) {
3328

3429
HashMap<String, Object> params = new HashMap<>();
35-
// params.put("mobile","18612991023");
30+
params.put("uid","71");
3631
// params.put("password","222222");
37-
params.put("phone", "18612991023");
38-
params.put("pwd", RsaCoder.encryptByPublicKey("111111"));
3932
// params.put("phone", "18612991523");
40-
params.put("plateId", "12");
41-
params.put("page", "1");
42-
params.put("count", "5");
33+
// params.put("nickName", "18612991523");
4334
// params.put("pwd", RsaCoder.encryptByPublicKey("111111"));
44-
45-
presenter.checkPhone(params);
46-
35+
//// params.put("phone", "18612991523");
36+
// params.put("plateId", "12");
37+
// params.put("page", "1");
38+
// params.put("count", "5");
39+
//// params.put("pwd", RsaCoder.encryptByPublicKey("111111"));
40+
//
41+
// showToast("121212121212121");
42+
presenter.infoRecommendList(params);
4743

4844
}
4945
});
@@ -61,10 +57,6 @@ public void home(View view) {
6157

6258
}
6359

64-
@Override
65-
public void success(BaseResponse<UserEntity> userEntity) {
66-
// com.blankj.utilcode.util.ToastUtils.showLong(userEntity.getMessage());
67-
}
6860

6961
@Override
7062
public BasePresenter initPresenter() {

app/src/main/java/com/example/kson/moduledemo/MyApp.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.example.kson.moduledemo;
22

33
import android.app.Application;
4+
import android.content.Context;
5+
import android.support.multidex.MultiDex;
46

57
import com.alibaba.android.arouter.launcher.ARouter;
68
import com.example.kson.lib_net.NetApp;
@@ -29,4 +31,10 @@ public void onCreate() {
2931
HttpRequestPresenter.init(new RetrofitHttpRequest());
3032
// HttpRequestPresenter.init(new RetrofitHttpRequest());
3133
}
34+
35+
@Override
36+
protected void attachBaseContext(Context base) {
37+
super.attachBaseContext(base);
38+
MultiDex.install(this);
39+
}
3240
}

app/src/main/java/com/example/kson/moduledemo/common/Constants.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
* Description:
1010
*/
1111
public class Constants {
12-
public static String BASE_URL = BuildConfig.DEBUG?"https://172.17.8.100/":"https://www.zhaoapi.cn/";
12+
public static String BASE_URL = BuildConfig.DEBUG?"http://www.zhaoapi.cn/":"https://www.zhaoapi.cn/";
1313
public static String LOGIN_URL = "techApi/user/v1/login";
1414
public static String CHECK_URL = "techApi/user/v1/checkPhone";
15-
public static String NEWS_URL = "techApi/information/v1/infoRecommendList";
15+
// public static String NEWS_URL = "techApi/chat/verify/v1/findFriendGroupList";
16+
public static String NEWS_URL = "product/getCarts";
17+
public static String REG_URL = "techApi/user/v1/register";
1618
}

app/src/main/java/com/example/kson/moduledemo/contract/LoginContract.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.example.kson.lib_core.base.mvp.IBaseView;
66
import com.example.kson.lib_net.network.PresenterCallback;
77
import com.example.kson.lib_net.network.BaseResponse;
8+
import com.example.kson.moduledemo.entity.ContactsEntity;
89
import com.example.kson.moduledemo.entity.News;
910
import com.example.kson.moduledemo.entity.UserEntity;
1011
import com.example.kson.moduledemo.model.LoginModel;
@@ -30,6 +31,7 @@ public ILoginModel getmModel() {
3031
public abstract void login(HashMap<String,Object> params);
3132
public abstract void checkPhone(HashMap<String,Object> params);
3233
public abstract void infoRecommendList(HashMap<String,Object> params);
34+
public abstract void reg(HashMap<String,Object> params);
3335

3436
}
3537

@@ -39,8 +41,9 @@ public ILoginModel getmModel() {
3941
interface ILoginModel extends IBaseModel {
4042

4143
void checkPhone(HashMap<String,Object> params, PresenterCallback<UserEntity> callback);
42-
void infoRecommendList(HashMap<String,Object> params, PresenterCallback<List<News>> callback);
44+
void infoRecommendList(HashMap<String,Object> params, PresenterCallback<List<ContactsEntity>> callback);
4345
void login(HashMap<String,Object> params, PresenterCallback<UserEntity> callback);
46+
void reg(HashMap<String,Object> params, PresenterCallback<UserEntity> callback);
4447

4548
}
4649

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.example.kson.moduledemo.entity;
2+
3+
import com.example.kson.lib_net.network.BaseResponse;
4+
5+
import java.util.List;
6+
7+
/**
8+
* Author:kson
9+
* E-mail:19655910@qq.com
10+
* Time:2018/10/31
11+
* Description:
12+
*/
13+
public class ContactsEntity extends BaseResponse {
14+
public String sellerName;
15+
public String currentNumber;
16+
public String customize;
17+
public String groupId;
18+
public String groupName;
19+
public List<Lists> list;
20+
21+
public class Lists{
22+
public String bargainPrice;
23+
}
24+
}

0 commit comments

Comments
 (0)