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

解决登录页面变形问题 评论不能发布空评论 钱包地址替换

Browse Source
This commit is contained in:
ningwenqiang 2024-11-05 09:51:55 +08:00
parent ba8778ae44
commit 1b2ffd37e3
6 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/tmp/full-r8-config.txt
View File

@ -420,7 +420,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-ignorewarnings -ignorewarnings
# End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro # End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
-keep class androidx.core.app.CoreComponentFactory { <init>(); } -keep class androidx.core.app.CoreComponentFactory { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); } -keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); } -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -1091,10 +1091,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-keepclassmembers class * { *** videoEditClick(android.view.View); } -keepclassmembers class * { *** videoEditClick(android.view.View); }
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt # End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
# Generated keep rule for Lifecycle observer adapter. # Generated keep rule for Lifecycle observer adapter.
-if class com.lxj.xpopup.core.BasePopupView { -if class com.lxj.xpopup.core.BasePopupView {
@ -1154,9 +1154,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
-keepattributes *Annotation* -keepattributes *Annotation*

6
main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
View File

@ -262,7 +262,11 @@ public class CommunityDetailsActivity extends AbsActivity {
send.setOnClickListener(new View.OnClickListener() { send.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
CommonHttpUtil.dynamicReply(activeBean.getId(), isComment ? replyComment.getId() : "0", comment.getText().toString(), new HttpCallback() { String content = comment.getText().toString();
if (TextUtils.isEmpty(content)) {
return;
}
CommonHttpUtil.dynamicReply(activeBean.getId(), isComment ? replyComment.getId() : "0", content, new HttpCallback() {
@Override @Override
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
comment.setText(""); comment.setText("");

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

@ -196,24 +196,24 @@ public class MyWalletActivity extends AbsActivity {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
//华为 //华为
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment(); huaWeiFragment1 = new HuaWeiFragment();
@ -230,49 +230,49 @@ public class MyWalletActivity extends AbsActivity {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment(); samsungFragment1 = new SamsungFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment1.setArguments(bundle1); samsungFragment1.setArguments(bundle1);
samsungFragment2 = new SamsungFragment(); samsungFragment2 = new SamsungFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment2.setArguments(bundle2); samsungFragment2.setArguments(bundle2);
} else { } else {
if (payConfig==1){ if (payConfig==1){
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletgold.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/walletgold.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
}else { }else {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} }
} }
@ -282,24 +282,24 @@ public class MyWalletActivity extends AbsActivity {
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment(); huaWeiFragment1 = new HuaWeiFragment();
@ -315,7 +315,7 @@ public class MyWalletActivity extends AbsActivity {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment(); samsungFragment1 = new SamsungFragment();
@ -333,34 +333,34 @@ public class MyWalletActivity extends AbsActivity {
if (payConfig==1){ if (payConfig==1){
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
}else { }else {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&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?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} }

23
main/src/main/res/layout/activity_entry2.xml
View File

@ -7,6 +7,16 @@
android:background="@mipmap/bg_yola_login" android:background="@mipmap/bg_yola_login"
tools:context=".activity.EntryActivity"> tools:context=".activity.EntryActivity">
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/bg_yola_login_forward"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="0.992"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.195" />
<View <View
android:id="@+id/loginTypeBg" android:id="@+id/loginTypeBg"
@ -31,7 +41,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.54" app:layout_constraintVertical_bias="0.5"
app:layout_constraintWidth_percent="0.74" /> app:layout_constraintWidth_percent="0.74" />
<ImageView <ImageView
@ -58,8 +68,8 @@
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/lt_btn_facebook" app:layout_constraintBottom_toBottomOf="@+id/lt_btn_facebook"
app:layout_constraintEnd_toEndOf="@+id/lt_btn_facebook" app:layout_constraintEnd_toEndOf="@+id/lt_btn_facebook"
app:layout_constraintHorizontal_bias="0.46" app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/imageView5" app:layout_constraintStart_toStartOf="@+id/googleTv"
app:layout_constraintTop_toTopOf="@+id/lt_btn_facebook" /> app:layout_constraintTop_toTopOf="@+id/lt_btn_facebook" />
@ -100,7 +110,7 @@
app:layout_constraintBottom_toBottomOf="@+id/btn_google" app:layout_constraintBottom_toBottomOf="@+id/btn_google"
app:layout_constraintEnd_toEndOf="@+id/btn_google" app:layout_constraintEnd_toEndOf="@+id/btn_google"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/textView4" app:layout_constraintStart_toStartOf="@+id/textView5"
app:layout_constraintTop_toTopOf="@+id/btn_google" /> app:layout_constraintTop_toTopOf="@+id/btn_google" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
@ -137,6 +147,7 @@
app:layout_constraintTop_toTopOf="@+id/btn_phone" /> app:layout_constraintTop_toTopOf="@+id/btn_phone" />
<TextView <TextView
android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/user_login_account" android:text="@string/user_login_account"
@ -144,8 +155,8 @@
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/btn_phone" app:layout_constraintBottom_toBottomOf="@+id/btn_phone"
app:layout_constraintEnd_toEndOf="@+id/btn_phone" app:layout_constraintEnd_toEndOf="@+id/btn_phone"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.46"
app:layout_constraintStart_toStartOf="@+id/textView4" app:layout_constraintStart_toEndOf="@+id/accountImg"
app:layout_constraintTop_toTopOf="@+id/btn_phone" /> app:layout_constraintTop_toTopOf="@+id/btn_phone" />

BIN
main/src/main/res/mipmap-xxxhdpi/bg_yola_login.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 MiB

After

Width:  |  Height:  |  Size: 814 KiB

BIN
main/src/main/res/mipmap-xxxhdpi/bg_yola_login_forward.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 454 KiB