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

HOSO提包版本

Browse Source
This commit is contained in:
zlzw 2024-11-12 09:48:25 +08:00
parent bf8268712b
commit db05ff116e
114 changed files with 1068 additions and 868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Share/src/main/AndroidManifest.xml
View File

@ -25,10 +25,10 @@
android:label="@string/app_name"
android:screenOrientation="portrait" />
<provider
<!-- <provider
android:name="com.facebook.FacebookContentProvider"
android:authorities="com.facebook.app.FacebookContentProvider2011402032399020"
android:exported="true" />
android:exported="true" />-->
<receiver
android:name="com.yunbao.share.receiver.TwitterResultReceiver"
android:exported="false">

9
app/build.gradle
View File

@ -69,11 +69,12 @@ android {
exclude 'lib/armeabi-v7a/libMNN_Express.so'
//美颜
if (rootProject.ext.manifestPlaceholders.isPluginModel) {
}
//谷歌包干掉美颜
exclude 'lib/armeabi-v7a/libCNamaSDK.so'
exclude 'lib/arm64-v8a/libCNamaSDK.so'
exclude 'lib/armeabi-v7a/libfuai.so'
exclude 'lib/arm64-v8a/libfuai.so'
}
}
compileOptions {
@ -126,8 +127,8 @@ android {
variant.mergeAssetsProvider.configure {
doLast {
delete(fileTree(dir: outputDir, includes: ['model/ai_bgseg_green.bundle',
//'model/ai_face_processor.bundle',
//'model/ai_face_processor_lite.bundle',
'model/ai_face_processor.bundle',//谷歌包干掉美颜
'model/ai_face_processor_lite.bundle',//谷歌包干掉美颜
'model/ai_hairseg.bundle',
'model/ai_hand_processor.bundle',
'model/ai_human_processor.bundle',
@ -259,7 +260,7 @@ android {
//abiFilters "arm64-v8a", "x86_64"
println("打包ndk 链接")
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "arm64-v8a"
//abiFilters "arm64-v8a"
println("打包ndk其他")
}

10
app/src/google_online/google-services.json
View File

@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
"android_client_info": {
"package_name": "com.newpdlive.sy"
"package_name": "com.yhosolive.oy"
}
},
"oauth_client": [
@ -17,7 +17,7 @@
"client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.newpdlive.sy",
"package_name": "com.yhosolive.oy",
"certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
}
},
@ -25,7 +25,7 @@
"client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.newpdlive.sy",
"package_name": "com.yhosolive.oy",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},
@ -33,7 +33,7 @@
"client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.newpdlive.sy",
"package_name": "com.yhosolive.oy",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
@ -41,7 +41,7 @@
"client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.newpdlive.sy",
"package_name": "com.yhosolive.oy",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},

6
app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
View File

@ -235,8 +235,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
playAD(obj.getIntValue("type") == 0);
} else {
releaseVideo();
LauncherActivity.this.startActivity(new Intent(LauncherActivity.this, EntryActivity.class));
LauncherActivity.this.finish();
Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(LauncherActivity.this, findViewById(R.id.app_logo), findViewById(R.id.app_logo).getTransitionName()).toBundle();
LauncherActivity.this.startActivity(new Intent(LauncherActivity.this, EntryActivity.class),bundle);
new Handler(getMainLooper()).postDelayed(LauncherActivity.this::finish, 1000);
}
} else {
checkUidAndToken();
@ -428,6 +429,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
if (mContainer == null) {
return;
}
findViewById(R.id.app_logo).setVisibility(View.GONE);
if (isImage) {
int imgSize = mAdList.size();
if (imgSize > 0) {

12
common/src/main/java/com/yunbao/common/HtmlConfig.java
View File

@ -7,12 +7,12 @@ package com.yunbao.common;
public class HtmlConfig {
//登录即代表同意服务和隐私条款
public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59";
public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=727";
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=726";
//注册用户协议
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";
public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.php?id=2";
public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.php?id=3";
//直播间贡献榜
public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid=";
@ -33,7 +33,7 @@ public class HtmlConfig {
public static final String LUCK_GIFT_TIP = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=26";
//直播间玩家看到的心愿单
public static final String WISHLIST_URL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Wish&a=index";
public static final String WISHLIST_URL = CommonAppConfig.HOST + "/h5/wish/index.html?1=1";
//直播间玩家看到的转盘
public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index";
@ -48,7 +48,7 @@ public class HtmlConfig {
public static final String PERSONAL = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/Personal";
//我的徽章 右上角问号
public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Fans&a=rule&isfans=1";
public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/h5/fans/rule.html?isfans=1";
//我的明细
public static final String DETAIL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Detail&a=index";

3
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@ -306,6 +306,9 @@ public class WebViewActivity extends AbsActivity {
}
public static void forward(Context context, String url, boolean isLive) {
if(!url.contains("?")){
url+="?t="+System.currentTimeMillis()+"&";
}
forward(context, url, true, isLive);
}

4
common/src/main/java/com/yunbao/common/bean/CheckUpgradesModel.java
View File

@ -2,6 +2,7 @@ package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.List;
public class CheckUpgradesModel extends BaseModel {
@ -38,6 +39,9 @@ public class CheckUpgradesModel extends BaseModel {
}
public List<RewardsModel> getRewards() {
if(rewards == null) {
rewards = new ArrayList<>();
}
return rewards;
}

3
common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java
View File

@ -295,6 +295,9 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
public void setLayoutManager(RecyclerView.LayoutManager layoutManager) {
mRecyclerView.setLayoutManager(layoutManager);
}
public <T extends RecyclerView.LayoutManager> T getLayoutManager(){
return (T) mRecyclerView.getLayoutManager();
}
public void setItemDecoration(ItemDecoration itemDecoration) {
mRecyclerView.addItemDecoration(itemDecoration);

2
common/src/main/java/com/yunbao/common/http/API.java
View File

@ -80,7 +80,7 @@ public class API extends BaseApi {
.addInterceptor(initQuery(isNeedUid, isNeedToken, CommonAppContext.sInstance.getApplicationContext()))
.addInterceptor(loggingInterceptor);
return create(builder.build(),
GsonConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class);
JavaConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class);
}
//公共参数

4
common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java
View File

@ -20,8 +20,8 @@ public class CommonHttpConsts {
public static final String DOWNLOAD_GIF = "downloadGif";
public static final String GET_BALANCE = "getBalance";
public static final String CHECK_TOKEN_INVALID = "checkTokenInvalid";
public static final String NOTIFY_GOOGLE = "Charge.google_pay";
public static final String COMMUNITY_SETREPORT = "Community.setReport";
public static final String NOTIFY_GOOGLE = "gugezhifuhuidiao";
public static final String COMMUNITY_SETREPORT = "yonghushequdongtaijubao";
public static final String GET_USER_HOME = "getUserHome";
public static final String GET_USER_BASEINFO = "getUserBaseinfo";

18
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -175,7 +175,7 @@ public class CommonHttpUtil {
}
Log.i("来了", lang);
//或者仅仅使用 locale = Locale.getDefault(); 不需要考虑接口 deprecated(弃用)问题
HttpClient.getInstance().get("Home.getConfig", CommonHttpConsts.GET_CONFIG).params("langue", lang).params("version", "" + VersionUtil.getVersion()).params("from", "android").params("appType", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("huoquzhuyepeizhixinxi", CommonHttpConsts.GET_CONFIG).params("langue", lang).params("version", "" + VersionUtil.getVersion()).params("from", "android").params("appType", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
@ -305,7 +305,7 @@ public class CommonHttpUtil {
ToastUtil.show(WordUtil.getString(R.string.cannot_follow_self));
return;
}
HttpClient.getInstance().get("User.setAttents", tag).params("touid", touid).execute(new HttpCallback() {
HttpClient.getInstance().get("caozuoguanzhuzhuangtaiv2", tag).params("touid", touid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0 || code == 1001) {
@ -340,7 +340,7 @@ public class CommonHttpUtil {
} else {
isGoogle = "-1";
}
HttpClient.getInstance().get("User.getBalance", CommonHttpConsts.GET_BALANCE).params("type", 0).params("isGooglePay", isGoogle).execute(callback);
HttpClient.getInstance().get("huoquwodezuanshi", CommonHttpConsts.GET_BALANCE).params("type", 0).params("isGooglePay", isGoogle).execute(callback);
}
/**
@ -389,7 +389,7 @@ public class CommonHttpUtil {
* 检查token是否失效
*/
public static void checkTokenInvalid() {
HttpClient.getInstance().get("User.ifToken", CommonHttpConsts.CHECK_TOKEN_INVALID).execute(NO_CALLBACK);
HttpClient.getInstance().get("shezhijiaoyouzhaopianzhuangtai", CommonHttpConsts.CHECK_TOKEN_INVALID).execute(NO_CALLBACK);
}
@ -405,11 +405,11 @@ public class CommonHttpUtil {
}
public static void Google_sec_pay(String purchaseToken, String orderNo, String tradeNo, HttpCallback callback) {
HttpClient.getInstance().get("Charge.Google_sec_pay", "Charge.Google_sec_pay").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback);
HttpClient.getInstance().get("gugedingdanyanzheng", "gugedingdanyanzheng").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback);
}
public static void notifySamsung(String purchaseId, String selfOrderId,HttpCallback callback) {
HttpClient.getInstance().get("Charge.SamsungNotify", "Charge.SamsungNotify")
HttpClient.getInstance().get("sanxingzhifuhuidiao", "sanxingzhifuhuidiao")
.params("purchaseID", purchaseId)
.params("SelfOrderId", selfOrderId)
.params("PackageName", "pd")
@ -450,13 +450,13 @@ public class CommonHttpUtil {
* 用户个人主页信息
*/
public static void getUserBaseinfo(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.getUserBaseinfo", CommonHttpConsts.GET_USER_BASEINFO).params("touid", touid).execute(callback);
HttpClient.getInstance().get("huoquyonghujichuxinxi", CommonHttpConsts.GET_USER_BASEINFO).params("touid", touid).execute(callback);
}
/**
* 上传文件 获取七牛云token的接口
*/
public static void getUploadQiNiuToken(HttpCallback callback, boolean isImg) {
HttpClient.getInstance().get("Pdluserhome.getQiNiuToken2", "Pdluserhome.getQiNiuToken2")
HttpClient.getInstance().get("huoquqiniushangchuanlingpaiv2", "huoquqiniushangchuanlingpaiv2")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("ext", isImg ? ".jpeg" : ".mp4")
@ -469,7 +469,7 @@ public class CommonHttpUtil {
if(StringUtil.isEmpty(uid)){
uid="NotLogin_"+ DeviceUtils.getUniqueDeviceId();
}
HttpClient.getInstance().get("Pdluserhome.getQiNiuToken3", "Pdluserhome.getQiNiuToken3")
HttpClient.getInstance().get("huoquqiniushangchuanlingpaiv3", "huoquqiniushangchuanlingpaiv3")
.params("uid",uid)
.params("token", CommonAppConfig.getInstance().getToken())
.params("file_name", fileName)

4
common/src/main/java/com/yunbao/common/http/HttpClient.java
View File

@ -34,7 +34,7 @@ public class HttpClient {
private String mUrl;
private HttpClient() {
mUrl = CommonAppConfig.HOST + "/api/public/?service=";
mUrl = CommonAppConfig.HOST + "/";
}
public static HttpClient getInstance() {
@ -69,6 +69,7 @@ public class HttpClient {
}
public GetRequest<JsonBean> get(String serviceName, String tag) {
serviceName=serviceName+"hs";
Context context = CommonAppContext.sInstance.getApplicationContext();
//拼装基本信息
Map<String, String> map = new HashMap<>();
@ -112,6 +113,7 @@ public class HttpClient {
}
public PostRequest<JsonBean> post(String serviceName, String tag) {
serviceName=serviceName+"hs";
Context context = CommonAppContext.sInstance.getApplicationContext();
//拼装基本信息
Map<String, String> map = new HashMap<>();

2
common/src/main/java/com/yunbao/common/http/HttpLoggingInterceptor.java
View File

@ -135,7 +135,7 @@ public class HttpLoggingInterceptor implements Interceptor {
boolean logHeaders = (printLevel == Level.BODY || printLevel == Level.HEADERS);
StringBuilder sb=new StringBuilder();
try {
sb.append("<-- ").append(clone.code())
sb.append("<-- ").append("HTTP结果").append(clone.code())
.append(' ').append(clone.message())
.append(' ').append(clone.request().url())
.append(" (").append(tookMs).append("ms）\n");

97
common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java Normal file
View File

@ -0,0 +1,97 @@
package com.yunbao.common.http;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.reflect.TypeToken;
import com.yunbao.common.utils.AesUtils;
import com.yunbao.common.utils.L;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Base64;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.Converter;
import retrofit2.Retrofit;
public final class JavaConverterFactory extends Converter.Factory {
/**
* Create an instance using a default {@link Gson} instance for conversion. Encoding to JSON and
* decoding from JSON (when no charset is specified by a header) will use UTF-8.
*/
public static JavaConverterFactory create() {
return create(new Gson());
}
/**
* Create an instance using {@code gson} for conversion. Encoding to JSON and
* decoding from JSON (when no charset is specified by a header) will use UTF-8.
*/
public static JavaConverterFactory create(Gson gson) {
return new JavaConverterFactory(gson);
}
private final Gson gson;
private JavaConverterFactory(Gson gson) {
if (gson == null) throw new NullPointerException("gson == null");
this.gson = gson;
}
@Override
public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations,
Retrofit retrofit) {
TypeAdapter<?> adapter = gson.getAdapter(TypeToken.get(type));
return new JsonResponseBodyConverter<>(gson, adapter);
}
@Override
public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
return super.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
}
final class JsonResponseBodyConverter <T> implements Converter<ResponseBody, T> {
private final Gson gson;
private final TypeAdapter<T> adapter;
JsonResponseBodyConverter(Gson gson, TypeAdapter<T> adapter) {
this.gson = gson;
this.adapter = adapter;
}
@Override
public T convert(ResponseBody value) throws IOException {
String response = value.string();
String allResponseData;
L.e("解密前：:"+response);
JSONObject jsonObject = JSONObject.parseObject(response);
if(jsonObject!=null){
allResponseData = jsonObject.getString("data");
if(allResponseData!=null){
byte[] decodedData = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
decodedData = Base64.getDecoder().decode(allResponseData);
}
response = AesUtils.decryptToString(decodedData);
}
}
jsonObject.put("data",JSONObject.parseObject(response));
response = JSON.toJSONString(jsonObject);
L.e("解密后：:"+ response);
//获取加密数据，解密，之后再让adapter去处理json串，解析具体的数据就可以了
try{
return adapter.fromJson(response);
} catch (Exception e) {
e.printStackTrace();
} finally {
value.close();
}
return null;
}
}
}

50
common/src/main/java/com/yunbao/common/http/JsonBean.java
View File

@ -1,5 +1,18 @@
package com.yunbao.common.http;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
import com.google.gson.Gson;
import com.yunbao.common.bean.AdBean;
import com.yunbao.common.utils.AesUtils;
import com.yunbao.common.utils.L;
import java.util.Base64;
import java.util.List;
/**
* Created by cxf on 2017/8/5.
*/
@ -7,7 +20,7 @@ package com.yunbao.common.http;
public class JsonBean {
private int ret;
private String msg;
private Data data;
private String data;
public int getRet() {
return ret;
@ -26,10 +39,41 @@ public class JsonBean {
}
public Data getData() {
return data;
if(data.indexOf(":")>0){
return GsonUtils.fromJson(data,Data.class);
}else{
Data resultData = new Data();
byte[] decodedData = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
decodedData = Base64.getDecoder().decode(data);
}
String decryptedText = AesUtils.decryptToString(decodedData);
JSONObject object = JSON.parseObject(decryptedText);
try {
JSONArray jsonArray = object.getJSONArray("info");
String [] array = new String[jsonArray.size()];
for (int i = 0; i <array.length; i++) {
array[i] = jsonArray.getString(i);
}
resultData.setInfo(array);
resultData.setCode(object.getInteger("code"));
resultData.setMsg(object.getString("msg"));
}catch (Exception e) {
try {
String [] array = new String[1];
array[0]= object.getString("info");
resultData.setInfo(array);
resultData.setCode(object.getInteger("code"));
resultData.setMsg(object.getString("msg"));
} catch (JSONException ex) {
L.e("字符串格式错误");
}
}
return resultData;
}
}
public void setData(Data data) {
public void setData(String data) {
this.data = data;
}
}

194
common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
View File

@ -35,7 +35,7 @@ public class LiveHttpUtil {
* 获取当前直播间的用户列表
*/
public static void getUserList(String liveuid, String stream, String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Live.getUserLists", LiveHttpConsts.GET_USER_LIST)
HttpClient.getInstance().get("zhibojianyonghuliebiao", LiveHttpConsts.GET_USER_LIST)
.params("liveuid", liveuid)
.params("stream", stream)
.params("type", type)
@ -51,7 +51,7 @@ public class LiveHttpUtil {
* @param callback 回调
*/
public static void getUserRankList(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Contribute.index", LiveHttpConsts.GET_USER_LIST)
HttpClient.getInstance().get("xiaofeitongji", LiveHttpConsts.GET_USER_LIST)
.params("uid", liveUid)
.execute(callback);
}
@ -60,7 +60,7 @@ public class LiveHttpUtil {
* 获取当前直播间的连麦用户列表
*/
public static void getMicList(String liveuid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Live.getDrLm", "Live.getDrLm")
HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai")
.params("uid", liveuid, true)
.execute(callback);
}
@ -69,7 +69,7 @@ public class LiveHttpUtil {
* 获取活动列表
*/
public static void getHDList(HttpCallback callback) {
HttpClient.getInstance().get("Active.getActiveList", "Active.getActiveList")
HttpClient.getInstance().get("huoquhuodongliebiao", "huoquhuodongliebiao")
.execute(callback);
}
@ -80,7 +80,7 @@ public class LiveHttpUtil {
* @param stream 主播的stream
*/
public static void roomCharge(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.roomCharge", LiveHttpConsts.ROOM_CHARGE)
HttpClient.getInstance().get("fangjiankoufei", LiveHttpConsts.ROOM_CHARGE)
.params("stream", stream)
.params("liveuid", liveUid)
.execute(callback);
@ -94,7 +94,7 @@ public class LiveHttpUtil {
* @param stream 主播的stream
*/
public static void timeCharge(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.timeCharge", LiveHttpConsts.TIME_CHARGE)
HttpClient.getInstance().get("fangjianjishikoufei", LiveHttpConsts.TIME_CHARGE)
.params("stream", stream)
.params("liveuid", liveUid)
.execute(callback);
@ -105,7 +105,7 @@ public class LiveHttpUtil {
* 获取用户余额
*/
public static void getCoin(HttpCallback callback) {
HttpClient.getInstance().get("Live.getCoin", LiveHttpConsts.GET_COIN)
HttpClient.getInstance().get("zhibojianhuoquyonghuyue", LiveHttpConsts.GET_COIN)
.execute(callback);
}
@ -115,7 +115,7 @@ public class LiveHttpUtil {
* @param touid 对方的uid
*/
public static void getLiveRecord(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getLiverecord", LiveHttpConsts.GET_LIVE_RECORD)
HttpClient.getInstance().get("huoquzhibojilu", LiveHttpConsts.GET_LIVE_RECORD)
.params("touid", touid)
.params("p", p)
.execute(callback);
@ -127,7 +127,7 @@ public class LiveHttpUtil {
* @param recordId 视频的id
*/
public static void getAliCdnRecord(String recordId, HttpCallback callback) {
HttpClient.getInstance().get("User.getAliCdnRecord", LiveHttpConsts.GET_ALI_CDN_RECORD)
HttpClient.getInstance().get("huoqulubojilu", LiveHttpConsts.GET_ALI_CDN_RECORD)
.params("id", recordId)
.execute(callback);
}
@ -137,7 +137,7 @@ public class LiveHttpUtil {
* 获取主播印象列表
*/
public static void getAllImpress(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.getUserLabel", LiveHttpConsts.GET_ALL_IMPRESS)
HttpClient.getInstance().get("huoquyonghuyingxiangbiaoqian", LiveHttpConsts.GET_ALL_IMPRESS)
.params("touid", touid)
.execute(callback);
}
@ -146,7 +146,7 @@ public class LiveHttpUtil {
* 给主播设置印象
*/
public static void setImpress(String touid, String ImpressIDs, HttpCallback callback) {
HttpClient.getInstance().get("User.setUserLabel", LiveHttpConsts.SET_IMPRESS)
HttpClient.getInstance().get("shezhiyonghuyingxiangbiaoqian", LiveHttpConsts.SET_IMPRESS)
.params("touid", touid)
.params("labels", ImpressIDs)
.execute(callback);
@ -157,7 +157,7 @@ public class LiveHttpUtil {
* 获取当前直播间的管理员列表
*/
public static void getAdminList(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Live.getAdminList", LiveHttpConsts.GET_ADMIN_LIST)
HttpClient.getInstance().get("huoquguanliyuanliebiao", LiveHttpConsts.GET_ADMIN_LIST)
.params("liveuid", liveUid)
.execute(callback);
}
@ -166,7 +166,7 @@ public class LiveHttpUtil {
* 主播设置或取消直播间的管理员
*/
public static void setAdmin(String liveUid, String touid, HttpCallback callback) {
HttpClient.getInstance().get("Live.setAdmin", LiveHttpConsts.SET_ADMIN)
HttpClient.getInstance().get("shezhiguanliyuanzhuangtai", LiveHttpConsts.SET_ADMIN)
.params("liveuid", liveUid)
.params("touid", touid)
.execute(callback);
@ -176,7 +176,7 @@ public class LiveHttpUtil {
* 获取直播间的禁言列表
*/
public static void getLiveShutUpList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getShutList", LiveHttpConsts.GET_LIVE_SHUT_UP_LIST)
HttpClient.getInstance().get("jinyanyonghu", LiveHttpConsts.GET_LIVE_SHUT_UP_LIST)
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
@ -186,7 +186,7 @@ public class LiveHttpUtil {
* 直播间解除禁言
*/
public static void liveCancelShutUp(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelShut", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
HttpClient.getInstance().get("jiechujinyan", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
.params("liveuid", liveUid)
.params("touid", toUid)
.execute(callback);
@ -196,7 +196,7 @@ public class LiveHttpUtil {
* 获取直播间的拉黑列表
*/
public static void getLiveBlackList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getKickList", LiveHttpConsts.GET_LIVE_BLACK_LIST)
HttpClient.getInstance().get("tichuyonghu", LiveHttpConsts.GET_LIVE_BLACK_LIST)
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
@ -206,7 +206,7 @@ public class LiveHttpUtil {
* 直播间解除拉黑
*/
public static void liveCancelBlack(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelKick", LiveHttpConsts.LIVE_CANCEL_BLACK)
HttpClient.getInstance().get("jiechutichu", LiveHttpConsts.LIVE_CANCEL_BLACK)
.params("liveuid", liveUid)
.params("touid", toUid)
.execute(callback);
@ -217,7 +217,7 @@ public class LiveHttpUtil {
* 直播结束后，获取直播收益，观看人数，时长等信息
*/
public static void getLiveEndInfo(String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.stopInfo", LiveHttpConsts.GET_LIVE_END_INFO)
HttpClient.getInstance().get("zhibojieshuxinxi", LiveHttpConsts.GET_LIVE_END_INFO)
.params("stream", stream)
.execute(callback);
}
@ -226,7 +226,7 @@ public class LiveHttpUtil {
* 获取直播间举报内容列表
*/
public static void getLiveReportList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getReportClass", LiveHttpConsts.GET_LIVE_REPORT_LIST)
HttpClient.getInstance().get("huoqujubaopeizhixinxi", LiveHttpConsts.GET_LIVE_REPORT_LIST)
.execute(callback);
}
@ -234,7 +234,7 @@ public class LiveHttpUtil {
* 举报用户
*/
public static void setReport(String touid, String content, HttpCallback callback) {
HttpClient.getInstance().get("Live.setReport", LiveHttpConsts.SET_REPORT)
HttpClient.getInstance().get("yonghujubao", LiveHttpConsts.SET_REPORT)
.params("touid", touid)
.params("content", content)
.execute(callback);
@ -244,7 +244,7 @@ public class LiveHttpUtil {
* 举报用户 + 图片
*/
public static void setReport(String touid,String report_argument, String content, File file1, File file2, File file3, String videoId, HttpCallback callback) {
PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.setReport", LiveHttpConsts.SET_REPORT)
PostRequest<JsonBean> request = HttpClient.getInstance().post("yonghujubao", LiveHttpConsts.SET_REPORT)
.isMultipart(true)
.params("touid", touid)
.params("report_argument", report_argument)
@ -268,7 +268,7 @@ public class LiveHttpUtil {
* 直播间点击聊天列表和头像出现的弹窗
*/
public static void getLiveUser(String touid, String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Live.getPop", LiveHttpConsts.GET_LIVE_USER)
HttpClient.getInstance().get("zhibojiantanchuangxinxi", LiveHttpConsts.GET_LIVE_USER)
.params("touid", touid)
.params("liveuid", liveUid)
.execute(callback);
@ -278,7 +278,7 @@ public class LiveHttpUtil {
* 主播或管理员踢人
*/
public static void kicking(String liveUid, String touid, HttpCallback callback) {
HttpClient.getInstance().get("Live.kicking", LiveHttpConsts.KICKING)
HttpClient.getInstance().get("zhibojiantiren", LiveHttpConsts.KICKING)
.params("liveuid", liveUid)
.params("touid", touid)
.execute(callback);
@ -294,7 +294,7 @@ public class LiveHttpUtil {
* @param time 禁言时间 （分）
*/
public static void setShutUp(String liveUid, String stream, int type, String touid, String time, HttpCallback callback) {
GetRequest<JsonBean> request = HttpClient.getInstance().get("Live.setShutUp", LiveHttpConsts.SET_SHUT_UP)
GetRequest<JsonBean> request = HttpClient.getInstance().get("zhibojianjinyan", LiveHttpConsts.SET_SHUT_UP)
.params("liveuid", liveUid)
.params("stream", stream)
.params("type", type)
@ -312,7 +312,7 @@ public class LiveHttpUtil {
* @param type 0表示关闭当前直播 1表示禁播，2表示封禁账号
*/
public static void superCloseRoom(String liveUid, int type, HttpCallback callback) {
HttpClient.getInstance().get("Live.superStopRoom", LiveHttpConsts.SUPER_CLOSE_ROOM)
HttpClient.getInstance().get("chaoguanguanbo", LiveHttpConsts.SUPER_CLOSE_ROOM)
.params("liveuid", liveUid)
.params("type", type)
.execute(callback);
@ -323,7 +323,7 @@ public class LiveHttpUtil {
* 守护商品类型列表
*/
public static void getGuardBuyList(HttpCallback callback) {
HttpClient.getInstance().get("Guard.getList", LiveHttpConsts.GET_GUARD_BUY_LIST)
HttpClient.getInstance().get("shouhuliebiaov2", LiveHttpConsts.GET_GUARD_BUY_LIST)
.execute(callback);
}
@ -331,7 +331,7 @@ public class LiveHttpUtil {
* 购买守护接口
*/
public static void buyGuard(String liveUid, String stream, int guardId, int cid, HttpCallback callback) {
GetRequest<JsonBean> request = HttpClient.getInstance().get("Guard.buyGuard", LiveHttpConsts.BUY_GUARD)
GetRequest<JsonBean> request = HttpClient.getInstance().get("goumaishouhu", LiveHttpConsts.BUY_GUARD)
.params("liveuid", liveUid)
.params("stream", stream)
.params("guardid", guardId);
@ -347,13 +347,13 @@ public class LiveHttpUtil {
* 查看主播的守护列表
*/
public static void getGuardList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Guard.getGuardList", LiveHttpConsts.GET_GUARD_LIST)
HttpClient.getInstance().get("shouhuliebiao", LiveHttpConsts.GET_GUARD_LIST)
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
}
public static void getContactMsg(int page, HttpCallback callback) {
HttpClient.getInstance().get("Live.getContactMsg", "getContactMsg")
HttpClient.getInstance().get("huoqulianxifangshixiaoxi", "huoqulianxifangshixiaoxi")
.params("p", page)
.execute(callback);
}
@ -362,7 +362,7 @@ public class LiveHttpUtil {
* 观众跟主播连麦时，获取自己的流地址
*/
public static void getLinkMicStream(HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.requestLVBAddrForLinkMic", LiveHttpConsts.GET_LINK_MIC_STREAM)
HttpClient.getInstance().get("lianmaituilaliudizhi", LiveHttpConsts.GET_LINK_MIC_STREAM)
.execute(callback);
}
@ -373,7 +373,7 @@ public class LiveHttpUtil {
* @param pull_url 连麦用户播流地址
*/
public static void linkMicShowVideo(String touid, String pull_url) {
HttpClient.getInstance().get("Live.showVideo", LiveHttpConsts.LINK_MIC_SHOW_VIDEO)
HttpClient.getInstance().get("lianmaixinxi", LiveHttpConsts.LINK_MIC_SHOW_VIDEO)
.params("liveuid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("pull_url", pull_url)
@ -389,7 +389,7 @@ public class LiveHttpUtil {
* 主播设置是否允许观众发起连麦
*/
public static void setLinkMicEnable(boolean linkMicEnable, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.setMic", LiveHttpConsts.SET_LINK_MIC_ENABLE)
HttpClient.getInstance().get("shezhilianmaikaiguan", LiveHttpConsts.SET_LINK_MIC_ENABLE)
.params("ismic", linkMicEnable ? 1 : 0)
.execute(callback);
}
@ -399,7 +399,7 @@ public class LiveHttpUtil {
* 观众检查主播是否允许连麦
*/
public static void checkLinkMicEnable(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.isMic", LiveHttpConsts.CHECK_LINK_MIC_ENABLE)
HttpClient.getInstance().get("panduanzhubaoshifoukaiqilianmai", LiveHttpConsts.CHECK_LINK_MIC_ENABLE)
.params("liveuid", liveUid)
.execute(callback);
}
@ -408,7 +408,7 @@ public class LiveHttpUtil {
* 连麦pk检查对方主播在线状态
*/
public static void livePkCheckLive(String liveUid, String stream, String uidStream, HttpCallback callback) {
HttpClient.getInstance().get("Home.getisPk", "Home.getisPk")
HttpClient.getInstance().get("huoqupkzhuangtai", "huoqupkzhuangtai")
.params("uid", liveUid, true)
// .params("token", CommonAppConfig.getInstance().getToken())
// .params("liveuid", liveUid)
@ -473,7 +473,7 @@ public class LiveHttpUtil {
* 发送弹幕
*/
public static void sendDanmu(String content, String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendBarrage", LiveHttpConsts.SEND_DANMU)
HttpClient.getInstance().get("fasongdanmu", LiveHttpConsts.SEND_DANMU)
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", "1")
@ -489,7 +489,7 @@ public class LiveHttpUtil {
* @param stream 主播的stream
*/
public static void checkLive(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.checkLive", LiveHttpConsts.CHECK_LIVE)
HttpClient.getInstance().get("jianchazhibo", LiveHttpConsts.CHECK_LIVE)
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@ -500,33 +500,13 @@ public class LiveHttpUtil {
* 观众进入直播间
*/
public static void enterRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.enterRoom", LiveHttpConsts.ENTER_ROOM)
HttpClient.getInstance().get("jinruzhibojian", LiveHttpConsts.ENTER_ROOM)
.params("city", CommonAppConfig.getInstance().getCity())
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
}
/**
* 观众进入直播间后，还要请求一次
*/
public static void enterBackRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Tx.userjoinroom", "Tx.userjoinroom")
.params("GroupId", "g" + liveUid)
.params("stream", stream)
.execute(callback);
}
/**
* 观众退出直播间后，还要请求一次
*/
public static void qBackRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Tx.leave_room", "Tx.leave_room")
.params("GroupId", "g" + liveUid)
.params("stream", stream)
.execute(callback);
}
/**
* 获取礼物列表，同时会返回剩余的钱
*/
@ -539,14 +519,14 @@ public class LiveHttpUtil {
* 获取礼物列表，同时会返回剩余的钱（新版）
*/
public static void getNewGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getGiftListApp", LiveHttpConsts.GET_GIFT_LIST)
HttpClient.getInstance().get("zhibojianliwuxinxi", LiveHttpConsts.GET_GIFT_LIST)
.execute(callback);
}
/**
* 获取礼物列表，同时会返回剩余的钱（新版） -用于获取联系方式时的礼物设置
*/
public static void getHotGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Gift.getHotGiftList", LiveHttpConsts.GET_GIFT_LIST)
HttpClient.getInstance().get("huoqusuoyouremenliwu", LiveHttpConsts.GET_GIFT_LIST)
.execute(callback);
}
@ -554,7 +534,7 @@ public class LiveHttpUtil {
* 获取包裹列表
*/
public static void getWrapList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getPackList", LiveHttpConsts.GET_WRAP_LIST)
HttpClient.getInstance().get("zhibojianbaoguoxinxi", LiveHttpConsts.GET_WRAP_LIST)
.execute(callback);
}
@ -562,7 +542,7 @@ public class LiveHttpUtil {
* 主播获取心愿单列表
*/
public static void getWishList(HttpCallback callback) {
HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST)
HttpClient.getInstance().get("huoquxinyuandan", LiveHttpConsts.GET_WISH_LIST)
.execute(callback);
}
@ -570,7 +550,7 @@ public class LiveHttpUtil {
* 用户获取主播的心愿单列表
*/
public static void getWishList(String liveId, HttpCallback callback) {
HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST)
HttpClient.getInstance().get("huoquxinyuandan", LiveHttpConsts.GET_WISH_LIST)
.params("uid", liveId, true)
.execute(callback);
}
@ -581,7 +561,7 @@ public class LiveHttpUtil {
* @param callback
*/
public static void getFrontTask(HttpCallback callback) {
HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask")
HttpClient.getInstance().get("huoquxinshouyindaozhuangtai", "huoquxinshouyindaozhuangtai")
.execute(callback);
}
@ -591,7 +571,7 @@ public class LiveHttpUtil {
* @param callback
*/
public static void getFrontTask(String Token, String uid, HttpCallback callback) {
HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask")
HttpClient.getInstance().get("huoquxinshouyindaozhuangtai", "huoquxinshouyindaozhuangtai")
.params("token", Token, true)
.params("uid", uid, true)
.execute(callback);
@ -601,7 +581,7 @@ public class LiveHttpUtil {
* 完成新手任務
*/
public static void setFrontTask(String type, HttpCallback callback) {
HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask")
HttpClient.getInstance().get("shezhixinshouyindaozhuangtai", "shezhixinshouyindaozhuangtai")
.params("type", type)
.execute(callback);
}
@ -610,7 +590,7 @@ public class LiveHttpUtil {
* 完成新手任務
*/
public static void setFrontTask(String type, String liveuid, HttpCallback callback) {
HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask")
HttpClient.getInstance().get("shezhixinshouyindaozhuangtai", "shezhixinshouyindaozhuangtai")
.params("type", type)
.params("liveuid", liveuid)
.execute(callback);
@ -620,7 +600,7 @@ public class LiveHttpUtil {
* 修改心愿单列表
*/
public static void modifyWishList(String list, HttpCallback callback) {
HttpClient.getInstance().get("Guide.setWishlist", LiveHttpConsts.SET_WISH_LIST)
HttpClient.getInstance().get("shezhixinyuandan", LiveHttpConsts.SET_WISH_LIST)
.params("list", list)
.execute(callback);
}
@ -642,7 +622,7 @@ public class LiveHttpUtil {
* @param isContactGift 是否为联系方式礼物
*/
public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendGift", LiveHttpConsts.SEND_GIFT)
HttpClient.getInstance().get("zhibojianzengsongliwu", LiveHttpConsts.SEND_GIFT)
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", giftId)
@ -659,7 +639,7 @@ public class LiveHttpUtil {
* @param isContactGift 是否为联系方式礼物
*/
public static void sendGiftForPage(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendPackGift", LiveHttpConsts.SEND_GIFT)
HttpClient.getInstance().get("zhibojianzengsongbaoguoliwu", LiveHttpConsts.SEND_GIFT)
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", giftId)
@ -676,7 +656,7 @@ public class LiveHttpUtil {
* @param isContactGift 是否为联系方式礼物
*/
public static void sendGiftForFansGroup(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) {
HttpClient.getInstance().get("Live.fansExclusivePack", LiveHttpConsts.SEND_GIFT)
HttpClient.getInstance().get("zengsongfensituanbaoguoliwu", LiveHttpConsts.SEND_GIFT)
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", giftId)
@ -688,7 +668,7 @@ public class LiveHttpUtil {
.execute(callback);
}
public static void sendBlindBoxTicket(String by, String liveUid, String stream, int giftId, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendBlindBoxTicket", LiveHttpConsts.SEND_GIFT)
HttpClient.getInstance().get("mangheshiyongquan", LiveHttpConsts.SEND_GIFT)
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", giftId)
@ -717,7 +697,7 @@ public class LiveHttpUtil {
* 点亮發IM
*/
public static void sendZAN(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Fans.doubleClickLight", "Fans.DoubleClickLight")
HttpClient.getInstance().get("shuangjidianliang", "shuangjidianliang")
.params("liveuid", liveUid)
.execute(callback);
}
@ -726,7 +706,7 @@ public class LiveHttpUtil {
* 连麦pk搜索主播
*/
public static void livePkSearchAnchor(String key, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livepk.search", LiveHttpConsts.LIVE_PK_SEARCH_ANCHOR)
HttpClient.getInstance().get("sousuozhiboyonghu", LiveHttpConsts.LIVE_PK_SEARCH_ANCHOR)
.params("key", key)
.params("p", p)
.execute(callback);
@ -737,7 +717,7 @@ public class LiveHttpUtil {
* 获取主播连麦pk列表
*/
public static void getLivePkList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Livepk.getLiveList", LiveHttpConsts.GET_LIVE_PK_LIST)
HttpClient.getInstance().get("huoquzhiboyonghuliebiao", LiveHttpConsts.GET_LIVE_PK_LIST)
.params("p", p)
.execute(callback);
}
@ -774,7 +754,7 @@ public class LiveHttpUtil {
*/
public static void newcreateRoom(String title, int liveClassId, int type, int typeVal, File file, int clarityType,boolean isSw, HttpCallback callback) {
PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.createRoom2", LiveHttpConsts.CREATE_ROOM)
PostRequest<JsonBean> request = HttpClient.getInstance().post("chuangjianzhibov2", LiveHttpConsts.CREATE_ROOM)
.params("title", title)
.params("liveclassid", liveClassId)
.params("type", type)
@ -793,7 +773,7 @@ public class LiveHttpUtil {
* 修改直播状态
*/
public static void changeLive(String stream) {
HttpClient.getInstance().get("Live.changeLive", LiveHttpConsts.CHANGE_LIVE)
HttpClient.getInstance().get("xiugaizhibozhuangtai", LiveHttpConsts.CHANGE_LIVE)
.params("stream", stream)
.params("status", "1")
.execute(new HttpCallback() {
@ -808,7 +788,7 @@ public class LiveHttpUtil {
* 主播结束直播
*/
public static void stopLive(String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.stopRoom", LiveHttpConsts.STOP_LIVE)
HttpClient.getInstance().get("guanbizhibo", LiveHttpConsts.STOP_LIVE)
.params("stream", stream)
.execute(callback);
}
@ -817,12 +797,12 @@ public class LiveHttpUtil {
* 主播开播前获取sdk类型 0金山 1腾讯
*/
public static void getLiveSdk(HttpCallback callback) {
HttpClient.getInstance().get("Live.getSDK", LiveHttpConsts.GET_LIVE_SDK)
HttpClient.getInstance().get("huoqusdk", LiveHttpConsts.GET_LIVE_SDK)
.execute(callback);
}
public static void getisRong(HttpCallback callback) {
HttpClient.getInstance().get("Live.isRong", "Live.isRong")
HttpClient.getInstance().get("shifouweirongyunzhubo", "shifouweirongyunzhubo")
.execute(callback);
}
@ -831,7 +811,7 @@ public class LiveHttpUtil {
* @param callback
*/
public static void getIsSw(HttpCallback callback) {
HttpClient.getInstance().get("Tx.setRtcFirm", "Tx.setRtcFirm")
HttpClient.getInstance().get("shezhiyuanshengduanshengwangpeizhi", "shezhiyuanshengduanshengwangpeizhi")
.execute(callback);
}
@ -839,7 +819,7 @@ public class LiveHttpUtil {
* 腾讯sdk 跟主播连麦时，获取主播的低延时流
*/
public static void getTxLinkMicAccUrl(String originStreamUrl, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.requestPlayUrlWithSignForLinkMic", LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL)
HttpClient.getInstance().get("jianquanliudizhi", LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL)
.params("originStreamUrl", originStreamUrl)
.execute(callback);
}
@ -849,7 +829,7 @@ public class LiveHttpUtil {
* 连麦时候 主播混流
*/
public static void linkMicTxMixStream(String mergeparams) {
HttpClient.getInstance().get("Linkmic.mergeVideoStream", LiveHttpConsts.LINK_MIC_TX_MIX_STREAM)
HttpClient.getInstance().get("lianmaihunliu", LiveHttpConsts.LINK_MIC_TX_MIX_STREAM)
.params("mergeparams", mergeparams)
.execute(CommonHttpUtil.NO_CALLBACK);
}
@ -859,7 +839,7 @@ public class LiveHttpUtil {
* 我是哪些直播间的管理员，返回这些直播间列表
*/
public static void getMyAdminRoomList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getRoomList", LiveHttpConsts.GET_MY_ADMIN_ROOM_LIST)
HttpClient.getInstance().get("huoquwodefangjian", LiveHttpConsts.GET_MY_ADMIN_ROOM_LIST)
.params("p", p)
.execute(callback);
}
@ -869,7 +849,7 @@ public class LiveHttpUtil {
* 获取直播间奖池等级
*/
public static void getLiveGiftPrizePool(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Jackpot.getJackpot", LiveHttpConsts.GET_LIVE_GIFT_PRIZE_POOL)
HttpClient.getInstance().get("huoquyindaoyexinxi", LiveHttpConsts.GET_LIVE_GIFT_PRIZE_POOL)
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@ -879,7 +859,7 @@ public class LiveHttpUtil {
* 主播checkLive
*/
public static void anchorCheckLive(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.checkLiveing", LiveHttpConsts.ANCHOR_CHECK_LIVE)
HttpClient.getInstance().get("jiancefangjiangzhuangtai", LiveHttpConsts.ANCHOR_CHECK_LIVE)
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@ -890,7 +870,7 @@ public class LiveHttpUtil {
* 获取直播间信息
*/
public static void getLiveInfo(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Live.getLiveInfo", LiveHttpConsts.GET_LIVE_INFO)
HttpClient.getInstance().get("huoquzhiboxinxi", LiveHttpConsts.GET_LIVE_INFO)
.params("liveuid", liveUid)
.execute(callback);
}
@ -901,7 +881,7 @@ public class LiveHttpUtil {
*/
public static void getHcGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getSvgaList", LiveHttpConsts.GET_GIFT_LIST)
HttpClient.getInstance().get("huoquliwudonghualiebiao", LiveHttpConsts.GET_GIFT_LIST)
.execute(callback);
}
@ -911,7 +891,7 @@ public class LiveHttpUtil {
*/
public static void getHczGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Home.aoto_load", "Home.aoto_load")
HttpClient.getInstance().get("yuxiazai", "yuxiazai")
.execute(callback);
}
@ -920,29 +900,21 @@ public class LiveHttpUtil {
* 获取活动
*/
public static void geteEvent(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Rank.isActivity", LiveHttpConsts.GET_EVENT)
HttpClient.getInstance().get("huodongpeizhixinxi", LiveHttpConsts.GET_EVENT)
.params("anchorUid", anchor_id)
.execute(callback);
}
public static void getAnchorActiveImgStatus(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Live.getAnchorActiveImgStatus", LiveHttpConsts.GET_EVENT)
HttpClient.getInstance().get("huoquzhuboxunfuchuangzhuangtai", LiveHttpConsts.GET_EVENT)
.params("anchorUid", anchor_id)
.execute(callback);
}
/**
* 重置活动
*/
public static void setEvent(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Rank.crystalTimeEnd", LiveHttpConsts.GET_EVENT)
.params("anchor_id", anchor_id)
.execute(callback);
}
/**
* 整蛊转盘拯救主播
*/
public static void userHopePrankTurntable(String anchor_id, String prankid, HttpCallback callback) {
HttpClient.getInstance().get("Prank.userHopePrankTurntable", LiveHttpConsts.USERHOPEPRANKTURNTABLE)
HttpClient.getInstance().get("yonghuzhengjiuzhubo", LiveHttpConsts.USERHOPEPRANKTURNTABLE)
.params("prankid", prankid)
.params("anchor_id", anchor_id)
.execute(callback);
@ -952,7 +924,7 @@ public class LiveHttpUtil {
* 倒计时结束
*/
public static void endPrankTurntable(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Prank.endPrankTurntable", LiveHttpConsts.ENDPRANKTURNTABLE)
HttpClient.getInstance().get("zhenggudaojishijieshu", LiveHttpConsts.ENDPRANKTURNTABLE)
.params("anchor_id", anchor_id)
.execute(callback);
}
@ -961,7 +933,7 @@ public class LiveHttpUtil {
* 周星榜数据
*/
public static void getAnchorLastWeekList(HttpCallback callback) {
HttpClient.getInstance().get("WeekStar.getAnchorLastWeekList", LiveHttpConsts.GETANCHORLASTWEEKLIST)
HttpClient.getInstance().get("huoqushangzhouzhouxingbangzhubo", LiveHttpConsts.GETANCHORLASTWEEKLIST)
.execute(callback);
}
@ -969,7 +941,7 @@ public class LiveHttpUtil {
* 热度加成列表
*/
public static void useHotCardUserList(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Live.useHotCardUserList", LiveHttpConsts.USEHOTCARDUSERLIST)
HttpClient.getInstance().get("redukayonghuliebiao", LiveHttpConsts.USEHOTCARDUSERLIST)
.params("anchor_id", anchor_id)
.execute(callback);
}
@ -978,7 +950,7 @@ public class LiveHttpUtil {
* 是否有热度加成
*/
public static void isHotCard(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Live.isHotCard", LiveHttpConsts.ISHOTCARD)
HttpClient.getInstance().get("zhibozhongshifoushiyongreduka", LiveHttpConsts.ISHOTCARD)
.params("anchor_id", anchor_id)
.execute(callback);
}
@ -987,7 +959,7 @@ public class LiveHttpUtil {
* 修改im备注信息
*/
public static void setInstructorRemark(String touid, String remark, HttpCallback callback) {
HttpClient.getInstance().get("User.setInstructorRemark", LiveHttpConsts.SETINSTRUCTORREMARK)
HttpClient.getInstance().get("shezhiyonghubeizhuming", LiveHttpConsts.SETINSTRUCTORREMARK)
.params("touid", touid)
.params("remark", remark)
.execute(callback);
@ -997,7 +969,7 @@ public class LiveHttpUtil {
* 获取用户贵族喇叭的数量
*/
public static void getNobleTrumpetNum(HttpCallback callback) {
HttpClient.getInstance().get("Noble.getNobleTrumpetNum", "getNobleTrumpetNum")
HttpClient.getInstance().get("huoquguizulabashuliang", "huoquguizulabashuliang")
.execute(callback);
}
@ -1005,7 +977,7 @@ public class LiveHttpUtil {
* 获取用户贵族喇叭的数量
*/
public static void nobleUseTrumpet(String trumpet_msg, String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Noble.nobleUseTrumpet", "nobleUseTrumpet")
HttpClient.getInstance().get("guizushiyonglaba", "guizushiyonglaba")
.params("", trumpet_msg)
.params("", anchor_id)
.execute(callback);
@ -1015,7 +987,7 @@ public class LiveHttpUtil {
* 获取用户贵族喇叭的数量
*/
public static void getStarChallengeStatus(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("StarChallenge.getStarChallengeStatus", "StarChallengeStatus")
HttpClient.getInstance().get("huoquxingjitiaozhanzhuangtai", "huoquxingjitiaozhanzhuangtai")
.params("liveUid", liveUid)
.execute(callback);
}
@ -1024,14 +996,14 @@ public class LiveHttpUtil {
* 首页关注直播
*/
public static void getHomeFollow(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getFollow", "Home.getFollow")
HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", "huoquguanzhuzhuboliebiao")
.params("p", p)
.execute(callback);
}
public static void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, String currencyType, int page, HttpCallback callback) {
HttpClient.getInstance().get("Sudgameserver.getRoomList", "Sudgameserver.getRoomList")
HttpClient.getInstance().get("huoquyouxiliebiao", "huoquyouxiliebiao")
.params("sud_game_id", sudGameId)
.params("threshold", threshold)
.params("room_holder_type", roomHolderType)
@ -1051,7 +1023,7 @@ public class LiveHttpUtil {
* @param callback
*/
public static void gameRecord(String sudGameId, String currencyType, String dateType, int page, HttpCallback callback) {
HttpClient.getInstance().get("Sudgameserver.gameRecord", "Sudgameserver.gameRecord")
HttpClient.getInstance().get("chaxunyouxijilu", "chaxunyouxijilu")
.params("sud_game_id", sudGameId)
.params("currency_type", currencyType)
.params("date_type", dateType)
@ -1063,7 +1035,7 @@ public class LiveHttpUtil {
* 获取短剧Url
*/
public static void getCoolydrama(HttpCallback callback){
HttpClient.getInstance().get("cool.register", "Home.getFollow")
HttpClient.getInstance().get("duanjuzhanghaozhuce", "duanjuzhanghaozhuce")
.params("lang", WordUtil.isNewZh()?"zh_CN":"en")
.execute(callback);
}

353
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

File diff suppressed because it is too large Load Diff

21
common/src/main/java/com/yunbao/common/http/base/GetRequestParams.java
View File

@ -28,7 +28,14 @@ public class GetRequestParams implements IRequestParam {
.addQueryParameter("uid", String.valueOf(model.getId()))
.addQueryParameter("token", model.getToken())
.build();*/
HttpUrl.Builder builder = request.url().newBuilder();
HttpUrl.Builder builder = HttpUrl.get(request.url().url()).newBuilder()
.scheme(request.url().scheme())
.host(request.url().host())
.port(request.url().port());
String uuuu=request.url().pathSegments().get(0)+"hs";
builder.setPathSegment(0,uuuu);
//System.out.println("原始请求地址:"+request.url().url()+" 新地址:"+builder.build().url());
if (TextUtils.isEmpty(model.getToken())) {
RouteUtil.forwardEntry();
} else {
@ -40,12 +47,14 @@ public class GetRequestParams implements IRequestParam {
builder.addQueryParameter("token", model.getToken());
}
}
return request.newBuilder().url(builder.build()).build();
}
return request;
}else {
HttpUrl.Builder builder = HttpUrl.get(request.url() +"hs").newBuilder()
.scheme(request.url().scheme())
.host(request.url().host())
.port(request.url().port());
return request.newBuilder().url(builder.build()).build();
}
}
}

13
common/src/main/java/com/yunbao/common/http/base/PostRequestParams.java
View File

@ -8,11 +8,19 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.RouteUtil;
import okhttp3.FormBody;
import okhttp3.HttpUrl;
import okhttp3.Request;
public class PostRequestParams implements IRequestParam {
@Override
public Request getRequest(boolean isNeedUid,boolean isNeedToken, Request request, Context context) {
String urlStr= request.url().toString();
HttpUrl.Builder builder = HttpUrl.get(request.url().url()).newBuilder()
.scheme(request.url().scheme())
.host(request.url().host())
.port(request.url().port());
String uuuu=request.url().pathSegments().get(0)+"hs";
builder.setPathSegment(0,uuuu);
if (request.body() instanceof FormBody) {
FormBody.Builder bodyBuilder = new FormBody.Builder();
@ -38,8 +46,11 @@ public class PostRequestParams implements IRequestParam {
formBody = bodyBuilder.build();
}
}
request = request.newBuilder().post(formBody).build();
request = request.newBuilder().url(builder.build()).post(formBody).build();
}else {
request=request.newBuilder().url(builder.build()).build();
}
//System.out.println("原始请求地址:"+urlStr+" 新地址:"+request.url()+" build地址："+builder.build().url().toString());
return request;
}
}

8
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@ -447,7 +447,7 @@ public class IMLoginManager extends BaseCacheManager {
private Runnable isInstructorRunnable = new Runnable() {
@Override
public void run() {
HttpClient.getInstance().get("User.isInstructor", "isInstructor")
HttpClient.getInstance().get("shifouweituiguangzhanghao", "isInstructor")
.params("uid", userInfo.getId(), true)
.params("token", userInfo.getToken(), true)
.execute(new HttpCallback() {
@ -518,7 +518,7 @@ public class IMLoginManager extends BaseCacheManager {
String uid = uidAndToken[0];
String token = uidAndToken[1];
if (TextUtils.isEmpty(token)) return;
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", uid)
.params("token", token)
.execute(new HttpCallback() {
@ -539,7 +539,7 @@ public class IMLoginManager extends BaseCacheManager {
}
public void updateUserCoin() {
HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance")
HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -557,7 +557,7 @@ public class IMLoginManager extends BaseCacheManager {
}
public void updateUserCoin(OnItemClickListener<JSONObject> listener) {
HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance")
HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
View File

@ -102,7 +102,7 @@ public class InstructorRemarkManager extends BaseCacheManager {
@Override
public void run() {
IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo();
HttpClient.getInstance().get("User.getInstructorRemark", "getInstructorRemark")
HttpClient.getInstance().get("huoqutuiguangbeizhumingliebiao", "huoqutuiguangbeizhumingliebiao")
.params("uid", userInfo.getId(),true)
.params("token", userInfo.getToken(),true)
.execute(new HttpCallback() {

2
common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java
View File

@ -116,7 +116,7 @@ public class NoviceInstructorManager extends BaseCacheManager {
IMLoginModel userModel = new Gson().fromJson(model1.getExtra(), IMLoginModel.class);
if (userModel != null && TextUtils.equals(userModel.getIsAdmin(), "1")) {
IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo();
HttpClient.getInstance().get("Message.setZdyMsg", "setZdyMsg")
HttpClient.getInstance().get("shezhizhidaoyuanxiaoxizhuangtai", "shezhizhidaoyuanxiaoxizhuangtai")
.params("uid", userInfo.getId(), true)
.execute(new HttpCallback() {
@Override

4
common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
View File

@ -101,7 +101,7 @@ public class MessageIMManager {
if (userInfo == null) {
return;
}
HttpClient.getInstance().get("Message.getLists", "getImUserInfo")
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", "huoquxitongxiaoxiliebiaov2")
.params("uid", userInfo.getId())
.params("token", userInfo.getToken())
.execute(new HttpCallback() {
@ -164,7 +164,7 @@ public class MessageIMManager {
public void getSystemMessages(SystemMessagesHttpCallback callback) {
systemNumber = 0;
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
HttpClient.getInstance().get("Message.getLists", "getImUserInfo")
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", "huoquxitongxiaoxiliebiaov2")
.params("uid", userInfo.getId())
.params("token", userInfo.getToken())
.execute(new HttpCallback() {

2
common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
View File

@ -51,7 +51,7 @@ public class RongcloudIMManager {
if (CommonAppConfig.HOST.contains("ceshi")) {
RONG_IM_KEY = "pvxdm17jpd3hr"; //测试服key
} else {
RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
RONG_IM_KEY = "6tnym1br6lhu7"; //正式服key
}
}

2
common/src/main/java/com/yunbao/common/pay/PayPresenter.java
View File

@ -137,7 +137,7 @@ public class PayPresenter {
initGooglePay();
}
String newParm = StringUtil.contact("Charge.getGoogleOrder", orderParams, "&type=android",
String newParm = StringUtil.contact("gugeshangpindingdan", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName() + "&source=android"
);

74
common/src/main/java/com/yunbao/common/utils/AesUtils.java Normal file
View File

@ -0,0 +1,74 @@
package com.yunbao.common.utils;
import com.alibaba.fastjson.JSON;
import java.io.UnsupportedEncodingException;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
public class AesUtils {
/**
* 使用AES/ECB/PKCS5Padding模式解密数据
*
* @param encryptedData 加密后的字节数组（Base64解码后的结果，如果原始数据是Base64编码的话）
* @param keyBytes AES密钥（16/24/32字节长，对应AES-128/192/256）
* @return 解密后的明文字节数组，如果解密失败则返回null
*/
public static byte[] decrypt(byte[] encryptedData, byte[] keyBytes) {
try {
// 创建密钥规格
SecretKeySpec keySpec = new SecretKeySpec(keyBytes, "AES-128-ECB");
// 获取Cipher实例并初始化为解密模式
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.DECRYPT_MODE, keySpec);
// 执行解密
byte[] decryptedBytes = cipher.doFinal(encryptedData);
// 返回解密后的字节数组
return decryptedBytes;
} catch (Exception e) {
e.printStackTrace();
return null; // 解密失败时返回null
}
}
/**
* 如果需要将解密后的字节数组转换为字符串（注意：这可能会导致数据丢失或乱码）
*
* @param encryptedData 加密后的字节数组（或Base64解码后的结果）
* @return 解密后的字符串，如果解密失败则返回null
*/
public static String decryptToString(byte[] encryptedData) {
byte[] decryptedBytes = decrypt(encryptedData,"h0IJK0jhVRpJYeVO".getBytes());
if (decryptedBytes != null) {
// 尝试将字节数组转换为字符串（使用指定的字符集）
try {
return decodeUnicode(new String(decryptedBytes, "UTF-8"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
return null;
}
public static String decodeUnicode(String unicode) {
/* StringBuilder sb = new StringBuilder();
for (int i = 0; i < unicode.length();) {
if (unicode.charAt(i) == '\\') {
if (i + 5 < unicode.length()) {
String codePointStr = unicode.substring(i + 2, i + 6);
try {
int codePoint = Integer.parseInt(codePointStr, 16);
sb.append((char) codePoint);
i += 6;
continue;
} catch (NumberFormatException e) {
// Handle format error
}
}
}
sb.append(unicode.charAt(i++));
}*/
return JSON.parseObject(unicode).toString();
}
}

4
common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
View File

@ -620,7 +620,7 @@ public class JavascriptInterfaceUtils {
@JavascriptInterface
public void androidClickToTaskPage() {
ARouter.getInstance().build(PATH_REWARD).withString("url",
CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid()
CommonAppConfig.HOST + "/h5/task/index.html?" + "uid=" + CommonAppConfig.getInstance().getUid()
+ "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation();
}
@ -658,7 +658,7 @@ public class JavascriptInterfaceUtils {
@JavascriptInterface
public void wearOrCancelFanMedal() {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.execute(new HttpCallback() {

2
common/src/main/java/com/yunbao/common/utils/MicStatusManager.java
View File

@ -104,7 +104,7 @@ public class MicStatusManager {
* 断开连麦
*/
public void downMic() {
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", micLiveId)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {

3
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@ -57,6 +57,7 @@ public class RouteUtil {
public static final String PATH_FEEDBACK_ACTIVITY = "/main/FeedbackActivity";
public static final String PATH_FEEDBACK_EDIT_ACTIVITY = "/main/FeedbackEditActivity";
public static final String PATH_LIVE_PUNISHACTIVITY = "/live/PunishActivity";
public static final String PATH_MAIN_MESSAGE = "/main/MainMessageActivity";
public static void forwardCommunityActivity() {
@ -235,7 +236,7 @@ public class RouteUtil {
* 跳转到充值页面
*/
public static void forwardMyCoin(Context context) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
String url = CommonAppConfig.HOST + "/h5/mall/zhifu.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation();
}

4
common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
View File

@ -26,6 +26,7 @@ public abstract class AbsViewHolder implements LifeCycleListener {
mTag = getClass().getSimpleName();
mContext = context;
mParentView = parentView;
onCreateHolder();
mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
init();
}
@ -41,6 +42,9 @@ public abstract class AbsViewHolder implements LifeCycleListener {
protected void processArguments(Object... args) {
}
public void onCreateHolder(){
}
protected abstract int getLayoutId();

2
common/src/main/res/drawable/backgroud_live_open_lfet.xml
View File

@ -3,6 +3,6 @@
<solid android:color="@color/white" />
<stroke
android:width="1.2dp"
android:color="#FFAE05" />
android:color="#2ED0FF" />
<corners android:radius="21dp" />
</shape>

2
common/src/main/res/drawable/backgroud_live_open_right.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFC621" />
<solid android:color="#2ED0FF" />
<corners android:radius="21dp" />
</shape>

2
common/src/main/res/layout/view_complete_information.xml
View File

@ -77,7 +77,7 @@
android:background="@drawable/backgroud_live_open_lfet"
android:gravity="center"
android:text="@string/cancel"
android:textColor="#FFC621"
android:textColor="#2ED0FF"
android:textSize="14sp" />
<TextView

BIN
common/src/main/res/mipmap-mdpi/tipbox_btn_orange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

4
common/src/main/res/values-zh/strings.xml
View File

@ -648,7 +648,7 @@
<string name="welcome_pdlive">歡迎來到HOSO</string>
<string name="newcomer">恭喜你獲得了新人獎勵</string>
<string name="FILE_PROVIDER">com.newpdlive.sy.fileprovider</string>
<string name="FILE_PROVIDER">com.pdsylive.yo.fileprovider</string>
<string name="ren">人</string>
<string name="ge">個</string>
<string name="count">數量</string>
@ -1174,7 +1174,7 @@
<string name="have_already_win">已將%s發送至您的個性裝扮</string>
<string name="mini_blind_box">迷你盲盒</string>
<string name="collection_blind_box">典藏盲盒</string>
<string name="pd_blind_box">PD盲盒</string>
<string name="pd_blind_box">HOSO盲盒</string>
<string name="live_vote_create_error">投票創建失敗</string>
<string name="individual_dressing">個性裝扮</string>
<string name="random_availability">可隨機獲得，%s</string>

2
common/src/main/res/values/strings.xml
View File

@ -1180,7 +1180,7 @@
<string name="have_already_win">%s has been sent to your personalized dress up</string>
<string name="mini_blind_box">Mini blind box</string>
<string name="collection_blind_box">Collection blind box</string>
<string name="pd_blind_box">PD blind box</string>
<string name="pd_blind_box">HOSO blind box</string>
<string name="individual_dressing">Individual dressing</string>
<string name="random_availability">Can be obtained randomly, %s</string>
<string name="random_availability2">I got %s %s</string>

8
config.gradle
View File

@ -4,16 +4,16 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 23,
targetSdkVersion : 34,
versionCode : 698,
versionName : "6.8.1"
versionCode : 702,
versionName : "6.8.2"
]
manifestPlaceholders = [
//正式、
// serverHost : "https://napi.yaoulive.com",
serverHost : "https://napi.yaoulive.com",
serverHost : "https://api.hosolive.com",
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
testServerHost : "https://ceshi.yaoulive.com",
testServerHost : "https://api.hosolive.com",
//百度语音识别

2
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/LiveFloatView.java
View File

@ -333,7 +333,7 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
private Runnable liveCheck = new Runnable() {
@Override
public void run() {
HttpClient.getInstance().get("Live.checkLive", "")
HttpClient.getInstance().get("jianchazhibo", "")
.params("liveuid", mLiveBean.getUid())
.params("stream", mLiveBean.getStream())
.execute(new HttpCallback() {

2
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -972,7 +972,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url, true);
dialog.dismiss();
}

2
live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java
View File

@ -232,7 +232,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
mLivePushViewHolder.leave.setVisibility(View.GONE);
sendSystemMessage(mContext.getString(R.string.live_anchor_come_back));
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("isleave", leave)
.execute(new Callback<JsonBean>() {
@Override

4
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -1236,7 +1236,7 @@ public class LiveAudienceActivity extends LiveActivity {
manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal());
} else {
//获取房间连麦状态
HttpClient.getInstance().get("live.getDrLm", "live.getDrLm").params("uid", mLiveUid, true).execute(new HttpCallback() {
HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai").params("uid", mLiveUid, true).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@ -1602,7 +1602,7 @@ public class LiveAudienceActivity extends LiveActivity {
case "3":
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(mContext, bean.getLink(), true);
WebViewActivity.forward(mContext, bean.getLink()+"?1=1", true);
} else {
startActivity(new Intent(mContext, SystemMessageActivity.class).putExtra("type", bean.getType()).putExtra("uid", "").putExtra("title", "").putExtra("headImg", ""));

6
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -400,7 +400,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
// return;
// }
if (isDRPK != 1) {
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum")
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -414,7 +414,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
new DialogUitl.SimpleCallback2() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom")
HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk")
.params("type", "1")
.params("sign", "1")
.execute(new HttpCallback() {
@ -572,7 +572,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
sendSystemMessageRy(mContext.getString(R.string.live_anchor_come_back));
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("isleave", leave)
.params("token", CommonAppConfig.getInstance().getToken())

6
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -410,7 +410,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
// return;
// }
if (isDRPK != 1) {
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum")
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -424,7 +424,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
new DialogUitl.SimpleCallback2() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom")
HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk")
.params("type", "1")
.params("sign", "1")
.execute(new HttpCallback() {
@ -588,7 +588,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveAnchorViewHolder.setLeaveFlag(false);
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("isleave", leave)
.params("token", CommonAppConfig.getInstance().getToken())

3
live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
View File

@ -307,6 +307,9 @@ public class WebViewActivityMedal extends AbsActivity {
}
public static void forward(Context context, String url) {
if(!url.contains("?")){
url+="?t="+System.currentTimeMillis()+"&";
}
forward(context, url, true);
}

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -410,7 +410,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
* 设置贵族状态
*/
private void loadUserVip() {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.execute(new HttpCallback() {

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -513,7 +513,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
* 设置贵族状态
*/
private void loadUserVip() {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.execute(new HttpCallback() {

4
live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java
View File

@ -172,7 +172,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
@Override
public void run() {
HttpClient.getInstance().get("Live.getUserDrLmPower", "Live.getUserDrLmPower")
HttpClient.getInstance().get("huoquyonghulianmaizhuangtai", "huoquyonghulianmaizhuangtai")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@ -280,7 +280,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
public void onConfirmClick(Dialog dialog, String content) {
Log.e("ry", "退出112");
// //退出多人房间
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {

4
live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java
View File

@ -63,8 +63,8 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment {
EventBus.getDefault().register(this);
RelativeLayout rlWebview= (RelativeLayout) findViewById(R.id.rlWebview);
if (mWishWebViewHolder == null) {
String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
String url= CommonAppConfig.HOST + "/h5/Turntable/prank.html?";
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag",url);
mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url);

2
live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java
View File

@ -151,7 +151,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
private Runnable setBlackRunnable = new Runnable() {
@Override
public void run() {
HttpClient.getInstance().get("User.setBlack", "setBlack")
HttpClient.getInstance().get("shezhilaheizhuangtai", "setBlack")
.params("touid", userId);
}
};

2
live/src/main/java/com/yunbao/live/http/ImHttpConsts.java
View File

@ -9,7 +9,7 @@ public class ImHttpConsts {
public static final String GET_SYSTEM_MESSAGE_LIST = "getSystemMessageList";
public static final String GET_COMMUNITYLIST_LIST = "getCommunityList";
public static final String CHECK_BLACK = "checkBlack";
public static final String SEND_DYNAMICCOMMENT = "sendDynamicComment";
public static final String SEND_DYNAMICCOMMENT = "fabudongtaipinglun";
public static final String SET_BLACK = "setBlack";
public static final String GET_MESSAGEGIFTINFO = "getMessageGiftInfo";

24
live/src/main/java/com/yunbao/live/http/ImHttpUtil.java
View File

@ -20,7 +20,7 @@ public class ImHttpUtil {
* 私信聊天页面用于获取用户信息
*/
public static void getImUserInfo(String uids, HttpCallback callback) {
HttpClient.getInstance().get("Message.getLists", ImHttpConsts.GET_IM_USER_INFO)
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", ImHttpConsts.GET_IM_USER_INFO)
.execute(callback);
}
@ -28,7 +28,7 @@ public class ImHttpUtil {
* 互动消息回复
*/
public static void sendDynamicComment(String dynamic_id, String content, String to_comment_id, HttpCallback callback) {
HttpClient.getInstance().get("Community.sendDynamicComment", ImHttpConsts.SEND_DYNAMICCOMMENT)
HttpClient.getInstance().get("fabudongtaipinglun", ImHttpConsts.SEND_DYNAMICCOMMENT)
.params("dynamic_id", dynamic_id)
.params("content", content)
.params("to_comment_id", to_comment_id)
@ -39,7 +39,7 @@ public class ImHttpUtil {
* 获取系统消息列表
*/
public static void getSystemMessageList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Message.getListInfo", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST)
HttpClient.getInstance().get("huoquxitongxiaoxixiangqing", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST)
.params("p", p)
.params("type", type)
.execute(callback);
@ -49,7 +49,7 @@ public class ImHttpUtil {
* 猜你喜欢
*/
public static void getCommunityList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Community.guessYouLike", ImHttpConsts.GET_COMMUNITYLIST_LIST)
HttpClient.getInstance().get("cainixihuandongtailiebiao", ImHttpConsts.GET_COMMUNITYLIST_LIST)
.params("p", p)
.execute(callback);
}
@ -59,7 +59,7 @@ public class ImHttpUtil {
* 判断自己有没有被对方拉黑，聊天的时候用到
*/
public static void checkBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.checkBlack", ImHttpConsts.CHECK_BLACK)
HttpClient.getInstance().get("jiancelaheizhuangtai", ImHttpConsts.CHECK_BLACK)
.params("touid", touid)
.execute(callback);
}
@ -68,7 +68,7 @@ public class ImHttpUtil {
* 拉黑对方， 解除拉黑
*/
public static void setBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.setBlack", ImHttpConsts.SET_BLACK)
HttpClient.getInstance().get("shezhilaheizhuangtai", ImHttpConsts.SET_BLACK)
.params("touid", touid)
.execute(callback);
}
@ -78,7 +78,7 @@ public class ImHttpUtil {
* 获取补偿消息详情
*/
public static void getMessageGiftInfo(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.getMessageGiftInfo", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("chakanxiaoxilibanxiangqing", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@ -87,7 +87,7 @@ public class ImHttpUtil {
* 删除系统消息
*/
public static void delMsg(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.deleteSystemMessage", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("shanchuxitongxiaoxi", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@ -96,7 +96,7 @@ public class ImHttpUtil {
* 已读 系统消息
*/
public static void readMsg(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.systemMessageRead", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("xitongxiaoxiyiduzhuangtai", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@ -105,7 +105,7 @@ public class ImHttpUtil {
* 领取礼物
*/
public static void receiveGift(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.getMessageGiftDetails", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("lingquxitongxiaoxilibao", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@ -114,7 +114,7 @@ public class ImHttpUtil {
* 处罚通知是否有未读消息
*/
public static void getPenalizeStatus(HttpCallback callback) {
HttpClient.getInstance().get("Message.penalizeStatus", "Message.penalizeStatus")
HttpClient.getInstance().get("jianchaweiduchufanxiaoxi", "jianchaweiduchufanxiaoxi")
.execute(callback);
}
@ -122,7 +122,7 @@ public class ImHttpUtil {
* 处罚通知列表
*/
public static void getPenalizeList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Message.penalizeList", "Message.penalizeList")
HttpClient.getInstance().get("chufantongzhiliebiao", "chufantongzhiliebiao")
.params("p", p)
.execute(callback);
}

8
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java
View File

@ -251,7 +251,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (i == 0 && s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
i = 1;
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "00:00")
.params("type", "0")
@ -272,13 +272,13 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
String pkUid = datas.getString("pkuid");
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@ -768,7 +768,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
//把画面设置成九宫格
dr_pk_view.setVisibility(View.VISIBLE);
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")

2
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@ -546,7 +546,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
//获取活动
private void getEvent() {
if (btn_onecz_event != null) {
HttpClient.getInstance().get("Charge2.isFirstChargeIcons", "Charge2.isFirstChargeIcons")
HttpClient.getInstance().get("xinbanshifouxianshishouchongtubiao", "xinbanshifouxianshishouchongtubiao")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new HttpCallback() {

8
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -397,7 +397,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.i("tts2", s1);
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "00:00")
.params("type", "0")
@ -420,13 +420,13 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid"));
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@ -940,7 +940,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
@Override
protected void onDRPkApply(UserBean u) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")

18
live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
View File

@ -350,7 +350,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.i("tts2", s1);
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@ -363,10 +363,10 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid"));
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -456,7 +456,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
public void onLinkDRMicPkQuit(String uid) {
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@ -697,12 +697,12 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
@Override
protected void onDRPkApply(UserBean u) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
Log.i("多人PK", "1code = " + code + ", msgs = " + msgs + ", info = " + Arrays.deepToString(info) + " mApplyUid = " + mApplyUid);
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum").execute(new HttpCallback() {
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
Log.i(TAG, "code = " + code + ", msg = " + msg + ", info = " + Arrays.deepToString(info));
@ -715,7 +715,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
boolean finalAgree = agree;
if (finalAgree) {
HttpClient.getInstance().get("live.joinDRPKroom", "live.joinDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() {
HttpClient.getInstance().get("jiaruduorenpkfangjian", "jiaruduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -738,7 +738,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
L.eSw("将自己从多人pk列表里剔除" + new Gson().toJson(drPkbeans));
}
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@ -1279,7 +1279,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
public void dRjoinOtherRoom(UserBean u) {
L.eSw("dRjoinOtherRoom UserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBean ");
setMyDrPkDetailsView();
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {

2
live/src/main/java/com/yunbao/live/socket/SocketClient.java
View File

@ -796,7 +796,7 @@ public class SocketClient {
params.topMargin = 0;
LivePushTxViewHolder.mPreView.setLayoutParams(params);
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java
View File

@ -43,7 +43,7 @@ public class SocketLinkMicPkUtil {
*/
public static void linkMicPkAccept(SocketClient client, String pkUid, String url, String name) {
Log.i("pksend", "发送的pkurl=" + url + "****发送的pkname=" + name);
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")
@ -51,7 +51,7 @@ public class SocketLinkMicPkUtil {
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")

6
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -457,7 +457,7 @@ public class SocketRyClient {
} else if (TextUtils.equals(boxType, "2")) {
boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box";
} else {
boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box";
boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box";
}
AllServerNotifyEvent allServerNotifyEvent
= new AllServerNotifyEvent()
@ -838,7 +838,7 @@ public class SocketRyClient {
stringBuffer.append(sendQuickGiftModel.getUserNicename())
.append(WordUtil.isNewZh() ? " 送出了 " : " sent ")
.append(sendQuickGiftModel.getQuickGiftNumber())
.append(WordUtil.isNewZh() ? " 個小PD " : " small pandas ");
.append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas ");
systemChatMessage2(stringBuffer.toString());
Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum()));
break;
@ -1486,7 +1486,7 @@ public class SocketRyClient {
}
});
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
View File

@ -39,7 +39,7 @@ public class SocketRyLinkMicPkUtil {
* @param pkUid 对方主播的uid
*/
public static void linkMicPkAccept(SocketRyClient client, String pkUid, String url, String name) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
@ -49,7 +49,7 @@ public class SocketRyLinkMicPkUtil {
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")

6
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@ -463,7 +463,7 @@ public class SocketSwClient {
} else if (TextUtils.equals(boxType, "2")) {
boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box";
} else {
boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box";
boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box";
}
AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent().setBlindBoxId(map.getString("blind_box_id")).setBoxType(boxType).setBoxTypeName(boxTypeName).setDressName(WordUtil.isNewZh() ? map.getString("dress_name") : TextUtils.isEmpty(map.getString("dress_nameen")) ? map.getString("dress_name") : map.getString("dress_nameen")).setGiftNotification(map.getString("gift_notification")).setGiftName(WordUtil.isNewZh() ? mCt.getString("giftname") : mCt.getString("giftnameen")).setUserNiceName(map.getString("uname")).setGiftIcon(map.getString("gifticon")).setAnchorName(map.getString("ancherName")).setDisplaySrc(map.getString("display_src"));
Log.e("AllServerNotifyEvent", allServerNotifyEvent.toString());
@ -767,7 +767,7 @@ public class SocketSwClient {
case "sendQuickGift":
SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小PD " : " small pandas ");
stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas ");
systemChatMessage2(stringBuffer.toString());
Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum()));
break;
@ -1416,7 +1416,7 @@ public class SocketSwClient {
// if (rtcRoom != null) {
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.DISCONNEXT_PK_TIME));
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() {
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java
View File

@ -39,7 +39,7 @@ public class SocketSwLinkMicPkUtil {
* @param pkUid 对方主播的uid
*/
public static void linkMicPkAccept(SocketSwClient client, String pkUid, String url, String name) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
@ -49,7 +49,7 @@ public class SocketSwLinkMicPkUtil {
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
L.eSw("1111111111111111111111111111");
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")

6
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -144,7 +144,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
@Override
public void onClick(View v) {
//获取房间连麦状态
HttpClient.getInstance().get("live.getDrLm", "live.getDrLm")
HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai")
.params("uid", mLiveUid, true)
.execute(new HttpCallback() {
@Override
@ -729,8 +729,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
* 观众打开主播的整蛊惑单窗口
*/
public void openZGListWindow() {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
String url = CommonAppConfig.HOST + "/h5/activity/Turntable/index.html?";
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag", url);
Bundle bundle1 = new Bundle();

9
live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
View File

@ -29,6 +29,7 @@ import com.lxj.xpopup.core.BasePopupView;
import com.lxj.xpopup.interfaces.XPopupCallback;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveAnchorCallMeModel;
import com.yunbao.common.bean.LiveAnchorSayModel;
@ -546,17 +547,13 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
StringBuffer url = new StringBuffer();
url.append(CommonAppConfig.HOST);
if (TextUtils.equals(ct, "zh")) {
url.append("/index.php?g=portal&m=page&a=index&id=671");
} else {
url.append("/index.php?g=portal&m=page&a=index&id=672");
}
url.append("/h5/page/index.html?id=708");
url.append("&uid=")
.append(model.getId())
.append("&token=")
.append(model.getToken()).append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false);
WebViewActivity.forward(mContext, url.toString(), false);
} else if (i == R.id.btn_live_anchor_say) {
openAnchorSayDialog();
} else if (i == R.id.btn_live_anchor_call_me) {

2
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@ -1276,7 +1276,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
audioManager.setSpeakerphoneOn(true);
HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm")
HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai")
.params("roomid", LiveActivity.mLiveUid)
.execute(new HttpCallback() {
@Override

4
live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
View File

@ -319,7 +319,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
}
}
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@ -404,7 +404,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
*/
private void joinLiveMic() {
L.eSw("joinLiveMic");
HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() {
HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
Log.e("ry", code + "热热热");

16
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@ -506,7 +506,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag());
//断开连麦
LiveRyAnchorActivity.isDRPK = 0;
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -514,7 +514,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "1")
.params("type", "1")
@ -559,14 +559,14 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
.param("uid", CommonAppConfig.getInstance().getUid());
seed_msg.create();
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@ -584,13 +584,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + LiveRyLinkMicPkPresenter.oldmPkUid)
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@ -1045,13 +1045,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msg.create();
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {

20
live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java
View File

@ -177,13 +177,13 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag());
//断开连麦
LiveSwAnchorActivity.isDRPK = 0;
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() {
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
}
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@ -201,11 +201,11 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_LINK_MIC_PK).param("action", 9).param("msgtype", 10).param("win_uid", datas.getString("win_uid")).param("uid", CommonAppConfig.getInstance().getUid());
seed_msg.create();
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -213,10 +213,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -292,7 +292,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
swManager.joinChannelEx(CommonAppConfig.getInstance().getUid(), CommonAppConfig.SWToken, u.getId(), SWAuManager.getChannelName(u.getId()));
}
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")
@ -301,7 +301,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")
@ -600,10 +600,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_SYSTEM).param("action", 1).param("ct", ct);
seed_msg.create();
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

12
live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java
View File

@ -108,7 +108,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
@Override
public void onConfirmClick(Dialog dialog, String content) {
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -116,7 +116,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
}
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("addtime", "00:00")
.params("type", "0")
.params("sign", "1")
@ -143,14 +143,14 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
params.topMargin = 0;
LivePushTxViewHolder.mPreView.setLayoutParams(params);
}
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@ -168,13 +168,13 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + LiveLinkMicPkPresenter.oldmPkUid)
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {

8
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -5523,7 +5523,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void run() {
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1);
bannerBean.setShow_type("2");
mTopBannerList.add(bannerBean);
LiveChatBean bean = new LiveChatBean();
@ -6243,7 +6243,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1);
bannerBean.setShow_type("2");
if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) {
mTopBannerList.add(bannerBean);
@ -6302,7 +6302,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {
@ -6357,7 +6357,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {

6
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -160,7 +160,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
ToastUtil.show("多人PK次数已用完");
} else {
//開始多人PK
HttpClient.getInstance().get("live.startDRPK", "live.startDRPK")
HttpClient.getInstance().get("kaishiduorenpk", "kaishiduorenpk")
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
@ -182,7 +182,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
btn_end_pk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
HttpClient.getInstance().get("live.endDRpk", "live.endDRpk")
HttpClient.getInstance().get("jieshuduorenpkv2", "jieshuduorenpkv2")
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
@ -450,7 +450,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
if (model != null && model.getWishlist().size() > 0) {
BannerBean bannerModel = new BannerBean();
bannerModel.setShow_type("2");
bannerModel.setLink(CommonAppConfig.HOST + "/index.php");
bannerModel.setLink(CommonAppConfig.HOST + "/h5/wish/index.html");
bannerModel.setImageUrl(model.getImg());
addWishList(bannerModel);

4
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -1201,7 +1201,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
if (isSw) {
if (mLivePlayViewHolder != null) {
mLivePlayViewHolder.endLiveMic();
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", liveID)
.execute(new HttpCallback() {
@Override
@ -1238,7 +1238,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
Log.e("ry", "下麦成功");
// 该用户切换为观众成功，可以以观众身份进行音视频
//退出多人房间
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", liveID)
.execute(new HttpCallback() {
@Override

3
live/src/main/res/layout/dialog_live_task.xml
View File

@ -47,9 +47,8 @@
<ImageView
android:id="@+id/live_task_banner2"
android:layout_width="0dp"
android:layout_height="95dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:scaleType="fitXY"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/live_task_banner1"

2
live/src/main/res/layout/item_live_task.xml
View File

@ -37,7 +37,7 @@
android:background="@drawable/background_6cbe53"
android:paddingStart="14dp"
android:paddingTop="4dp"
android:paddingEnd="4dp"
android:paddingEnd="14dp"
android:paddingBottom="4dp"
android:textColor="#FFFFFF"
android:textSize="10sp"

2
live/src/main/res/layout/view_receive_red_packet.xml
View File

@ -48,7 +48,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:text="來自小PD的獎勵，齊心協力連成目標"
android:text="來自小HOSO的獎勵，齊心協力連成目標"
android:textColor="@color/white"
android:textSize="13sp"
android:textStyle="bold" />

1
main/src/main/AndroidManifest.xml
View File

@ -175,6 +175,7 @@
<activity
android:name=".activity.FeedbackEditActivity"
android:screenOrientation="portrait" />
<activity android:name="com.yunbao.main.activity.MainMessageActivity" android:screenOrientation="portrait" />
</application>
</manifest>

2
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -417,7 +417,7 @@ public class EditProfileActivity extends AbsActivity {
dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url,false);
dialog.dismiss();
}

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

@ -27,6 +27,7 @@ import android.provider.Settings;
import android.util.Base64;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.webkit.JavascriptInterface;
@ -132,7 +133,7 @@ public class EntryActivity extends AppCompatActivity {
private static boolean mShowInvite;//显示邀请码弹窗
private static Context Contexts;
private ImageView img_view;
private LinearLayout lt_btn_twitter, lt_btn_facebook, lt_customer;
private ViewGroup lt_btn_twitter, lt_btn_facebook, lt_customer;
private String kefuUrl = "";
private boolean mBtnClick = false;
private Dialog loginLoadingDialog;
@ -403,6 +404,12 @@ public class EntryActivity extends AppCompatActivity {
webViewLayout.setVisibility(View.GONE);
}
});
//隐藏第三方登陆入口
lt_btn_facebook.setVisibility(View.GONE);
findViewById(R.id.lt_btn_twitter).setVisibility(View.GONE);
btn_line.setVisibility(View.GONE);
googleLayout.setVisibility(View.GONE);
}
private void verfiy(int loginType) {
@ -719,7 +726,7 @@ public class EntryActivity extends AppCompatActivity {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2 || CommonAppConfig.IS_GOOGLE_PLAY == 3) {
EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class));
} else {
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").execute(new HttpCallback() {
HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info[0] != null) {

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

@ -303,7 +303,7 @@ public class LoginActivity extends AbsActivity {
public void callback(UserBean bean) {
//融云连接服务器
RongcloudIMManager.connectIM(activity);
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

13
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -61,6 +61,7 @@ import com.yunbao.common.bean.QiniuLog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.server.DownloadService;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LogUtil;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
@ -135,6 +136,7 @@ import com.yunbao.main.interfaces.MainAppBarLayoutListener;
import com.yunbao.main.manager.imrongcloud.ConversationIMListManager;
import com.yunbao.main.utils.GenerateTestUserSig;
import com.yunbao.main.views.FloatBannerView;
import com.yunbao.main.views.MainGameViewHolder;
import com.yunbao.main.views.MainHomeCommunityViewHolder;
import com.yunbao.main.views.MainHomeLiveViewHolder;
import com.yunbao.main.views.MainHomeViewHolder;
@ -178,7 +180,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private MainHomeLiveViewHolder mHomeLiveViewHolder;
private MainHomeViewHolder mainHomeViewHolder;
private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder;
private MainMessageViewHolder mainMessageViewHolder;
private MainGameViewHolder mainMessageViewHolder;
private MainMeViewHolder mMeViewHolder;
private AbsMainViewHolder[] mViewHolders;
private View mBottom;
@ -558,7 +560,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
}
}
} else if (index == 2) {
} else if (index == 1) {
floatBanner.setVisibility(View.GONE);
floatRedPacket.setVisibility(View.GONE);
floatWarOrder.setVisibility(View.GONE);
@ -1307,7 +1309,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
vh = mMainHomeCommunityViewHolder;
} else if (position == 1) {
mainMessageViewHolder = new MainMessageViewHolder(this, parent);
mainMessageViewHolder = new MainGameViewHolder(this, parent);
vh = mainMessageViewHolder;
@ -1503,9 +1505,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
//消息中心
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onMessageIMEvent(MessageIMEvent event) {
//TODO 消息红点
messageNumber = event.getNumber();
if (event.getNumber() > 0) {
v_table_redpoint.setVisibility(View.VISIBLE);
v_table_redpoint.setVisibility(View.GONE);
if (event.getNumber() > 99) {
v_table_redpoint.setText("99+");
} else {
@ -1572,7 +1575,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
if (mViewPager != null) {
mViewPager.setCurrentItem(2);
mTabButtonGroup.setCurPosition(2);
mainMessageViewHolder.setHomeZdyPop(NoviceInstructorManager.get(this).getHomeZdyPop());
// mainMessageViewHolder.setHomeZdyPop(NoviceInstructorManager.get(this).getHomeZdyPop());
}
}

47
main/src/main/java/com/yunbao/main/activity/MainMessageActivity.java Normal file
View File

@ -0,0 +1,47 @@
package com.yunbao.main.activity;
import android.os.Bundle;
import android.view.View;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.main.R;
import com.yunbao.main.views.MainMessageViewHolder;
@Route(path = RouteUtil.PATH_MAIN_MESSAGE)
public class MainMessageActivity extends AbsActivity {
MainMessageViewHolder messageViewHolder;
@Override
protected int getLayoutId() {
return R.layout.view_game_holder;
}
@Override
protected void main(Bundle savedInstanceState) {
super.main(savedInstanceState);
messageViewHolder = new MainMessageViewHolder(mContext, findViewById(R.id.rootView));
messageViewHolder.getContentView().findViewById(R.id.btn_back).setVisibility(View.VISIBLE);
messageViewHolder.addToParent();
}
@Override
public void onDestroy() {
super.onDestroy();
messageViewHolder.onDestroy();
}
@Override
public void onResume() {
super.onResume();
messageViewHolder.onResume();
}
@Override
public void onPause() {
super.onPause();
messageViewHolder.onPause();
}
}

52
main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
View File

@ -181,66 +181,66 @@ public class MyWalletActivity extends AbsActivity {
rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
//华为
rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName());
huaWeiFragment1.setArguments(bundle1);
huaWeiFragment2 = new HuaWeiFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName());
huaWeiFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment1.setArguments(bundle1);
samsungFragment2 = new SamsungFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment2.setArguments(bundle2);
} else {
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2);
}
} else {
@ -249,50 +249,50 @@ public class MyWalletActivity extends AbsActivity {
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName());
huaWeiFragment1.setArguments(bundle1);
huaWeiFragment2 = new HuaWeiFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName());
huaWeiFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment1.setArguments(bundle1);
samsungFragment2 = new SamsungFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment2.setArguments(bundle2);
} else {
Log.i("tss", "不是首充");
@ -300,17 +300,17 @@ public class MyWalletActivity extends AbsActivity {
walletFragment = new WalletFragment();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2);
}
}
@ -425,7 +425,7 @@ public class MyWalletActivity extends AbsActivity {
@Override
protected void onPause() {
super.onPause();
CommonHttpUtil.cancel("Charge.Google_sec_pay");
CommonHttpUtil.cancel("gugedingdanyanzheng");
if (payHandler != null) {
payHandler.removeCallbacks(runnable1);
payHandler.removeCallbacks(runnable2);
@ -435,7 +435,7 @@ public class MyWalletActivity extends AbsActivity {
@Override
protected void onDestroy() {
super.onDestroy();
CommonHttpUtil.cancel("Charge.Google_sec_pay");
CommonHttpUtil.cancel("gugedingdanyanzheng");
if (payHandler != null) {
payHandler.removeCallbacks(runnable1);
payHandler.removeCallbacks(runnable2);

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

@ -46,6 +46,7 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.http.LiveHttpUtil;
@ -241,6 +242,7 @@ public class RegisterActivity extends AbsActivity {
webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
L.e(webview.getUrl());
}
@ -485,7 +487,7 @@ public class RegisterActivity extends AbsActivity {
@Override
public void run() {
IMLoginModel userInfo = IMLoginManager.get(activity).getUserInfo();
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").params("uid", userInfo.getId()).params("token", userInfo.getToken()).execute(new HttpCallback() {
HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid").params("uid", userInfo.getId()).params("token", userInfo.getToken()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info[0] != null) {

3
main/src/main/java/com/yunbao/main/activity/RewardActivity.java
View File

@ -328,6 +328,9 @@ public class RewardActivity extends AbsActivity {
}
public static void forward(Context context, String url) {
if(!url.contains("?")){
url+="?t="+System.currentTimeMillis()+"&";
}
forward(context, url, true);
}

32
main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
View File

@ -52,6 +52,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
private Context context;
private int Height;
private int getWeekIntIndex = 0;
private boolean isHideBanner = false;
public MainHomeLiveAdapter(Context context, int h) {
super(context);
@ -67,10 +68,10 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
@Override
public int getItemViewType(int position) {
if (position == 0) {
if (position == 0 && !isHideBanner) {
return HEAD;
} else if (position > 0) {
LiveBean mode = mList.get(position - 1);
LiveBean mode = getBean(position);
if (TextUtils.equals(mode.getIs_week(), "1")) {
return WEEKLAYOUT;
} else {
@ -81,6 +82,20 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
}
return LEFT;
}
private LiveBean getBean(int position) {
if(isHideBanner){
return mList.get(position);
}else{
return mList.get(position-1);
}
}
private int getPosition(int position) {
if(isHideBanner){
return position;
}else{
return position-1;
}
}
@NonNull
@Override
@ -115,7 +130,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
if (vh instanceof MainHomeLiveWeekItemViewHolder) {
((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(getBean(position), getPosition(position), Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
@Override
public void onItemClick(LiveBean bean, int position) {
if (mOnItemClickListener != null) {
@ -124,7 +139,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
}
});
} else if (vh instanceof MainHomeLiveItemViewHolder) {
((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
((MainHomeLiveItemViewHolder) vh).loadViewDate(getBean(position), getPosition(position), Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
@Override
public void onItemClick(LiveBean bean, int position) {
if (mOnItemClickListener != null) {
@ -137,9 +152,18 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
@Override
public int getItemCount() {
if(isHideBanner){
return super.getItemCount();
}
return super.getItemCount() + 1;
}
public void hideBanner() {
getHeadView().setVisibility(View.GONE);
isHideBanner = true;
notifyItemChanged(0);
}
class HeadVh extends RecyclerView.ViewHolder {
public HeadVh(View itemView) {

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

@ -89,14 +89,14 @@ public class OneLoginDialog extends AbsDialogFragment {
btn_enter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
HttpClient.getInstance().get("User.userBindAgentAdmin", "User.userBindAgentAdmin")
HttpClient.getInstance().get("yonghubangdingdaili", "yonghubangdingdaili")
.params("invitation_code", bundle.getString("code"))
.params("user_nicename", bundle.getString("name"))
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

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

@ -45,7 +45,7 @@ public class MainHttpUtil {
* 手机号 密码登录
*/
public static void login(String phoneNum, String pwd, String uuid, HttpCallback callback) {
HttpClient.getInstance().get("Login.userLogin", MainHttpConsts.LOGIN)
HttpClient.getInstance().get("huiyuandenglu", MainHttpConsts.LOGIN)
.params("user_login", phoneNum)
.params("user_pass", pwd)
.params("pushid", "")
@ -67,7 +67,7 @@ public class MainHttpUtil {
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
appSource = "2";
}
HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
HttpClient.getInstance().get("disanfangdenglu", MainHttpConsts.LOGIN_BY_THIRD)
.params("openid", openid)
.params("nicename", nicename)
.params("app_source", appSource)
@ -93,7 +93,7 @@ public class MainHttpUtil {
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
appSource = "2";
}
HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD)
HttpClient.getInstance().get("disanfangdenglu", MainHttpConsts.LOGIN_BY_THIRD)
.params("openid", openid)
.params("app_source", appSource)
.params("admin_id", promoCode)
@ -115,7 +115,7 @@ public class MainHttpUtil {
*/
public static void requestBonus(HttpCallback callback) {
String appVer = AppUtils.getAppVersionName();
HttpClient.getInstance().get("User.bonus", MainHttpConsts.REQUEST_BONUS)
HttpClient.getInstance().get("yonghudenglujiangli", MainHttpConsts.REQUEST_BONUS)
.params("appAndroidVersion", appVer)
.execute(callback);
}
@ -124,7 +124,7 @@ public class MainHttpUtil {
* 新版本签到奖励
*/
public static void requestNewBonus(HttpCallback callback) {
HttpClient.getInstance().get("Sign.userSign", MainHttpConsts.REQUEST_BONUS)
HttpClient.getInstance().get("huiyuanqiandao", MainHttpConsts.REQUEST_BONUS)
.params("uuid_Device", DeviceUtils.getUniqueDeviceId())
.params("lastlogindevice", "Android")
.params("model", android.os.Build.BRAND + android.os.Build.MODEL)
@ -135,7 +135,7 @@ public class MainHttpUtil {
* 获取签到奖励
*/
public static void getBonus(HttpCallback callback) {
HttpClient.getInstance().get("User.getBonus", MainHttpConsts.GET_BONUS)
HttpClient.getInstance().get("lingquyonghudenglujiangli", MainHttpConsts.GET_BONUS)
.execute(callback);
}
@ -143,7 +143,7 @@ public class MainHttpUtil {
* 用于用户首次登录设置分销关系
*/
public static void setDistribut(String code, HttpCallback callback) {
HttpClient.getInstance().get("User.setDistribut", MainHttpConsts.SET_DISTRIBUT)
HttpClient.getInstance().get("shezhifenxiaoshangji", MainHttpConsts.SET_DISTRIBUT)
.params("code", code)
.execute(callback);
}
@ -152,7 +152,7 @@ public class MainHttpUtil {
* 首页直播
*/
public static void getHot(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getHot", MainHttpConsts.GET_HOT)
HttpClient.getInstance().get("huoquremenzhubo", MainHttpConsts.GET_HOT)
.params("p", p)
.execute(callback);
}
@ -161,7 +161,7 @@ public class MainHttpUtil {
* 首页推荐直播
*/
public static void getRandom(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getRandom", MainHttpConsts.GET_RANDOM)
HttpClient.getInstance().get("huoqutuijianzhubo", MainHttpConsts.GET_RANDOM)
.execute(callback);
}
@ -169,7 +169,7 @@ public class MainHttpUtil {
* 首页关注直播
*/
public static void getHomeFollow(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_HOME_FOLLOW)
HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", MainHttpConsts.GET_HOME_FOLLOW)
.params("p", p)
.execute(callback);
}
@ -178,7 +178,7 @@ public class MainHttpUtil {
* 首页红包专区
*/
public static void getRedPacket(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getRedPacket", MainHttpConsts.GET_RANDOM)
HttpClient.getInstance().get("huoquhongbaozhuanquliebiao", MainHttpConsts.GET_RANDOM)
.execute(callback);
}
@ -186,7 +186,7 @@ public class MainHttpUtil {
* 首页
*/
public static void getFollow(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_FOLLOW)
HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", MainHttpConsts.GET_FOLLOW)
.params("p", p)
.execute(callback);
}
@ -195,7 +195,7 @@ public class MainHttpUtil {
* 首页 附近
*/
public static void getNear(int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getNearby", MainHttpConsts.GET_NEAR)
HttpClient.getInstance().get("huoqufujinzhubo", MainHttpConsts.GET_NEAR)
.params("lng", CommonAppConfig.getInstance().getLng())
.params("lat", CommonAppConfig.getInstance().getLat())
.params("p", p)
@ -205,7 +205,7 @@ public class MainHttpUtil {
//排行榜 魅力榜
public static void profitList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.profitList", MainHttpConsts.PROFIT_LIST)
HttpClient.getInstance().get("shouyibangdan", MainHttpConsts.PROFIT_LIST)
.params("type", type)
.params("p", p)
.execute(callback);
@ -213,7 +213,7 @@ public class MainHttpUtil {
//排行榜 豪气榜
public static void consumeList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.consumeList", MainHttpConsts.CONSUME_LIST)
HttpClient.getInstance().get("gongxianbangdan", MainHttpConsts.CONSUME_LIST)
.params("type", type)
.params("p", p)
.execute(callback);
@ -222,7 +222,7 @@ public class MainHttpUtil {
//排行榜 盲盒榜
public static void blindBoxList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.blindBoxList", MainHttpConsts.BLIND_BOX_LIST)
HttpClient.getInstance().get("manghebangdan", MainHttpConsts.BLIND_BOX_LIST)
.params("type", type)
.params("p", p)
.execute(callback);
@ -233,7 +233,7 @@ public class MainHttpUtil {
* 获取谷歌
*/
public static void getGoogle(String token, final CommonCallback<GoogleBean> commonCallback) {
HttpClient.getInstance().get("Charge.getChargeHide", MainHttpConsts.GET_BASE_INFO)
HttpClient.getInstance().get("huoqucongzhijiekouxinxi", MainHttpConsts.GET_BASE_INFO)
.params("terminal", "1")
.params("token", token)
.execute(new HttpCallback() {
@ -262,7 +262,7 @@ public class MainHttpUtil {
* 获取用户信息
*/
public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", MainHttpConsts.GET_BASE_INFO)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -297,7 +297,7 @@ public class MainHttpUtil {
}
public static void getBaseInfos(String uid, String token, HttpCallback callback) {
HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", MainHttpConsts.GET_BASE_INFO)
.execute(callback);
}
@ -314,7 +314,7 @@ public class MainHttpUtil {
* 获取用户钱
*/
public static void getBalance(HttpCallback callback) {
HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance")
HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue")
.execute(callback);
}
@ -330,7 +330,7 @@ public class MainHttpUtil {
* 拉黑对方， 解除拉黑
*/
public static void setBlack(String toUid, HttpCallback callback) {
HttpClient.getInstance().get("User.setBlack", MainHttpConsts.SET_BLACK)
HttpClient.getInstance().get("shezhilaheizhuangtai", MainHttpConsts.SET_BLACK)
.params("touid", toUid)
.execute(callback);
}
@ -339,8 +339,9 @@ public class MainHttpUtil {
* 获取个性设置列表
*/
public static void getSettingList(HttpCallback callback) {
HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
HttpClient.getInstance().get("huoqugexingshezhiliebiao", MainHttpConsts.GET_SETTING_LIST)
.params("version", VersionUtil.getVersion())
.params("package_name","hoso")
.execute(callback);
}
@ -348,7 +349,7 @@ public class MainHttpUtil {
* 搜索
*/
public static void search(String key, int type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.search", MainHttpConsts.SEARCH)
HttpClient.getInstance().get("shouyesousuohuiyuan", MainHttpConsts.SEARCH)
.params("key", key)
.params("type", type)
.params("p", p)
@ -371,7 +372,7 @@ public class MainHttpUtil {
* 获取我的拉黑列表
*/
public static void getBlackList(int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getBlackList", "User.getBlackList")
HttpClient.getInstance().get("huoquheimingdanliebiao", "huoquheimingdanliebiao")
.params("p", p)
.execute(callback);
}
@ -382,7 +383,7 @@ public class MainHttpUtil {
* @param touid 对方的uid
*/
public static void getFollowList(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getFollowsList", MainHttpConsts.GET_FOLLOW_LIST)
HttpClient.getInstance().get("huoquguanzhuliebiao", MainHttpConsts.GET_FOLLOW_LIST)
.params("touid", touid)
.params("p", p)
.execute(callback);
@ -394,7 +395,7 @@ public class MainHttpUtil {
* @param touid 对方的uid
*/
public static void getFansList(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getFansList", MainHttpConsts.GET_FANS_LIST)
HttpClient.getInstance().get("huoqufensiliebiao", MainHttpConsts.GET_FANS_LIST)
.params("touid", touid)
.params("p", p)
.execute(callback);
@ -405,7 +406,7 @@ public class MainHttpUtil {
* 上传头像，用post
*/
public static void updateAvatar(File file, HttpCallback callback) {
HttpClient.getInstance().post("User.updateAvatar", MainHttpConsts.UPDATE_AVATAR)
HttpClient.getInstance().post("shangchuantouxiang", MainHttpConsts.UPDATE_AVATAR)
.isMultipart(true)
.params("file", file)
.execute(callback);
@ -417,7 +418,7 @@ public class MainHttpUtil {
* @param fields 用户资料 ,以json形式出现
*/
public static void updateFields(String fields, HttpCallback callback) {
HttpClient.getInstance().get("User.updateFields", MainHttpConsts.UPDATE_FIELDS)
HttpClient.getInstance().get("xiugaiyonghuxinxi", MainHttpConsts.UPDATE_FIELDS)
.params("fields", fields)
.execute(callback);
}
@ -427,7 +428,7 @@ public class MainHttpUtil {
* 获取 我的收益 可提现金额数
*/
public static void getProfit(HttpCallback callback) {
HttpClient.getInstance().get("User.getProfit", MainHttpConsts.GET_PROFIT)
HttpClient.getInstance().get("huoquwodeshouyi", MainHttpConsts.GET_PROFIT)
.execute(callback);
}
@ -435,7 +436,7 @@ public class MainHttpUtil {
* 获取 提现账户列表
*/
public static void getCashAccountList(HttpCallback callback) {
HttpClient.getInstance().get("User.getUserAccountList", MainHttpConsts.GET_USER_ACCOUNT_LIST)
HttpClient.getInstance().get("huoquyonghutixianzhanghao", MainHttpConsts.GET_USER_ACCOUNT_LIST)
.execute(callback);
}
@ -444,7 +445,7 @@ 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)
HttpClient.getInstance().get("shezhiyonghutixianzhanghao", MainHttpConsts.ADD_CASH_ACCOUNT)
.params("account", account)
.params("name", name)
.params("account_bank", bank)
@ -456,7 +457,7 @@ public class MainHttpUtil {
* 删除 提现账户
*/
public static void deleteCashAccount(String accountId, HttpCallback callback) {
HttpClient.getInstance().get("User.delUserAccount", MainHttpConsts.DEL_CASH_ACCOUNT)
HttpClient.getInstance().get("shanchuyonghutixianzhanghao", MainHttpConsts.DEL_CASH_ACCOUNT)
.params("id", accountId)
.execute(callback);
}
@ -465,7 +466,7 @@ public class MainHttpUtil {
* 提现
*/
public static void doCash(String votes, String accountId, HttpCallback callback) {
HttpClient.getInstance().get("User.setCash", MainHttpConsts.DO_CASH)
HttpClient.getInstance().get("yonghutixian", MainHttpConsts.DO_CASH)
.params("cashvote", votes)//提现的票数
.params("accountid", accountId)//账号ID
.execute(callback);
@ -476,7 +477,7 @@ public class MainHttpUtil {
* 分类直播
*/
public static void getClassLive(int classId, int p, HttpCallback callback) {
HttpClient.getInstance().get("Home.getClassLive", MainHttpConsts.GET_CLASS_LIVE)
HttpClient.getInstance().get("huoqufenleizhibo", MainHttpConsts.GET_CLASS_LIVE)
.params("liveclassid", classId)
.params("p", p)
.execute(callback);
@ -486,7 +487,7 @@ public class MainHttpUtil {
* 获取自己收到的主播印象列表
*/
public static void getMyImpress(HttpCallback callback) {
HttpClient.getInstance().get("User.getMyLabel", MainHttpConsts.GET_MY_IMPRESS)
HttpClient.getInstance().get("huoquyingxiangbiaoqian", MainHttpConsts.GET_MY_IMPRESS)
.execute(callback);
}
@ -494,7 +495,7 @@ public class MainHttpUtil {
* 用于用户首次登录推荐
*/
public static void getRecommend(HttpCallback callback) {
HttpClient.getInstance().get("Home.getRecommend", MainHttpConsts.GET_RECOMMEND)
HttpClient.getInstance().get("huoqutuijian", MainHttpConsts.GET_RECOMMEND)
.execute(callback);
}
@ -503,7 +504,7 @@ public class MainHttpUtil {
* 用于用户首次登录推荐,关注主播
*/
public static void recommendFollow(String touid, HttpCallback callback) {
HttpClient.getInstance().get("Home.attentRecommend", MainHttpConsts.RECOMMEND_FOLLOW)
HttpClient.getInstance().get("guanzhutuijianzhubo", MainHttpConsts.RECOMMEND_FOLLOW)
.params("touid", touid)
.execute(callback);
}
@ -513,7 +514,7 @@ public class MainHttpUtil {
*/
public static void getRegisterCode(String mobile, HttpCallback callback) {
String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT);
HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE)
HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE)
.params("mobile", mobile)
.params("sign", sign)
.params("source", "1")
@ -531,7 +532,7 @@ public class MainHttpUtil {
MacUitl macUitl = new MacUitl();
String uuid = DeviceUtils.getUniqueDeviceId();
HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE)
HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE)
.params("mobile", mobile)
.params("country_code", countryCode + "")
.params("sign", sign)
@ -548,7 +549,7 @@ public class MainHttpUtil {
* 第三方绑定手机号
*/
public static void bindPhone(String mobile, int countryCode, String uid, String token, String user_pass, String user_pass2, String code, HttpCallback callback) {
HttpClient.getInstance().get("Login.bindMobile", MainHttpConsts.BINDMOBILE)
HttpClient.getInstance().get("bangdingshoujihao", MainHttpConsts.BINDMOBILE)
.params("mobile", mobile)
.params("country_code", countryCode + "")
.params("uid", uid, true)
@ -563,7 +564,7 @@ public class MainHttpUtil {
* 修改绑定手机号
*/
public static void updateBindMobile(String mobile, int countryCode, String uid, String token, String code, HttpCallback callback) {
HttpClient.getInstance().get("Login.updateBindMobile", MainHttpConsts.UPDATEBINDMOBILE)
HttpClient.getInstance().get("genghuanshoujihao", MainHttpConsts.UPDATEBINDMOBILE)
.params("mobile", mobile)
.params("country_code", countryCode + "")
.params("uid", uid, true)
@ -595,7 +596,7 @@ public class MainHttpUtil {
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
appSource = "2";
}
HttpClient.getInstance().get("Login.userReg", MainHttpConsts.REGISTER)
HttpClient.getInstance().get("huiyuanzhuce", MainHttpConsts.REGISTER)
.params("user_login", user_login)
.params("app_source", appSource)
//增加参数：推广码
@ -619,7 +620,7 @@ public class MainHttpUtil {
* 找回密码
*/
public static void findPwd(String user_login, String pass, String pass2, String code, HttpCallback callback) {
HttpClient.getInstance().get("Login.userFindPass", MainHttpConsts.FIND_PWD)
HttpClient.getInstance().get("yonghuzhaohuimima", MainHttpConsts.FIND_PWD)
.params("user_login", user_login)
.params("user_pass", pass)
.params("user_pass2", pass2)
@ -632,7 +633,7 @@ public class MainHttpUtil {
* 重置密码
*/
public static void modifyPwd(String oldpass, String pass, String pass2, HttpCallback callback) {
HttpClient.getInstance().get("User.updatePass", MainHttpConsts.MODIFY_PWD)
HttpClient.getInstance().get("xiugaimima", MainHttpConsts.MODIFY_PWD)
.params("oldpass", oldpass)
.params("pass", pass)
.params("pass2", pass2)
@ -645,7 +646,7 @@ public class MainHttpUtil {
*/
public static void getFindPwdCode(String mobile, String country_code, HttpCallback callback) {
// String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT);
HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_FIND_PWD_CODE)
HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_FIND_PWD_CODE)
.params("mobile", mobile)
.params("country_code", country_code)
.params("source", "1")
@ -658,7 +659,7 @@ public class MainHttpUtil {
* 三级分销页面 获取二维码
*/
public static void getQrCode(HttpCallback callback) {
HttpClient.getInstance().get("Agent.getCode", MainHttpConsts.GET_QR_CODE)
HttpClient.getInstance().get("huoqufenxiangxinxi", MainHttpConsts.GET_QR_CODE)
.params("source", "1")
.execute(callback);
}
@ -668,7 +669,7 @@ public class MainHttpUtil {
* 首页的排行榜轮播
*/
public static void getHomeTop(HttpCallback callback) {
HttpClient.getInstance().get("Home.consumeproList", MainHttpConsts.HOME_TOP)
HttpClient.getInstance().get("gongxianzhoubang", MainHttpConsts.HOME_TOP)
.params("type", "month")
.params("p", "1")
.execute(callback);
@ -678,7 +679,7 @@ 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)
HttpClient.getInstance().get("zengsongdongtailiwu", MainHttpConsts.SEND_DYNAMICGIFT)
.params("dynamic_id", id)
.params("gift_num", gift_num)
.params("gift_id", gift_id)
@ -689,7 +690,7 @@ public class MainHttpUtil {
* 动态赠送礼物列表
*/
public static void getDynamicGiftInfo(HttpCallback callback) {
HttpClient.getInstance().get("Community.getDynamicGiftInfo", MainHttpConsts.GET_DYNAMICGIFTINFO)
HttpClient.getInstance().get("huoqushequdongtailiwuxinxi", MainHttpConsts.GET_DYNAMICGIFTINFO)
.execute(callback);
}
@ -697,7 +698,7 @@ public class MainHttpUtil {
* 社区动态礼物信息列表
*/
public static void getDynamicSendGiftList(String id, int page, HttpCallback callback) {
HttpClient.getInstance().get("Community.getDynamicSendGiftList", MainHttpConsts.GET_DYNAMICSENDGIFTLIST)
HttpClient.getInstance().get("huoqushequdongtailiwuliebiao", MainHttpConsts.GET_DYNAMICSENDGIFTLIST)
.params("dynamic_id", id)
.params("page", page)
.execute(callback);
@ -709,7 +710,7 @@ public class MainHttpUtil {
* 是否是主播
*/
public static void isAnchor(HttpCallback callback) {
HttpClient.getInstance().get("User.isAnchor", MainHttpConsts.ISANCHOR)
HttpClient.getInstance().get("shifouweizhubozhanghao", MainHttpConsts.ISANCHOR)
.execute(callback);
}
@ -717,7 +718,7 @@ public class MainHttpUtil {
* 是否是完成任务
*/
public static void getUserFrontTaskType(HttpCallback callback) {
HttpClient.getInstance().get("Task.getUserFrontTaskType", MainHttpConsts.GET_USER_FRONTTASKTYPE)
HttpClient.getInstance().get("huoquqianzhirenwushifouwancheng", MainHttpConsts.GET_USER_FRONTTASKTYPE)
.execute(callback);
}
@ -725,7 +726,7 @@ public class MainHttpUtil {
* 客服地址
*/
public static void getCustomerService(HttpCallback callback) {
HttpClient.getInstance().get("Home.getCustomerService", MainHttpConsts.GETCUSTOMERSERVICE)
HttpClient.getInstance().get("huoqudengluyekefu", MainHttpConsts.GETCUSTOMERSERVICE)
.execute(callback);
}
@ -733,7 +734,7 @@ public class MainHttpUtil {
* 获取im备注信息
*/
public static void getInstructorRemark(HttpCallback callback) {
HttpClient.getInstance().get("User.getInstructorRemark", MainHttpConsts.GETINSTRUCTORREMARK)
HttpClient.getInstance().get("huoqutuiguangbeizhumingliebiao", MainHttpConsts.GETINSTRUCTORREMARK)
.execute(callback);
}
@ -741,13 +742,13 @@ public class MainHttpUtil {
* 是否管理员
*/
public static void isInstructor(HttpCallback callback) {
HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR)
HttpClient.getInstance().get("shifouweituiguangzhanghao", MainHttpConsts.ISINSTRUCTOR)
.execute(callback);
}
//
public static void setMessageReadAll() {
HttpClient.getInstance().get("User.getUserInstructor", "")
HttpClient.getInstance().get("huoquyonghuzhidaoyuan", "")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -770,7 +771,7 @@ public class MainHttpUtil {
* 订单通知
*/
public static void hwNotify(String InAppPurchaseData, String Signature, String orderId, HttpCallback callback) {
HttpClient.getInstance().get("Charge.HuaweiNotify", "Charge.HuaweiNotify")
HttpClient.getInstance().get("huaweizhifuhuidiao", "huaweizhifuhuidiao")
.params("InAppPurchaseData", InAppPurchaseData)
.params("InAppDataSignature", Signature)
.params("SelfOrderId", orderId)

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

@ -74,7 +74,7 @@ public class HonorViewHolder extends AbsUserHomeViewHolder {
/**
* 获取用户荣誉和座骑
*/
HttpClient.getInstance().get("User.medalCarList", LiveHttpConsts.GET_USER_LIST)
HttpClient.getInstance().get("xunzhangzuoqiliebiao", LiveHttpConsts.GET_USER_LIST)
.params("uid", mToUid,true)
.execute(new HttpCallback() {
@Override

59
main/src/main/java/com/yunbao/main/views/MainGameViewHolder.java Normal file
View File

@ -0,0 +1,59 @@
package com.yunbao.main.views;
import android.content.Context;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.main.R;
public class MainGameViewHolder extends AbsMainViewHolder {
MainHomeGameViewHolder mGameViewHolder;
public MainGameViewHolder(Context context, ViewGroup parentView) {
super(context, parentView);
}
@Override
public void onCreateHolder() {
super.onCreateHolder();
}
@Override
protected int getLayoutId() {
return R.layout.view_game_holder;
}
@Override
public void init() {
ViewGroup rootGroup= (ViewGroup) findViewById(R.id.rootView);
mGameViewHolder = new MainHomeGameViewHolder((AbsActivity) mContext,rootGroup);
mGameViewHolder.addToParent();
FrameLayout.LayoutParams params= (FrameLayout.LayoutParams) rootGroup.getLayoutParams();
params.topMargin= DpUtil.dp2px(20);
rootGroup.setLayoutParams(params);
}
@Override
public void onDestroy() {
super.onDestroy();
mGameViewHolder.onDestroy();
}
@Override
public void onResume() {
super.onResume();
mGameViewHolder.onResume();
}
@Override
public void onPause() {
super.onPause();
mGameViewHolder.onPause();
}
}

1
main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
View File

@ -174,7 +174,6 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
String[] titles;
private void initTab() {
//TODO 短剧
titles = new String[]{"社區"/*, "短劇"*/};
if (!WordUtil.isNewZh()) {
titles = new String[]{"Community"/*, "Theater"*/};

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

@ -13,6 +13,7 @@ import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.LogUtils;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.enums.PopupPosition;
@ -150,7 +151,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
});
mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data);
ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
LiveNetManager.get(mContext)

15
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@ -163,9 +163,9 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
if (position == 0) {
/* if (position == 0) {
return 2;
}
}*/
return 1;
}
});
@ -174,6 +174,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
decoration.setOnlySetItemOffsetsButNoDraw(true);
mRefreshView.setItemDecoration(decoration);
mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height);
mAdapter.hideBanner();
mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this);
mAdapter.setHasStableIds(true);//
mRefreshView.setLoadMoreEnable(true);
@ -344,6 +345,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
}
View headView = mAdapter.getHeadView();
mBanner = (Banner) headView.findViewById(R.id.banner);
mBanner.setVisibility(View.GONE);
mRefreshView.initData();
mBanner.setOutlineProvider(new ViewOutlineProvider() {
@Override
@ -431,6 +433,15 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
private void showBanner() {
if (mBannerList == null || mBannerList.size() == 0 || mBanner == null) {
mBanner.setVisibility(View.GONE);
mAdapter.hideBanner();
GridLayoutManager gridLayoutManager=mRefreshView.getLayoutManager();
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
return 1;
}
});
return;
}
if (mBannerShowed) {

8
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -14,13 +14,16 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NotificationCompat;
import com.alibaba.fastjson.JSON;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.core.BottomPopupView;
import com.yunbao.common.dialog.GiftWallDialog;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.RandomSudGameManager;
import com.yunbao.common.utils.AesUtils;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.event.FloatWarOrderEvent;
@ -33,6 +36,8 @@ import com.yunbao.main.R;
import org.greenrobot.eventbus.EventBus;
import java.util.Base64;
/**
* Created by cxf on 2018/9/22.
* MainActivity 首页 删除
@ -79,7 +84,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
, false).setFullWindows(true).setTab2(true).showDialog();*/
// RouteUtil.forwardBattlePass();
RandomSudGameManager.getManager().random(mContext);
//RandomSudGameManager.getManager().random(mContext);
}
});
return true;
@ -93,7 +98,6 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
}
});
}
public void setCurPosition(int position) {
mViewPager.setCurrentItem(position);
}

8
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@ -470,6 +470,12 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
case 17:
RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
break;
case 100:
RouteUtil.forwardCommunityActivity();
break;
case 101:
RouteUtil.forwardActivity(RouteUtil.PATH_MAIN_MESSAGE);
break;
}
} else {
//21 在线客服
@ -540,7 +546,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
} else if (i == R.id.btn_gold) {
MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
String url = CommonAppConfig.HOST + "/h5/task/index.html?1=1";
RewardActivity.forward(mContext, url);
} else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref(), false);

5
main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
View File

@ -1,6 +1,7 @@
package com.yunbao.main.views;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.text.TextUtils;
@ -73,7 +74,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
private LinearLayout topLayout, ltNodataMsg;
private ImageView imgNewsNotice, imgNewsInteraction, imgNewsOnline, imgSystemMessages;
private Handler netHandler;
private MainActivity mContext;
private Activity mContext;
private String homeZdyPop;
@ -86,7 +87,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
return this;
}
public MainMessageViewHolder(MainActivity context, ViewGroup parentView) {
public MainMessageViewHolder(Activity context, ViewGroup parentView) {
super(context, parentView);
mContext = context;
}

BIN
main/src/main/res/drawable/icon_community.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
main/src/main/res/drawable/icon_community_p.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
main/src/main/res/drawable/icon_home.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
main/src/main/res/drawable/icon_home_p.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
main/src/main/res/drawable/icon_main_start.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
main/src/main/res/drawable/icon_me.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

Some files were not shown because too many files have changed in this diff Show More