HOSO提包版本

This commit is contained in:
2024-11-12 09:48:25 +08:00
parent bf8268712b
commit db05ff116e
114 changed files with 1068 additions and 868 deletions

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>

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();
}

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) {

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) {

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());
}
}

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();
}
}

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);

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) {

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);
}

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) {

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) {

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)

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

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();
}
}

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"*/};

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)

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) {

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);
}

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);

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;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -233,12 +233,15 @@
android:layout_gravity="center"
android:layout_weight="1"
android:src="@mipmap/login_line"
android:visibility="visible" />
android:visibility="visible"
tools:visibility="gone" />
<RelativeLayout
android:id="@+id/lt_btn_twitter"
android:layout_width="57dp"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
tools:visibility="gone">
<com.twitter.sdk.android.core.identity.TwitterLoginButton
android:id="@+id/tt_login_button"
@@ -247,7 +250,6 @@
android:visibility="invisible" />
<LinearLayout
android:id="@+id/lt_btn_twitter"
android:layout_width="match_parent"
android:layout_height="wrap_content">

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent">
</LinearLayout>

View File

@@ -144,7 +144,7 @@
android:layout_height="60dp"
android:layout_centerInParent="true"
android:onClick="mainClick"
android:src="@mipmap/icon_main_start" />
android:src="@drawable/icon_main_start" />
</RelativeLayout>

View File

@@ -10,8 +10,9 @@
android:id="@+id/indicator"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:overScrollMode="never"
android:layout_gravity="center"
android:overScrollMode="never"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

View File

@@ -23,6 +23,7 @@
android:gravity="center">
<ImageView
android:visibility="gone"
android:src="@mipmap/icon_back_community"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

View File

@@ -45,7 +45,7 @@
<RelativeLayout
android:layout_width="114dp"
android:layout_height="match_parent"
android:layout_marginRight="18dp"
android:layout_marginRight="2dp"
android:gravity="center|right">
<com.makeramen.roundedimageview.RoundedImageView
@@ -395,7 +395,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -403,11 +403,15 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="39dp"
@@ -426,12 +430,15 @@
android:id="@+id/gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:text="1"
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout6" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -446,7 +453,7 @@
android:background="@color/gray_dcdcdc" />
</LinearLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -454,11 +461,15 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/linearLayout7"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="39dp"
@@ -477,12 +488,15 @@
android:id="@+id/star_coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:text="1"
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout7" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="1dp"
@@ -494,7 +508,7 @@
android:layout_height="42dp"
android:background="@color/gray_dcdcdc" />
</LinearLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -502,11 +516,15 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/linearLayout8"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="39dp"
@@ -528,15 +546,18 @@
android:text=""
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout8" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_height="40dp"
android:paddingBottom="3dp">

View File

@@ -5,10 +5,21 @@
android:orientation="vertical"
android:paddingTop="20dp">
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/btn_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:visibility="gone"
android:layout_marginTop="15dp"
android:layout_marginStart="18dp"
android:onClick="backClick"
android:padding="9dp"
android:src="@mipmap/icon_back"
android:tint="@color/textColor" />
<TextView
android:id="@+id/top_noback"
android:layout_width="wrap_content"
@@ -28,7 +39,7 @@
android:layout_marginBottom="16dp"
android:src="@mipmap/news_icon_clearance"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
<LinearLayout

View File

@@ -1,129 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="main_tab_home">
<item>@mipmap/home_00000</item>
<item>@mipmap/home_00001</item>
<item>@mipmap/home_00002</item>
<item>@mipmap/home_00003</item>
<item>@mipmap/home_00004</item>
<item>@mipmap/home_00005</item>
<item>@mipmap/home_00006</item>
<item>@mipmap/home_00007</item>
<item>@mipmap/home_00008</item>
<item>@mipmap/home_00009</item>
<item>@mipmap/home_00010</item>
<item>@mipmap/home_00011</item>
<item>@mipmap/home_00012</item>
<item>@mipmap/home_00013</item>
<item>@mipmap/home_00014</item>
<item>@mipmap/home_00015</item>
<item>@mipmap/home_00016</item>
<item>@mipmap/home_00017</item>
<item>@mipmap/home_00018</item>
<item>@mipmap/home_00019</item>
<item>@mipmap/home_00020</item>
<item>@mipmap/home_00021</item>
<item>@mipmap/home_00022</item>
<item>@mipmap/home_00023</item>
<item>@mipmap/home_00024</item>
<item>@mipmap/home_00025</item>
<item>@mipmap/home_00026</item>
<item>@mipmap/home_00027</item>
<item>@mipmap/home_00028</item>
<item>@mipmap/home_00029</item>
<item>@mipmap/home_00030</item>
<item>@mipmap/home_00031</item>
<item>@mipmap/home_00032</item>
<item>@mipmap/home_00033</item>
<item>@mipmap/home_00034</item>
<item>@mipmap/home_00035</item>
<item>@mipmap/home_00036</item>
<item>@mipmap/home_00037</item>
<item>@mipmap/home_00038</item>
<item>@mipmap/home_00039</item>
<item>@mipmap/home_00040</item>
<item>@mipmap/home_00041</item>
<item>@mipmap/home_00042</item>
<item>@mipmap/home_00043</item>
<item>@mipmap/home_00044</item>
<item>@mipmap/home_00045</item>
<item>@mipmap/home_00046</item>
<item>@mipmap/home_00047</item>
<item>@mipmap/home_00048</item>
<item>@mipmap/home_00049</item>
<item>@mipmap/home_00050</item>
<item>@mipmap/home_00051</item>
<item>@mipmap/home_00052</item>
<item>@mipmap/home_00053</item>
<item>@mipmap/home_00054</item>
<item>@mipmap/home_00055</item>
<item>@mipmap/home_00056</item>
<item>@mipmap/home_00057</item>
<item>@mipmap/home_00058</item>
<item>@mipmap/home_00059</item>
<item>@drawable/icon_home</item>
<item>@drawable/icon_home_p</item>
</string-array>
<string-array name="main_tab_video">
<item>@mipmap/community_00000</item>
<item>@mipmap/community_00001</item>
<item>@mipmap/community_00002</item>
<item>@mipmap/community_00003</item>
<item>@mipmap/community_00004</item>
<item>@mipmap/community_00005</item>
<item>@mipmap/community_00006</item>
<item>@mipmap/community_00007</item>
<item>@mipmap/community_00008</item>
<item>@mipmap/community_00009</item>
<item>@mipmap/community_00010</item>
<item>@mipmap/community_00011</item>
<item>@mipmap/community_00012</item>
<item>@mipmap/community_00013</item>
<item>@mipmap/community_00014</item>
<item>@mipmap/community_00015</item>
<item>@mipmap/community_00016</item>
<item>@mipmap/community_00017</item>
<item>@mipmap/community_00018</item>
<item>@mipmap/community_00019</item>
<item>@mipmap/community_00020</item>
<item>@mipmap/community_00021</item>
<item>@mipmap/community_00022</item>
<item>@mipmap/community_00023</item>
<item>@mipmap/community_00024</item>
<item>@mipmap/community_00025</item>
<item>@mipmap/community_00026</item>
<item>@mipmap/community_00027</item>
<item>@mipmap/community_00028</item>
<item>@mipmap/community_00029</item>
<item>@mipmap/community_00030</item>
<item>@mipmap/community_00031</item>
<item>@mipmap/community_00032</item>
<item>@mipmap/community_00033</item>
<item>@mipmap/community_00034</item>
<item>@mipmap/community_00035</item>
<item>@mipmap/community_00036</item>
<item>@mipmap/community_00037</item>
<item>@mipmap/community_00038</item>
<item>@mipmap/community_00039</item>
<item>@mipmap/community_00040</item>
<item>@mipmap/community_00041</item>
<item>@mipmap/community_00042</item>
<item>@mipmap/community_00043</item>
<item>@mipmap/community_00044</item>
<item>@mipmap/community_00045</item>
<item>@mipmap/community_00046</item>
<item>@mipmap/community_00047</item>
<item>@mipmap/community_00048</item>
<item>@mipmap/community_00049</item>
<item>@mipmap/community_00050</item>
<item>@mipmap/community_00051</item>
<item>@mipmap/community_00052</item>
<item>@mipmap/community_00053</item>
<item>@mipmap/community_00054</item>
<item>@mipmap/community_00055</item>
<item>@mipmap/community_00056</item>
<item>@mipmap/community_00057</item>
<item>@mipmap/community_00058</item>
<item>@mipmap/community_00059</item>
<item>@drawable/icon_community</item>
<item>@drawable/icon_community_p</item>
</string-array>
@@ -139,127 +23,11 @@
<!-- <item>@mipmap/icon_main_tab_near_08</item>-->
</string-array>
<string-array name="main_tab_list">
<item>@mipmap/message_00000</item>
<item>@mipmap/message_00001</item>
<item>@mipmap/message_00002</item>
<item>@mipmap/message_00003</item>
<item>@mipmap/message_00004</item>
<item>@mipmap/message_00005</item>
<item>@mipmap/message_00006</item>
<item>@mipmap/message_00007</item>
<item>@mipmap/message_00008</item>
<item>@mipmap/message_00009</item>
<item>@mipmap/message_00010</item>
<item>@mipmap/message_00011</item>
<item>@mipmap/message_00012</item>
<item>@mipmap/message_00013</item>
<item>@mipmap/message_00014</item>
<item>@mipmap/message_00015</item>
<item>@mipmap/message_00016</item>
<item>@mipmap/message_00017</item>
<item>@mipmap/message_00018</item>
<item>@mipmap/message_00019</item>
<item>@mipmap/message_00020</item>
<item>@mipmap/message_00021</item>
<item>@mipmap/message_00022</item>
<item>@mipmap/message_00023</item>
<item>@mipmap/message_00024</item>
<item>@mipmap/message_00025</item>
<item>@mipmap/message_00026</item>
<item>@mipmap/message_00027</item>
<item>@mipmap/message_00028</item>
<item>@mipmap/message_00029</item>
<item>@mipmap/message_00030</item>
<item>@mipmap/message_00031</item>
<item>@mipmap/message_00032</item>
<item>@mipmap/message_00033</item>
<item>@mipmap/message_00034</item>
<item>@mipmap/message_00035</item>
<item>@mipmap/message_00036</item>
<item>@mipmap/message_00037</item>
<item>@mipmap/message_00038</item>
<item>@mipmap/message_00039</item>
<item>@mipmap/message_00040</item>
<item>@mipmap/message_00041</item>
<item>@mipmap/message_00042</item>
<item>@mipmap/message_00043</item>
<item>@mipmap/message_00044</item>
<item>@mipmap/message_00045</item>
<item>@mipmap/message_00046</item>
<item>@mipmap/message_00047</item>
<item>@mipmap/message_00048</item>
<item>@mipmap/message_00049</item>
<item>@mipmap/message_00050</item>
<item>@mipmap/message_00051</item>
<item>@mipmap/message_00052</item>
<item>@mipmap/message_00053</item>
<item>@mipmap/message_00054</item>
<item>@mipmap/message_00055</item>
<item>@mipmap/message_00056</item>
<item>@mipmap/message_00057</item>
<item>@mipmap/message_00058</item>
<item>@mipmap/message_00059</item>
<item>@drawable/icon_message</item>
<item>@drawable/icon_message_p</item>
</string-array>
<string-array name="main_tab_chat">
<item>@mipmap/me_00000</item>
<item>@mipmap/me_00001</item>
<item>@mipmap/me_00002</item>
<item>@mipmap/me_00003</item>
<item>@mipmap/me_00004</item>
<item>@mipmap/me_00005</item>
<item>@mipmap/me_00006</item>
<item>@mipmap/me_00007</item>
<item>@mipmap/me_00008</item>
<item>@mipmap/me_00009</item>
<item>@mipmap/me_00010</item>
<item>@mipmap/me_00011</item>
<item>@mipmap/me_00012</item>
<item>@mipmap/me_00013</item>
<item>@mipmap/me_00014</item>
<item>@mipmap/me_00015</item>
<item>@mipmap/me_00016</item>
<item>@mipmap/me_00017</item>
<item>@mipmap/me_00018</item>
<item>@mipmap/me_00019</item>
<item>@mipmap/me_00020</item>
<item>@mipmap/me_00021</item>
<item>@mipmap/me_00022</item>
<item>@mipmap/me_00023</item>
<item>@mipmap/me_00024</item>
<item>@mipmap/me_00025</item>
<item>@mipmap/me_00026</item>
<item>@mipmap/me_00027</item>
<item>@mipmap/me_00028</item>
<item>@mipmap/me_00029</item>
<item>@mipmap/me_00030</item>
<item>@mipmap/me_00031</item>
<item>@mipmap/me_00032</item>
<item>@mipmap/me_00033</item>
<item>@mipmap/me_00034</item>
<item>@mipmap/me_00035</item>
<item>@mipmap/me_00036</item>
<item>@mipmap/me_00037</item>
<item>@mipmap/me_00038</item>
<item>@mipmap/me_00039</item>
<item>@mipmap/me_00040</item>
<item>@mipmap/me_00041</item>
<item>@mipmap/me_00042</item>
<item>@mipmap/me_00043</item>
<item>@mipmap/me_00044</item>
<item>@mipmap/me_00045</item>
<item>@mipmap/me_00046</item>
<item>@mipmap/me_00047</item>
<item>@mipmap/me_00048</item>
<item>@mipmap/me_00049</item>
<item>@mipmap/me_00050</item>
<item>@mipmap/me_00051</item>
<item>@mipmap/me_00052</item>
<item>@mipmap/me_00053</item>
<item>@mipmap/me_00054</item>
<item>@mipmap/me_00055</item>
<item>@mipmap/me_00056</item>
<item>@mipmap/me_00057</item>
<item>@mipmap/me_00058</item>
<item>@mipmap/me_00059</item>
<item>@drawable/icon_me</item>
<item>@drawable/icon_me_p</item>
</string-array>
</resources>