Skip to content

Commit 08de69c

Browse files
GcsSloopGcsSloop
committed
调整内部结构
1 parent f36ad51 commit 08de69c

24 files changed

Lines changed: 133 additions & 186 deletions

‎sdk/src/main/java/com/gcssloop/diycode_sdk/api/Diycode.java‎

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

sdk/src/main/java/com/gcssloop/diycode_sdk/api/base/implement/BaseImplement.java renamed to sdk/src/main/java/com/gcssloop/diycode_sdk/api/base/implement/BaseImpl.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
import android.support.annotation.NonNull;
2727

2828
import com.gcssloop.diycode_sdk.api.base.bean.OAuth;
29-
import com.gcssloop.diycode_sdk.api.login.api.TokenService;
3029
import com.gcssloop.diycode_sdk.api.login.bean.Token;
30+
import com.gcssloop.diycode_sdk.log.Logger;
3131
import com.gcssloop.diycode_sdk.utils.CacheUtil;
3232
import com.gcssloop.diycode_sdk.utils.Constant;
33-
import com.gcssloop.diycode_sdk.log.Logger;
3433

3534
import java.io.IOException;
3635
import java.lang.reflect.ParameterizedType;
@@ -46,18 +45,21 @@
4645
import retrofit2.Call;
4746
import retrofit2.GsonConverterFactory;
4847
import retrofit2.Retrofit;
48+
import retrofit2.http.Field;
49+
import retrofit2.http.FormUrlEncoded;
50+
import retrofit2.http.POST;
4951

5052
/**
5153
* 实现类，具体实现在此处
5254
*
5355
* @param <Service>
5456
*/
55-
public class BaseImplement<Service> {
57+
public class BaseImpl<Service> {
5658
protected CacheUtil mCacheUtil;
5759
private static Retrofit mRetrofit;
5860
protected Service mService;
5961

60-
public BaseImplement(@NonNull Context context) {
62+
public BaseImpl(@NonNull Context context) {
6163
mCacheUtil = new CacheUtil(context.getApplicationContext());
6264
initRetrofit();
6365
this.mService = mRetrofit.create(getServiceClass());
@@ -152,3 +154,14 @@ private boolean alreadyHasAuthorizationHeader(Request originalRequest) {
152154
}
153155

154156
}
157+
158+
159+
interface TokenService {
160+
/**
161+
* 刷新 token
162+
*/
163+
@POST(Constant.OAUTH_URL)
164+
@FormUrlEncoded
165+
Call<Token> refreshToken(@Field("client_id") String client_id, @Field("client_secret") String client_secret,
166+
@Field("grant_type") String grant_type, @Field("refresh_token") String refresh_token);
167+
}

sdk/src/main/java/com/gcssloop/diycode_sdk/api/likes/api/LikesImplement.java renamed to sdk/src/main/java/com/gcssloop/diycode_sdk/api/likes/api/LikesImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727

2828
import com.gcssloop.diycode_sdk.api.base.bean.State;
2929
import com.gcssloop.diycode_sdk.api.base.callback.BaseCallback;
30-
import com.gcssloop.diycode_sdk.api.base.implement.BaseImplement;
30+
import com.gcssloop.diycode_sdk.api.base.implement.BaseImpl;
3131
import com.gcssloop.diycode_sdk.api.likes.event.LikeEvent;
3232
import com.gcssloop.diycode_sdk.api.likes.event.UnLikeEvent;
3333
import com.gcssloop.diycode_sdk.utils.UUIDGenerator;
3434

35-
public class LikesImplement extends BaseImplement<LikesService> implements LikesAPI {
35+
public class LikesImpl extends BaseImpl<LikesService> implements LikesAPI {
3636

37-
public LikesImplement(Context context) {
37+
public LikesImpl(Context context) {
3838
super(context);
3939
}
4040

‎sdk/src/main/java/com/gcssloop/diycode_sdk/api/likes/api/LikesService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import retrofit2.http.FormUrlEncoded;
3131
import retrofit2.http.POST;
3232

33-
public interface LikesService {
33+
interface LikesService {
3434

3535

3636
/**

sdk/src/main/java/com/gcssloop/diycode_sdk/api/login/api/LoginImplement.java renamed to sdk/src/main/java/com/gcssloop/diycode_sdk/api/login/api/LoginImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.gcssloop.diycode_sdk.api.base.bean.OAuth;
2929
import com.gcssloop.diycode_sdk.api.base.callback.BaseCallback;
3030
import com.gcssloop.diycode_sdk.api.base.callback.TokenCallback;
31-
import com.gcssloop.diycode_sdk.api.base.implement.BaseImplement;
31+
import com.gcssloop.diycode_sdk.api.base.implement.BaseImpl;
3232
import com.gcssloop.diycode_sdk.api.login.bean.Token;
3333
import com.gcssloop.diycode_sdk.api.login.event.DeleteDevicesEvent;
3434
import com.gcssloop.diycode_sdk.api.login.event.LoginEvent;
@@ -40,9 +40,9 @@
4040

4141
import retrofit2.Call;
4242

43-
public class LoginImplement extends BaseImplement<LoginService> implements LoginAPI {
43+
public class LoginImpl extends BaseImpl<LoginService> implements LoginAPI {
4444

45-
public LoginImplement(@NonNull Context context) {
45+
public LoginImpl(@NonNull Context context) {
4646
super(context);
4747
}
4848

‎sdk/src/main/java/com/gcssloop/diycode_sdk/api/login/api/TokenService.java‎

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

sdk/src/main/java/com/gcssloop/diycode_sdk/api/news/api/NewsImplement.java renamed to sdk/src/main/java/com/gcssloop/diycode_sdk/api/news/api/NewsImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import android.support.annotation.Nullable;
2828

2929
import com.gcssloop.diycode_sdk.api.base.callback.BaseCallback;
30-
import com.gcssloop.diycode_sdk.api.base.implement.BaseImplement;
30+
import com.gcssloop.diycode_sdk.api.base.implement.BaseImpl;
3131
import com.gcssloop.diycode_sdk.api.news.event.CreateNewsEvent;
3232
import com.gcssloop.diycode_sdk.api.news.event.CreateNewsReplyEvent;
3333
import com.gcssloop.diycode_sdk.api.news.event.DeleteNewsReplyEvent;
@@ -38,9 +38,9 @@
3838
import com.gcssloop.diycode_sdk.api.news.event.UpdateNewsReplyEvent;
3939
import com.gcssloop.diycode_sdk.utils.UUIDGenerator;
4040

41-
public class NewsImplement extends BaseImplement<NewsService> implements NewsAPI {
41+
public class NewsImpl extends BaseImpl<NewsService> implements NewsAPI {
4242

43-
public NewsImplement(@NonNull Context context) {
43+
public NewsImpl(@NonNull Context context) {
4444
super(context);
4545
}
4646

‎sdk/src/main/java/com/gcssloop/diycode_sdk/api/news/api/NewsService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import retrofit2.http.Path;
3939
import retrofit2.http.Query;
4040

41-
public interface NewsService {
41+
interface NewsService {
4242

4343
/**
4444
* 获取 news 列表

sdk/src/main/java/com/gcssloop/diycode_sdk/api/notifications/api/NotificationsImplement.java renamed to sdk/src/main/java/com/gcssloop/diycode_sdk/api/notifications/api/NotificationsImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
import android.support.annotation.NonNull;
2727

2828
import com.gcssloop.diycode_sdk.api.base.callback.BaseCallback;
29-
import com.gcssloop.diycode_sdk.api.base.implement.BaseImplement;
29+
import com.gcssloop.diycode_sdk.api.base.implement.BaseImpl;
3030
import com.gcssloop.diycode_sdk.api.notifications.event.DeleteAllNotificationEvent;
3131
import com.gcssloop.diycode_sdk.api.notifications.event.DeleteNotificationEvent;
3232
import com.gcssloop.diycode_sdk.api.notifications.event.GetNotificationUnReadCountEvent;
3333
import com.gcssloop.diycode_sdk.api.notifications.event.GetNotificationsListEvent;
3434
import com.gcssloop.diycode_sdk.api.notifications.event.MarkNotificationAsReadEvent;
3535
import com.gcssloop.diycode_sdk.utils.UUIDGenerator;
3636

37-
public class NotificationsImplement extends BaseImplement<NotificationsService> implements NotificationsAPI {
38-
public NotificationsImplement(@NonNull Context context) {
37+
public class NotificationsImpl extends BaseImpl<NotificationsService> implements NotificationsAPI {
38+
public NotificationsImpl(@NonNull Context context) {
3939
super(context);
4040
}
4141

‎sdk/src/main/java/com/gcssloop/diycode_sdk/api/notifications/api/NotificationsService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import retrofit2.http.Path;
3737
import retrofit2.http.Query;
3838

39-
public interface NotificationsService {
39+
interface NotificationsService {
4040

4141
/**
4242
* 获取通知列表

0 commit comments

Comments
 (0)