Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e061e61088
@ -14,6 +14,7 @@ import com.yunbao.common.R;
|
|||||||
import com.yunbao.common.http.ResponseModel;
|
import com.yunbao.common.http.ResponseModel;
|
||||||
import com.yunbao.common.http.base.HttpCallback;
|
import com.yunbao.common.http.base.HttpCallback;
|
||||||
import com.yunbao.common.http.live.LiveNetManager;
|
import com.yunbao.common.http.live.LiveNetManager;
|
||||||
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.utils.WordUtil;
|
import com.yunbao.common.utils.WordUtil;
|
||||||
import com.yunbao.common.views.weight.ViewClicksAntiShake;
|
import com.yunbao.common.views.weight.ViewClicksAntiShake;
|
||||||
|
|
||||||
@ -75,6 +76,7 @@ public class LiberalBattlePassPopupWindow extends CenterPopupView {
|
|||||||
if (mPassCallback != null) {
|
if (mPassCallback != null) {
|
||||||
mPassCallback.onCallback(data.getData().getCode(), data.getData().getMsg());
|
mPassCallback.onCallback(data.getData().getCode(), data.getData().getMsg());
|
||||||
}
|
}
|
||||||
|
IMLoginManager.get(getContext()).upDataUserInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -204,10 +204,6 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getGoogleService() {
|
|
||||||
int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext);
|
|
||||||
return code == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int resultCode = -1;
|
int resultCode = -1;
|
||||||
String resultToken = "";
|
String resultToken = "";
|
||||||
|
@ -78,7 +78,6 @@ public class BattlePassMissionFragment extends BaseFragment {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
long maxExp=userInfoBean.getMaxLevelExp() - userInfoBean.getBattlePassExp();
|
long maxExp=userInfoBean.getMaxLevelExp() - userInfoBean.getBattlePassExp();
|
||||||
ToastUtil.showDebug("max = "+maxExp+"|"+userInfoBean.getNextLevelExp());
|
|
||||||
|
|
||||||
new XPopup.Builder(getContext())
|
new XPopup.Builder(getContext())
|
||||||
.enableDrag(false)
|
.enableDrag(false)
|
||||||
|
Loading…
Reference in New Issue
Block a user