Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决本次合并冲突

Browse Source
This commit is contained in:
khy
2016-12-29 15:15:09 +08:00
parent 23a062abea
commit f4a946f5e2
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/common/util/LibaoUtils.java
View File

@ -178,16 +178,16 @@ public class LibaoUtils {
}).start();
}
public static void postDeleteGift(final Context context, final String giftCode, final PostGiftListener listener) {
postDeleteGift(context, giftCode, true, listener);
public static void deleteGift(final Context context, final String giftCode, final PostLibaoListener listener) {
deleteGift(context, giftCode, true, listener);
}
private static void postDeleteGift(final Context context, final String giftCode, final boolean isCheck, final PostGiftListener listener) {
private static void deleteGift(final Context context, final String giftCode, final boolean isCheck, final PostLibaoListener listener) {
new Thread(new Runnable() {
@Override
public void run() {
RetrofitManager.getApi()
.postDeleteGift(TokenUtils.getToken(context, isCheck), giftCode)
RetrofitManager.getLibao()
.deleteGift(TokenUtils.getToken(context, isCheck), giftCode)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<ResponseBody>(){
@ -203,7 +203,7 @@ public class LibaoUtils {
if (e instanceof HttpException) {
HttpException exception = (HttpException) e;
if (exception.code() == 401) {
postGiftLing(context, giftCode, false, listener);
postLibaoLing(context, giftCode, false, listener);
return;
}
}