yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11111

Browse Source
This commit is contained in:
18401019693
2022-07-29 16:04:12 +08:00
parent 41f07f2e3d
commit 00de2169b9
39 changed files with 531 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@@ -209,6 +209,7 @@ public class EntryActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1);
}
});
@@ -571,6 +572,7 @@ public class EntryActivity extends AppCompatActivity {
public static void ToLogin() {
activity.startActivity(new Intent(activity, LoginActivity.class));
activity.finish();
}
private static final String EMAIL = "email";
@@ -725,8 +727,6 @@ public class EntryActivity extends AppCompatActivity {
EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class));
} else {
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@@ -311,14 +311,13 @@ public class LoginActivity extends AbsActivity {
logger.logEvent("FB_login");
Adjust.trackEvent(adjustEvent1);
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info[0] != null && mFirstLogin == true) {
JSONObject obj = JSON.parseObject(info[0]);
MainActivity.forward(LoginActivity.this, false);
finish();
gotoLive(obj.getString("anchor_id"));
IMLoginManager.get(mContext).setisNewUserOne(true);
IMLoginManager.get(mContext).setNewUserGif(true);
@@ -327,6 +326,7 @@ public class LoginActivity extends AbsActivity {
}
} else {
MainActivity.forward(LoginActivity.this, false);
finish();
}
}

4
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@@ -94,8 +94,6 @@ public class OneLoginDialog extends AbsDialogFragment {
@Override
public void onClick(View v) {
HttpClient.getInstance().post("User.userBindAgentAdmin", "User.userBindAgentAdmin")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("invitation_code", bundle.getString("code"))
.params("user_nicename", bundle.getString("name"))
.execute(new HttpCallback() {
@@ -114,8 +112,6 @@ public class OneLoginDialog extends AbsDialogFragment {
}
});
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

78
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@@ -95,8 +95,6 @@ public class MainHttpUtil {
public static void requestBonus(HttpCallback callback) {
String appVer = AppUtils.getAppVersionName();
HttpClient.getInstance().get("User.bonus", MainHttpConsts.REQUEST_BONUS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("appAndroidVersion", appVer)
.execute(callback);
}
@@ -106,9 +104,6 @@ public class MainHttpUtil {
*/
public static void requestNewBonus(HttpCallback callback) {
HttpClient.getInstance().get("Sign.userSign", MainHttpConsts.REQUEST_BONUS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("token", CommonAppConfig.getInstance().getToken())
.params("uuid_Device", DeviceUtils.getUniqueDeviceId())
.params("lastlogindevice", "Android")
.params("model", android.os.Build.BRAND + android.os.Build.MODEL)
@@ -120,8 +115,6 @@ public class MainHttpUtil {
*/
public static void getBonus(HttpCallback callback) {
HttpClient.getInstance().get("User.getBonus", MainHttpConsts.GET_BONUS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -130,8 +123,6 @@ public class MainHttpUtil {
*/
public static void setDistribut(String code, HttpCallback callback) {
HttpClient.getInstance().get("User.setDistribut", MainHttpConsts.SET_DISTRIBUT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("code", code)
.execute(callback);
}
@@ -142,7 +133,6 @@ public class MainHttpUtil {
public static void getHot(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getHot", MainHttpConsts.GET_HOT)
.params("p", p)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -151,7 +141,6 @@ public class MainHttpUtil {
*/
public static void getRandom(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getRandom", MainHttpConsts.GET_RANDOM)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -161,7 +150,6 @@ public class MainHttpUtil {
public static void getHomeFollow(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_HOME_FOLLOW)
.params("p", p)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -171,7 +159,6 @@ public class MainHttpUtil {
*/
public static void getFollow(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_FOLLOW)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("p", p)
.execute(callback);
}
@@ -191,7 +178,6 @@ public class MainHttpUtil {
//排行榜 收益榜
public static void profitList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.profitList", MainHttpConsts.PROFIT_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", type)
.params("p", p)
.execute(callback);
@@ -200,7 +186,6 @@ public class MainHttpUtil {
//排行榜 贡献榜
public static void consumeList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.consumeList", MainHttpConsts.CONSUME_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", type)
.params("p", p)
.execute(callback);
@@ -242,8 +227,6 @@ public class MainHttpUtil {
*/
public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
.params("uid", uid)
.params("token", token)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -277,8 +260,6 @@ public class MainHttpUtil {
public static void getBaseInfos(String uid, String token, HttpCallback callback) {
HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
.params("uid", uid)
.params("token", token)
.execute(callback);
}
@@ -296,8 +277,6 @@ public class MainHttpUtil {
*/
public static void getBalance(HttpCallback callback) {
HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -314,8 +293,6 @@ public class MainHttpUtil {
*/
public static void setBlack(String toUid, HttpCallback callback) {
HttpClient.getInstance().get("User.setBlack", MainHttpConsts.SET_BLACK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", toUid)
.execute(callback);
}
@@ -325,8 +302,6 @@ public class MainHttpUtil {
*/
public static void getSettingList(HttpCallback callback) {
HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -335,8 +310,6 @@ public class MainHttpUtil {
*/
public static void search(String key, int type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.search", MainHttpConsts.SEARCH)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("key", key)
.params("type", type)
.params("p", p)
@@ -348,7 +321,6 @@ public class MainHttpUtil {
*/
public static void getBlackList(int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getBlackList", "User.getBlackList")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("p", p)
.execute(callback);
}
@@ -360,7 +332,6 @@ public class MainHttpUtil {
*/
public static void getFollowList(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getFollowsList", MainHttpConsts.GET_FOLLOW_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("p", p)
.execute(callback);
@@ -373,7 +344,6 @@ public class MainHttpUtil {
*/
public static void getFansList(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getFansList", MainHttpConsts.GET_FANS_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("p", p)
.execute(callback);
@@ -386,8 +356,6 @@ public class MainHttpUtil {
public static void updateAvatar(File file, HttpCallback callback) {
HttpClient.getInstance().post("User.updateAvatar", MainHttpConsts.UPDATE_AVATAR)
.isMultipart(true)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("file", file)
.execute(callback);
}
@@ -399,8 +367,6 @@ public class MainHttpUtil {
*/
public static void updateFields(String fields, HttpCallback callback) {
HttpClient.getInstance().get("User.updateFields", MainHttpConsts.UPDATE_FIELDS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("fields", fields)
.execute(callback);
}
@@ -411,8 +377,6 @@ public class MainHttpUtil {
*/
public static void getProfit(HttpCallback callback) {
HttpClient.getInstance().get("User.getProfit", MainHttpConsts.GET_PROFIT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -421,8 +385,6 @@ public class MainHttpUtil {
*/
public static void getCashAccountList(HttpCallback callback) {
HttpClient.getInstance().get("User.getUserAccountList", MainHttpConsts.GET_USER_ACCOUNT_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -432,8 +394,6 @@ public class MainHttpUtil {
*/
public static void addCashAccount(String account, String name, String bank, int type, HttpCallback callback) {
HttpClient.getInstance().get("User.setUserAccount", MainHttpConsts.ADD_CASH_ACCOUNT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("account", account)
.params("name", name)
.params("account_bank", bank)
@@ -446,8 +406,6 @@ public class MainHttpUtil {
*/
public static void deleteCashAccount(String accountId, HttpCallback callback) {
HttpClient.getInstance().get("User.delUserAccount", MainHttpConsts.DEL_CASH_ACCOUNT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("id", accountId)
.execute(callback);
}
@@ -457,8 +415,6 @@ public class MainHttpUtil {
*/
public static void doCash(String votes, String accountId, HttpCallback callback) {
HttpClient.getInstance().get("User.setCash", MainHttpConsts.DO_CASH)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("cashvote", votes)//提现的票数
.params("accountid", accountId)//账号ID
.execute(callback);
@@ -471,7 +427,6 @@ public class MainHttpUtil {
public static void getClassLive(int classId, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getClassLive", MainHttpConsts.GET_CLASS_LIVE)
.params("liveclassid", classId)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("p", p)
.execute(callback);
}
@@ -481,8 +436,6 @@ public class MainHttpUtil {
*/
public static void getMyImpress(HttpCallback callback) {
HttpClient.getInstance().get("User.getMyLabel", MainHttpConsts.GET_MY_IMPRESS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -491,7 +444,6 @@ public class MainHttpUtil {
*/
public static void getRecommend(HttpCallback callback) {
HttpClient.getInstance().get("Home.getRecommend", MainHttpConsts.GET_RECOMMEND)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -501,7 +453,6 @@ public class MainHttpUtil {
*/
public static void recommendFollow(String touid, HttpCallback callback) {
HttpClient.getInstance().get("Home.attentRecommend", MainHttpConsts.RECOMMEND_FOLLOW)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.execute(callback);
}
@@ -545,8 +496,8 @@ public class MainHttpUtil {
HttpClient.getInstance().get("Login.bindMobile", MainHttpConsts.BINDMOBILE)
.params("mobile", mobile)
.params("country_code", countryCode + "")
.params("uid", uid)
.params("token", token)
.params("uid", uid,true)
.params("token", token,true)
.params("user_pass", user_pass)
.params("user_pass2", user_pass2)
.params("code", code)
@@ -560,8 +511,8 @@ public class MainHttpUtil {
HttpClient.getInstance().get("Login.updateBindMobile", MainHttpConsts.UPDATEBINDMOBILE)
.params("mobile", mobile)
.params("country_code", countryCode + "")
.params("uid", uid)
.params("token", token)
.params("uid", uid,true)
.params("token", token,true)
.params("code", code)
.execute(callback);
}
@@ -618,8 +569,6 @@ public class MainHttpUtil {
*/
public static void modifyPwd(String oldpass, String pass, String pass2, HttpCallback callback) {
HttpClient.getInstance().get("User.updatePass", MainHttpConsts.MODIFY_PWD)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("oldpass", oldpass)
.params("pass", pass)
.params("pass2", pass2)
@@ -644,8 +593,6 @@ public class MainHttpUtil {
*/
public static void getQrCode(HttpCallback callback) {
HttpClient.getInstance().get("Agent.getCode", MainHttpConsts.GET_QR_CODE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -655,7 +602,6 @@ public class MainHttpUtil {
*/
public static void getHomeTop(HttpCallback callback) {
HttpClient.getInstance().get("Home.consumeproList", MainHttpConsts.HOME_TOP)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", "month")
.params("p", "1")
.execute(callback);
@@ -666,8 +612,6 @@ public class MainHttpUtil {
*/
public static void sendDynamicGift(String id, int gift_num, String gift_id, HttpCallback callback) {
HttpClient.getInstance().get("Community.sendDynamicGift", MainHttpConsts.SEND_DYNAMICGIFT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("dynamic_id", id)
.params("gift_num", gift_num)
.params("gift_id", gift_id)
@@ -679,8 +623,6 @@ public class MainHttpUtil {
*/
public static void getDynamicGiftInfo(HttpCallback callback) {
HttpClient.getInstance().get("Community.getDynamicGiftInfo", MainHttpConsts.GET_DYNAMICGIFTINFO)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -689,8 +631,6 @@ public class MainHttpUtil {
*/
public static void getDynamicSendGiftList(String id, HttpCallback callback) {
HttpClient.getInstance().get("Community.getDynamicSendGiftList", MainHttpConsts.GET_DYNAMICSENDGIFTLIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("dynamic_id", id)
.execute(callback);
}
@@ -700,8 +640,6 @@ public class MainHttpUtil {
*/
public static void isAnchor(HttpCallback callback) {
HttpClient.getInstance().get("User.isAnchor", MainHttpConsts.ISANCHOR)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -710,8 +648,6 @@ public class MainHttpUtil {
*/
public static void getUserFrontTaskType(HttpCallback callback) {
HttpClient.getInstance().get("Task.getUserFrontTaskType", MainHttpConsts.GET_USER_FRONTTASKTYPE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -720,8 +656,6 @@ public class MainHttpUtil {
*/
public static void getCustomerService(HttpCallback callback) {
HttpClient.getInstance().get("Home.getCustomerService", MainHttpConsts.GETCUSTOMERSERVICE)
// .params("uid", CommonAppConfig.getInstance().getUid())
// .params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -730,8 +664,6 @@ public class MainHttpUtil {
*/
public static void getInstructorRemark(HttpCallback callback) {
HttpClient.getInstance().get("User.getInstructorRemark", MainHttpConsts.GETINSTRUCTORREMARK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -740,8 +672,6 @@ public class MainHttpUtil {
*/
public static void isInstructor(HttpCallback callback) {
HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}

3
main/src/main/java/com/yunbao/main/views/HonorViewHolder.java
View File

@@ -76,8 +76,7 @@ public class HonorViewHolder extends AbsUserHomeViewHolder {
* 获取用户荣誉和座骑
*/
HttpClient.getInstance().get("User.medalCarList", LiveHttpConsts.GET_USER_LIST)
.params("uid", mToUid)
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", mToUid,true)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {