Skip to content

Commit e33d071

Browse files
thinaaronthinaaron
committed
分离 common 成功
1 parent 35e0c90 commit e33d071

282 files changed

Lines changed: 1185 additions & 867 deletions

File tree

Some content is hidden

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

‎app/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ dependencies {
153153
compile 'de.hdodenhof:circleimageview:2.1.0'
154154
compile 'com.github.rampo.updatechecker:library:2.1.4'
155155
compile 'com.daimajia.swipelayout:library:1.1.7@aar'
156-
compile 'com.umeng.analytics:analytics:latest.integration'
157156
compile 'com.melnykov:floatingactionbutton:1.3.0'
158157
compile 'org.greenrobot:eventbus:3.0.0'
159158
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.11'
@@ -163,6 +162,9 @@ dependencies {
163162
compile 'com.prolificinteractive:parallaxpager:2.2.1'
164163
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
165164

165+
// umeng 统计
166+
compile 'com.umeng.analytics:analytics:latest.integration'
167+
166168
// 高版本fix使用support库crash
167169
compile 'uk.co.chrisjenx:calligraphy:2.1.0'
168170
compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0'
@@ -224,10 +226,10 @@ dependencies {
224226
compile files('libs/alipaySingle-20170510.jar')
225227
compile files('libs/BaiduLBS_Android.jar')
226228
compile files('libs/jg_filter_sdk_1.1.jar')
227-
compile files('libs/pinyin4j-2.5.0.jar')
228229
compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
229230
compile files('libs/Xg_sdk_v2.47_20161026_0936.jar')
230231
provided files('../common-coding/libs/android-viewbadger.jar') // 小红点
232+
provided files('../common-coding/libs/pinyin4j-2.5.0.jar')
231233
}
232234

233235

‎app/src/main/java/net/coding/program/MyApp.java‎

Lines changed: 586 additions & 3 deletions
Large diffs are not rendered by default.

‎app/src/main/java/net/coding/program/common/CustomWebViewClient.java‎

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

‎app/src/main/java/net/coding/program/common/LoginEditText.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* Created by chaochen on 15/1/6.
16+
* todo 自定义控件不要乱放
1617
*/
1718
public class LoginEditText extends EditText {
1819

‎app/src/main/java/net/coding/program/login/EmailRegisterActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99

1010
import com.loopj.android.http.RequestParams;
1111

12-
import net.coding.program.common.GlobalData;
1312
import net.coding.program.MainActivity;
1413
import net.coding.program.R;
1514
import net.coding.program.common.Global;
15+
import net.coding.program.common.GlobalData;
1616
import net.coding.program.common.SimpleSHA1;
17+
import net.coding.program.common.TermsActivity_;
1718
import net.coding.program.common.base.MyJsonResponse;
18-
import net.coding.program.guide.GuideActivity;
19+
import net.coding.program.common.model.AccountInfo;
20+
import net.coding.program.common.model.UserObject;
1921
import net.coding.program.common.network.MyAsyncHttpClient;
2022
import net.coding.program.common.ui.BackActivity;
21-
import net.coding.program.common.util.ActivityNavigate;
2223
import net.coding.program.common.util.SingleToast;
2324
import net.coding.program.common.util.ViewStyleUtil;
2425
import net.coding.program.common.widget.LoginEditText;
2526
import net.coding.program.compatible.CodingCompat;
26-
import net.coding.program.common.model.AccountInfo;
27-
import net.coding.program.common.model.UserObject;
27+
import net.coding.program.guide.GuideActivity;
2828

2929
import org.androidannotations.annotations.AfterViews;
3030
import org.androidannotations.annotations.Click;
@@ -175,7 +175,7 @@ public void onMySuccess(JSONObject response) {
175175

176176
@Click
177177
void textClause() {
178-
ActivityNavigate.startTermActivity(this);
178+
TermsActivity_.intent(this).start();
179179
}
180180

181181
@Click

‎app/src/main/java/net/coding/program/login/PhoneRegisterActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
import net.coding.program.R;
1212
import net.coding.program.common.Global;
1313
import net.coding.program.common.SimpleSHA1;
14+
import net.coding.program.common.TermsActivity_;
1415
import net.coding.program.common.base.MyJsonResponse;
16+
import net.coding.program.common.model.PhoneCountry;
1517
import net.coding.program.common.network.MyAsyncHttpClient;
1618
import net.coding.program.common.ui.BackActivity;
17-
import net.coding.program.common.util.ActivityNavigate;
1819
import net.coding.program.common.util.SingleToast;
1920
import net.coding.program.common.util.ViewStyleUtil;
2021
import net.coding.program.common.widget.LoginEditText;
2122
import net.coding.program.common.widget.ValidePhoneView;
2223
import net.coding.program.login.phone.CountryPickActivity_;
23-
import net.coding.program.common.model.PhoneCountry;
2424

2525
import org.androidannotations.annotations.AfterViews;
2626
import org.androidannotations.annotations.Click;
@@ -198,7 +198,7 @@ void otherRegister() {
198198

199199
@Click
200200
void textClause() {
201-
ActivityNavigate.startTermActivity(this);
201+
TermsActivity_.intent(this).start();
202202
}
203203

204204
@OnActivityResult(EmailRegisterActivity.RESULT_REGISTER_EMAIL)

‎app/src/main/java/net/coding/program/login/phone/PhoneSetPasswordFragment2.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
import com.loopj.android.http.AsyncHttpClient;
1111
import com.loopj.android.http.RequestParams;
1212

13-
import net.coding.program.common.GlobalData;
1413
import net.coding.program.R;
1514
import net.coding.program.common.Global;
15+
import net.coding.program.common.GlobalData;
1616
import net.coding.program.common.SimpleSHA1;
17+
import net.coding.program.common.TermsActivity_;
1718
import net.coding.program.common.base.MyJsonResponse;
18-
import net.coding.program.guide.GuideActivity;
19+
import net.coding.program.common.model.AccountInfo;
20+
import net.coding.program.common.model.UserObject;
1921
import net.coding.program.common.network.MyAsyncHttpClient;
2022
import net.coding.program.common.ui.BaseActivity;
2123
import net.coding.program.common.ui.BaseFragment;
22-
import net.coding.program.common.util.ActivityNavigate;
2324
import net.coding.program.common.util.SingleToast;
2425
import net.coding.program.common.util.ViewStyleUtil;
2526
import net.coding.program.common.widget.LoginEditText;
2627
import net.coding.program.common.widget.ValidePhoneView;
2728
import net.coding.program.common.widget.input.SimpleTextWatcher;
2829
import net.coding.program.compatible.CodingCompat;
29-
import net.coding.program.common.model.AccountInfo;
30-
import net.coding.program.common.model.UserObject;
30+
import net.coding.program.guide.GuideActivity;
3131

3232
import org.androidannotations.annotations.AfterViews;
3333
import org.androidannotations.annotations.Click;
@@ -121,7 +121,7 @@ public void onMyFailure(JSONObject response) {
121121

122122
@Click
123123
void textClause() {
124-
ActivityNavigate.startTermActivity(this);
124+
TermsActivity_.intent(this).start();
125125
}
126126

127127
protected void loadCurrentUser() {

‎app/src/main/java/net/coding/program/project/detail/EditPreviewMarkdown.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.coding.program.project.detail;
22

3-
import net.coding.program.param.TopicData;
3+
import net.coding.program.common.model.topic.TopicData;
44

55
/**
66
* Created by chenchao on 2017/4/13.

‎app/src/main/java/net/coding/program/project/detail/TopicAddActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.coding.program.common.model.ProjectObject;
1515
import net.coding.program.common.model.TopicLabelObject;
1616
import net.coding.program.common.model.TopicObject;
17-
import net.coding.program.param.TopicData;
17+
import net.coding.program.common.model.topic.TopicData;
1818
import net.coding.program.third.EmojiFilter;
1919

2020
import org.androidannotations.annotations.AfterViews;

‎app/src/main/java/net/coding/program/project/detail/TopicEditFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.coding.program.common.Global;
88
import net.coding.program.common.base.MDEditFragment;
99
import net.coding.program.common.model.TopicLabelObject;
10-
import net.coding.program.param.TopicData;
10+
import net.coding.program.common.model.topic.TopicData;
1111

1212
import org.androidannotations.annotations.AfterViews;
1313
import org.androidannotations.annotations.EFragment;

0 commit comments

Comments
 (0)