Skip to content

Commit 88c18a7

Browse files
AriesHooAriesHoo
committed
1、优化Retrofit请求数据帮助类结构避免重复创建
2、代码及资源增加注释 3、优化部分细节体验 4、增加部分Demo演示效果
1 parent 21cbf5e commit 88c18a7

38 files changed

+702
-144
lines changed

‎LICENSE.txt

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ allprojects {
2323

2424
```
2525
dependencies {
26-
    //compile 'com.github.AriesHoo:FastLib:2.0.0'
26+
    //compile 'com.github.AriesHoo:FastLib:2.0.1'
2727
compile 'com.github.AriesHoo:FastLib:${LATEST_VERSION}'
2828
}
2929
```
@@ -69,7 +69,7 @@ dependencies {
6969
//多状态视图切换
7070
compile 'com.github.MarnonDev:EasyStatusView:v1.0.3'
7171
//常用UI控件(TitleBarView、RadiusView等)
72-
compile 'com.github.AriesHoo:UIWidget:v1.9.5'
72+
compile 'com.github.AriesHoo:UIWidget:1.9.6'
7373
//下拉刷新库
7474
compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.2'
7575
//页面事件交互
@@ -120,6 +120,23 @@ dependencies {
120120
* [AndroidEventBus-页面事件交互](https://github.com/hehonghui/AndroidEventBus)
121121
* [AgentWeb-原生WebView快速集成库](https://github.com/Justson/AgentWeb)
122122

123+
## License
124+
125+
```
126+
Copyright 2017 Aries Hoo
127+
128+
Licensed under the Apache License, Version 2.0 (the "License");
129+
you may not use this file except in compliance with the License.
130+
You may obtain a copy of the License at
131+
132+
http://www.apache.org/licenses/LICENSE-2.0
133+
134+
Unless required by applicable law or agreed to in writing, software
135+
distributed under the License is distributed on an "AS IS" BASIS,
136+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
137+
See the License for the specific language governing permissions and
138+
limitations under the License.
139+
```
123140

124141

125142

‎apk/sample.apk

19.4 KB
Binary file not shown.

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.aries.library.fast.demo"
1111
minSdkVersion ext.minSdkVersion
1212
targetSdkVersion ext.targetSdkVersion
13-
versionCode 200
14-
versionName "2.0.0"
13+
versionCode 201
14+
versionName "2.0.1"
1515
multiDexEnabled true
1616
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1717
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
@@ -53,6 +53,6 @@ dependencies {
5353
compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
5454
compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.2'
5555
//设置界面Item库
56-
compile 'com.github.lygttpod:SuperTextView:2.1.3'
56+
compile 'com.github.lygttpod:SuperTextView:2.1.4'
5757
compile 'com.flyco.labelview:FlycoLabelView_Lib:1.0.2@aar'
5858
}

‎app/src/main/java/com/aries/library/fast/demo/App.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ public void onCreate() {
3030
header.put("time", System.currentTimeMillis());
3131
LoggerManager.init(TAG, BuildConfig.DEBUG);
3232
ToastUtil.init(mContext, true);
33+
3334
FastRetrofit.getInstance()
3435
.setBaseUrl(BuildConfig.BASE_URL)
3536
.trustAllSSL()//信任所有证书--也可设置useSingleSignedSSL(单向认证)或useBothSignedSSL(双向验证)
3637
.setHeaders(header)//设置统一请求头
3738
.setLogEnable(BuildConfig.DEBUG)//设置请求全局log-可设置tag及Level类型
3839
// .setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BASIC)
39-
.setTimeout(20);//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
40+
.setTimeout(30);//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
4041
}
4142
}

‎app/src/main/java/com/aries/library/fast/demo/base/BaseRefreshLoadActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.aries.library.fast.demo.base;
22

33
import com.aries.library.fast.demo.R;
4+
import com.aries.library.fast.demo.helper.RefreshHeaderHelper;
45
import com.aries.library.fast.demo.helper.TitleBarHelper;
56
import com.aries.library.fast.module.activity.FastRefreshLoadActivity;
67
import com.aries.ui.view.title.TitleBarView;
7-
import com.scwang.smartrefresh.header.MaterialHeader;
88
import com.scwang.smartrefresh.layout.api.RefreshHeader;
99

1010
/**
@@ -33,9 +33,7 @@ public void beforeSetTitleBar(TitleBarView titleBar) {
3333

3434
@Override
3535
public RefreshHeader getRefreshHeader() {
36-
MaterialHeader materialHeader = new MaterialHeader(mContext);
37-
materialHeader.setColorSchemeColors(R.color.colorTitleText);
38-
return materialHeader;
36+
return RefreshHeaderHelper.getInstance().getRefreshHeader(mContext);
3937
}
4038

4139
@Override

‎app/src/main/java/com/aries/library/fast/demo/base/BaseRefreshLoadFragment.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.aries.library.fast.demo.base;
22

33
import com.aries.library.fast.demo.R;
4+
import com.aries.library.fast.demo.helper.RefreshHeaderHelper;
45
import com.aries.library.fast.module.fragment.FastRefreshLoadFragment;
5-
import com.scwang.smartrefresh.header.MaterialHeader;
66
import com.scwang.smartrefresh.layout.api.RefreshHeader;
77

88
/**
@@ -15,9 +15,7 @@ public abstract class BaseRefreshLoadFragment<T> extends FastRefreshLoadFragment
1515

1616
@Override
1717
public RefreshHeader getRefreshHeader() {
18-
MaterialHeader materialHeader = new MaterialHeader(mContext);
19-
materialHeader.setColorSchemeColors(R.color.colorTitleText);
20-
return materialHeader;
18+
return RefreshHeaderHelper.getInstance().getRefreshHeader(mContext);
2119
}
2220

2321
@Override

‎app/src/main/java/com/aries/library/fast/demo/base/BaseTitleRefreshLoadFragment.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.aries.library.fast.demo.base;
22

33
import com.aries.library.fast.demo.R;
4+
import com.aries.library.fast.demo.helper.RefreshHeaderHelper;
45
import com.aries.library.fast.module.fragment.FastTitleRefreshLoadFragment;
5-
import com.scwang.smartrefresh.header.MaterialHeader;
66
import com.scwang.smartrefresh.layout.api.RefreshHeader;
77

88
/**
@@ -20,9 +20,7 @@ public boolean isLightStatusBarEnable() {
2020

2121
@Override
2222
public RefreshHeader getRefreshHeader() {
23-
MaterialHeader materialHeader = new MaterialHeader(mContext);
24-
materialHeader.setColorSchemeColors(R.color.colorTitleText);
25-
return materialHeader;
23+
return RefreshHeaderHelper.getInstance().getRefreshHeader(mContext);
2624
}
2725

2826
@Override

‎app/src/main/java/com/aries/library/fast/demo/constant/EventConstant.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
*/
88
public class EventConstant {
99
public static final String EVENT_KEY_REFRESH_ACTIVITY_TAB = "EVENT_KEY_REFRESH_ACTIVITY_TAB";
10+
public static final String EVENT_KEY_CHANGE_ADAPTER_ANIMATION = "EVENT_KEY_CHANGE_ADAPTER_ANIMATION";
11+
public static final String EVENT_KEY_CHANGE_ADAPTER_ANIMATION_ALWAYS = "EVENT_KEY_CHANGE_ADAPTER_ANIMATION_ALWAYS";
1012
}

‎app/src/main/java/com/aries/library/fast/demo/constant/SPConstant.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88

99
public class SPConstant {
1010
public static final String SP_KEY_ACTIVITY_TAB_SLIDING = "SP_KEY_ACTIVITY_TAB_SLIDING";
11+
public static final String SP_KEY_ACTIVITY_ANIMATION_ALWAYS = "SP_KEY_ACTIVITY_ANIMATION_ALWAYS";
12+
public static final String SP_KEY_ACTIVITY_ANIMATION_INDEX = "SP_KEY_ACTIVITY_ANIMATION_INDEX";
13+
public static final String SP_KEY_HOME_TRANSITION_INDEX = "SP_KEY_HOME_TRANSITION_INDEX";
1114
}

0 commit comments

Comments
 (0)