fell_me

app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PandoraLive</string>
+    <string name="app_name">FeelWe</string>
 </resources>

build.gradle

@@ -56,7 +56,7 @@ allprojects {
 ext {
     IS_PUBLISH_LOCAL=true
     LIB_VERSION="1.0.6"
-    AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.19'
+    AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.14'
 //    AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk"
 //    AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6"
 }

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -7,8 +7,8 @@ package com.yunbao.common;
 public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
-    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=68";
+    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=717";//隱私條款
-    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=67";
+    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=716";//用戶協議
 
     //注册用户协议
     public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

common/src/main/java/com/yunbao/common/bean/ConfigBean.java

@@ -62,7 +62,6 @@ public class ConfigBean extends BaseModel {
     private String google_isup;
 
     private String sud_game_speech;
-    private int pay_type = 0;
 
     @SerializedName("is_return_user")//是否需要弹窗（0否，1是）
     private String isReturnUser="";
@@ -73,14 +72,6 @@ public class ConfigBean extends BaseModel {
     @SerializedName("jump_h5_url")//点击跳转H5页面地址
     private String jumpH5Url="";
 
-    public int getPay_type() {
-        return pay_type;
-    }
-
-    public void setPay_type(int pay_type) {
-        this.pay_type = pay_type;
-    }
-
     @JSONField(name = "is_return_user")
     public String getIsReturnUser() {
         return isReturnUser;

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -536,7 +536,6 @@ public class IMLoginManager extends BaseCacheManager {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", uid)
                 .params("token", token)
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java

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

common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java

@@ -10,7 +10,6 @@ import android.util.Log;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.yunbao.common.event.CheckRemainingBalanceEvent;
-import com.yunbao.common.sud.decorator.game.JumpEvent;
 import com.yunbao.common.sud.state.SudMGPMGState;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ISudFSMStateHandleUtils;
@@ -373,7 +372,6 @@ public class SudFSMMGDecorator implements ISudFSMMG {
                 } else {
                     listener.onGameMGCommonGameCreateOrder(handle, mgCommonGameCreateOrder);
                 }
-                JumpEvent.hit(mgCommonGameCreateOrder);
                 break;
             case SudMGPMGState.MG_COMMON_PLAYER_ROLE_ID: // 26. 游戏通知app玩家角色(仅对狼人杀有效)
                 SudMGPMGState.MGCommonPlayerRoleId mgCommonPlayerRoleId = SudJsonUtils.fromJson(dataJson, SudMGPMGState.MGCommonPlayerRoleId.class);

common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java

@@ -38,7 +38,6 @@ import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
-import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -660,7 +659,6 @@ public class JavascriptInterfaceUtils {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

common/src/main/res/values-en-rUS/strings.xml

@@ -1059,11 +1059,11 @@ Limited ride And limited avatar frame</string>
     <string name="privacy_terms">Privacy Policy</string>
     <string name="terms_and_policies">Terms and policies</string>
     <string name="install_the_application">For details, please read the following message to install the application:</string>
-    <string name="treat_and_protect">Welcome to PandoraLive. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
+    <string name="treat_and_protect">Welcome to FeelWe. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
     <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
     <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
     <string name="agreement">agreement</string>
-    <string name="come_to">Welcome to PandoraLive.</string>
+    <string name="come_to">Welcome to FeelWe.</string>
     <string name="live_gift">gift</string>
     <string name="register_tip_2">User service agreement</string>
     <string name="live_fans_medal_pri_des">一 Fan privilege 一</string>

common/src/main/res/values-zh/strings.xml

@@ -1082,14 +1082,14 @@
     <string name="and">和</string>
     <string name="privacy_terms">隱私條款</string>
     <string name="terms_and_policies">條款和政策</string>
-    <string name="treat_and_protect">歡迎來到PandoraLive，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
+    <string name="treat_and_protect">歡迎來到FeelWe，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
     <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
     <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
     <string name="agreement">同意</string>
     <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
     <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
-    <string name="come_to">歡迎來到PandoraLive。</string>
+    <string name="come_to">歡迎來到FeelWe。</string>
-    <string name="sign_up_for">註冊PandoraLive</string>
+    <string name="sign_up_for">註冊FeelWe</string>
     <string name="register_and_log_in">註冊並登錄</string>
     <string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
     <string name="layout_live_anchor_say_ready_title">女神說</string>

common/src/main/res/values/strings.xml

@@ -888,11 +888,11 @@ Limited ride And limited avatar frame</string>
     <string name="privacy_terms">Privacy Policy</string>
     <string name="terms_and_policies">Terms and policies</string>
     <string name="install_the_application">For details, please read the following message to install the application:</string>
-    <string name="treat_and_protect">Welcome to PandoraLive. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
+    <string name="treat_and_protect">Welcome to FeelWe. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
     <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
     <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
     <string name="agreement">agreement</string>
-    <string name="come_to">Welcome to PandoraLive.</string>
+    <string name="come_to">Welcome to FeelWe.</string>
     <string name="live_gift">gift</string>
     <string name="register_tip_2">User service agreement</string>
     <string name="live_fans_medal_pri_des">一 Fan privilege 一</string>

config.gradle

@@ -4,8 +4,8 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 606,
+            versionCode      : 604,
-            versionName      : "6.8.2",
+            versionName      : "6.8.1",
             namespace        : "com.pandoralive.shayu"
     ]
     manifestPlaceholders = [
@@ -17,7 +17,7 @@ ext {
 
             //百度语音识别
 
-            swReleaseModel   : false, //true 声网正式服 false 测试服
+            swReleaseModel   : true, //true 声网正式服 false 测试服
 
             baiduAppId       : "23774720",
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",

live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java

@@ -60,7 +60,6 @@ import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.IMLoginManager;
-import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DebugUtils;
@@ -414,7 +413,6 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

@@ -44,7 +44,6 @@ import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
-import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DebugUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MobclickAgent;
@@ -517,7 +516,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

live/src/main/res/drawable/background_fff_d20.xml

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="30dp" />
-            <solid android:color="#ffffff" />
+            <solid android:color="#FFF4F4F4" />
         </shape>
     </item>
 </selector>

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -118,10 +118,10 @@ import java.util.TimerTask;
 public class EntryActivity extends AppCompatActivity {
 
     private VideoView video_view;
-    private ImageView btn_phone, btn_line, btn_twitter;
+    private ImageView btn_line, btn_twitter;
     private TextView btn_tip, btn_tip1, tv_customer;
     private TwitterLoginButton tt_login_button;
-    private LinearLayout btn_google, googleLayout;
+    private LinearLayout btn_google, googleLayout,btn_phone;
     public static Activity activity;
     private static String mLoginType = Constants.MOB_PHONE;//登录方式
     public String mPromoCode = "", UserID = "";//推广码
@@ -221,19 +221,19 @@ public class EntryActivity extends AppCompatActivity {
         }
 
         lt_btn_facebook = findViewById(R.id.lt_btn_facebook);
-        lt_btn_twitter = findViewById(R.id.lt_btn_twitter);
+        //lt_btn_twitter = findViewById(R.id.lt_btn_twitter);
         btn_tip = findViewById(R.id.btn_tip);
         btn_tip1 = findViewById(R.id.btn_tip1);
 
         img_view = findViewById(R.id.img_view);
 
         btn_google = findViewById(R.id.btn_google);
-        btn_twitter = findViewById(R.id.btn_twitter);
+        //btn_twitter = findViewById(R.id.btn_twitter);
-        tt_login_button = findViewById(R.id.tt_login_button);
+        //tt_login_button = findViewById(R.id.tt_login_button);
 
         tv_customer = findViewById(R.id.tv_customer);
         btn_phone = findViewById(R.id.btn_phone);
-        btn_line = findViewById(R.id.btn_line);
+        //btn_line = findViewById(R.id.btn_line);
         lt_customer = findViewById(R.id.lt_customer);
 
         btn_tip.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
@@ -334,7 +334,7 @@ public class EntryActivity extends AppCompatActivity {
             }
         });
 
-        lt_btn_twitter.setOnClickListener(new View.OnClickListener() {
+        /*lt_btn_twitter.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (isBtnClick()) {
@@ -342,9 +342,9 @@ public class EntryActivity extends AppCompatActivity {
                 }
                 verfiy(3);
             }
-        });
+        });*/
 
-        tt_login_button.setCallback(new Callback<TwitterSession>() {
+        /*tt_login_button.setCallback(new Callback<TwitterSession>() {
             @Override
             public void success(Result<TwitterSession> result) {
                 // Do something with result, which provides a TwitterSession for making API calls
@@ -373,8 +373,8 @@ public class EntryActivity extends AppCompatActivity {
                 Log.i("Log", "TwitterException = " + exception);
                 ToastUtil.show(getResources().getString(R.string.user_login_outtime));
             }
-        });
+        });*/
-        findViewById(R.id.btn_line).setOnClickListener(new View.OnClickListener() {
+        /*findViewById(R.id.btn_line).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (isBtnClick()) {
@@ -382,7 +382,7 @@ public class EntryActivity extends AppCompatActivity {
                 }
                 verfiy(4);
             }
-        });
+        });*/
 
         getUrl();
 
@@ -441,10 +441,10 @@ public class EntryActivity extends AppCompatActivity {
         } else if (loginType == 4) {
             try {
                 // App-to-app login
-                Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "2006124380", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
+              /*  Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "2006124380", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
                         // .nonce("<a randomly-generated string>") // nonce can be used to improve security
                         .build());
-                startActivityForResult(loginIntent, 1001);
+                startActivityForResult(loginIntent, 1001);*/
             } catch (Exception e) {
                 Log.e("ERROR", e.toString());
                 ToastUtil.show(getResources().getString(R.string.user_login_outtime));

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -167,39 +167,26 @@ public class LoginActivity extends AbsActivity {
     }
 
 
-    //去掉防止抖动
     public void loginClick(View v) {
-        int i = v.getId();
+        ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
-        if (i == R.id.btn_login) {
+            @Override
-            //Intent intent = new Intent(LoginActivity.this, NewLiveActivity.class);
+            public void onViewClicks() {
-            //startActivity(intent);
+                int i = v.getId();
-            login();
+                if (i == R.id.btn_login) {
-        } else if (i == R.id.btn_register) {
+                    //Intent intent = new Intent(LoginActivity.this, NewLiveActivity.class);
-            register();
+                    //startActivity(intent);
-        } else if (i == R.id.btn_forget_pwd) {
+                    login();
-            forgetPwd();
 
-        } else if (i == R.id.btn_tip) {
+                } else if (i == R.id.btn_register) {
-            forwardTip();
+                    register();
-        }
+                } else if (i == R.id.btn_forget_pwd) {
-//        ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
+                    forgetPwd();
-//            @Override
+
-//            public void onViewClicks() {
+                } else if (i == R.id.btn_tip) {
-//                int i = v.getId();
+                    forwardTip();
-//                if (i == R.id.btn_login) {
+                }
-//                    //Intent intent = new Intent(LoginActivity.this, NewLiveActivity.class);
+            }
-//                    //startActivity(intent);
+        });
-//                    login();
-//                } else if (i == R.id.btn_register) {
-//                    register();
-//                } else if (i == R.id.btn_forget_pwd) {
-//                    forgetPwd();
-//
-//                } else if (i == R.id.btn_tip) {
-//                    forwardTip();
-//                }
-//            }
-//        });
 
     }
 

main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java

@@ -1,7 +1,5 @@
 package com.yunbao.main.activity;
 
-import static com.yunbao.common.utils.GoogleUtils.googleUtils;
-
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -34,7 +32,6 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
 import com.yunbao.main.R;
 import com.yunbao.main.http.MainHttpUtil;
 import com.yunbao.main.utils.HXLinePagerIndicator;
@@ -71,21 +68,14 @@ public class MyWalletActivity extends AbsActivity {
     LoadingDialog loadingDialog;
     SamsungUtil samsungUtil;
 
-    int payConfig = 0;
-
     @Override
     protected int getLayoutId() {
         return R.layout.activity_my_wallet;
     }
 
     protected void main() {
-        super.main();
-        payConfig= CommonAppConfig.getInstance().getConfig().getPay_type();
-        if(CommonAppConfig.IS_GOOGLE_PLAY==0&&payConfig==3){
-                ToastUtil.show(WordUtil.isNewZh()?"充值維護中，請稍後再試":"Recharge is under maintenance. Please try again later.");
-                finish();
-        }
 
+        super.main();
         mw = MyWalletActivity.this;
         setTitle(mContext.getString(R.string.wallet));
 
@@ -102,7 +92,6 @@ public class MyWalletActivity extends AbsActivity {
 
 
         vp_content = (ViewPager) findViewById(R.id.vp_content);
-        vp_content.setVisibility(View.VISIBLE);
         TextView rView = (TextView) findViewById(R.id.rView);
         findViewById(R.id.redPacketMain).setVisibility(View.VISIBLE);
         findViewById(R.id.redPacketMain).setOnClickListener(v -> {
@@ -125,55 +114,8 @@ public class MyWalletActivity extends AbsActivity {
                 payHandler.post(runnable1);
                 payHandler.postDelayed(runnable2, 2000);
             } else {
-                if(payConfig==1){
+                payHandler.post(runnable1);
-                    payHandler.post(runnable1);
+                payHandler.postDelayed(runnable2, 1000);
-                    payHandler.postDelayed(runnable2, 1000);
-                }else{
-                    googleUtils.setQueryPurchaseListener(mContext, new GoogleUtils.QueryPurchasesListener() {
-                        @Override
-                        public void onResult(JSONObject obj) {
-                            try {
-                                int code = obj.getInt("querySize");
-                                if (code == 0) {
-                                    payHandler.post(runnable1);
-                                    payHandler.postDelayed(runnable2, 1000);
-                                } else {
-                                    JSONArray tokenList = obj.getJSONArray("tokenList");
-                                    JSONArray orderList = obj.getJSONArray("orderList");
-                                    String tradeNo = obj.getString("tradeNo");
-
-                                    for (int i = 0; i < tokenList.length(); i++) {
-                                        int finalI = i;
-                                        payHandler.post(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                //谷歌掉单处理
-                                                try {
-                                                    CommonHttpUtil.Google_sec_pay(tokenList.getString(finalI), orderList.getString(finalI), tradeNo, new HttpCallback() {
-                                                        @Override
-                                                        public void onSuccess(int code, String msg, String[] info) {
-                                                            if (finalI == tokenList.length() - 1) {
-                                                                loadingDialog.setShowText(getString(R.string.order_query_success));
-                                                                loadingDialog.dismiss();
-                                                            }
-                                                            ToastUtil.show("充值已到账");
-                                                            finish();
-                                                        }
-                                                    });
-                                                } catch (JSONException e) {
-                                                    e.printStackTrace();
-                                                }
-                                            }
-                                        });
-                                    }
-                                }
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-                    googleUtils.queryPurchasesAsync();
-                }
             }
         });
 
@@ -243,38 +185,20 @@ public class MyWalletActivity extends AbsActivity {
                 bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/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);
             } else {
-                if (payConfig==1){
+                walletFragment = new WalletFragment();
-                    walletFragment = new WalletFragment();
+                Bundle bundle = new Bundle();
-                    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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    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=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 + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&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 + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&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 + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&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 + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&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 {
-                    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"));
-                    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=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    googleFragment2.setArguments(bundle2);
-                }
             }
         } else {
             if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
@@ -330,40 +254,21 @@ public class MyWalletActivity extends AbsActivity {
             } else {
                 Log.i("tss", "不是首充");
                 //链接版本
-                if (payConfig==1){
-                    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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    walletFragment.setArguments(bundle);
 
-                    googleFragment1 = new GoogleFragment();
+                walletFragment = new WalletFragment();
-                    Bundle bundle1 = new Bundle();
+                Bundle bundle = 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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    googleFragment1.setArguments(bundle1);
+                walletFragment.setArguments(bundle);
 
-                    googleFragment2 = new GoogleFragment();
+                googleFragment1 = new GoogleFragment();
-                    Bundle bundle2 = new Bundle();
+                Bundle bundle1 = 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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    googleFragment2.setArguments(bundle2);
+                googleFragment1.setArguments(bundle1);
-                }else {
-                    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"));
-                    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=panduo" + "&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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                    googleFragment2.setArguments(bundle2);
-                }
 
+                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=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                googleFragment2.setArguments(bundle2);
             }
         }
 

main/src/main/java/com/yunbao/main/http/MainHttpUtil.java

@@ -15,7 +15,6 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
-import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.MD5Util;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.VersionUtil;
@@ -50,7 +49,6 @@ public class MainHttpUtil {
                 .params("user_login", phoneNum)
                 .params("user_pass", pwd)
                 .params("pushid", "")
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .params("lastlogindevice", "Android")
                 .params("uuid_Device", uuid)
                 .params("langue", WordUtil.isNewZh()?"chinese":"english")
@@ -257,7 +255,6 @@ public class MainHttpUtil {
      */
     public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {
@@ -292,7 +289,6 @@ public class MainHttpUtil {
 
     public static void getBaseInfos(String uid, String token, HttpCallback callback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
-                .params("key1", RongcloudIMManager.RONG_IM_KEY)
                 .execute(callback);
     }
 
@@ -342,7 +338,7 @@ public class MainHttpUtil {
     public static void getSettingList(HttpCallback callback) {
         HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
                 .params("version", VersionUtil.getVersion())
-                .params("package_name","panduo")
+                .params("package_name","feelWe")
                 .execute(callback);
     }
 

main/src/main/res/layout/activity_entry.xml

@@ -4,12 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     tools:context=".activity.EntryActivity">
 
 
     <com.yunbao.main.views.CustomVideoView
         android:id="@+id/video_view"
         android:layout_width="match_parent"
+        android:visibility="gone"
         android:layout_height="match_parent"
         android:layout_gravity="center" />
 
@@ -34,25 +36,26 @@
             android:layout_marginBottom="21dp">
 
             <LinearLayout
+                android:visibility="gone"
                 android:id="@+id/lt_btn_facebook"
                 android:layout_width="match_parent"
-                android:layout_height="54dp"
+                android:layout_height="56dp"
-                android:layout_marginLeft="42dp"
+                android:layout_marginLeft="48dp"
-                android:layout_marginRight="42dp"
+                android:layout_marginRight="48dp"
                 android:background="@drawable/background_227bef"
-                android:gravity="center|left">
+                android:gravity="center_vertical">
 
                 <ImageView
-                    android:layout_width="30dp"
+                    android:layout_width="32dp"
-                    android:layout_height="30dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="54dp"
+                    android:layout_marginLeft="20dp"
                     android:src="@mipmap/icon_facebook" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="21dp"
                     android:text="@string/user_login_facebook"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
@@ -69,29 +72,62 @@
             <LinearLayout
                 android:id="@+id/btn_google"
                 android:layout_width="match_parent"
-                android:layout_height="54dp"
+                android:layout_height="56dp"
-                android:layout_marginLeft="42dp"
+                android:layout_marginLeft="48dp"
-                android:layout_marginRight="42dp"
+                android:layout_marginRight="48dp"
                 android:background="@drawable/background_fff_d20"
-                android:gravity="center|left">
+                android:gravity="center_vertical">
 
                 <ImageView
-                    android:layout_width="45dp"
+                    android:layout_width="32dp"
-                    android:layout_height="45dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="54dp"
+                    android:layout_marginLeft="20dp"
                     android:src="@mipmap/login_google" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
+                    android:layout_marginLeft="35dp"
                     android:text="@string/user_login_google"
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/phonelayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="21dp">
+
+            <LinearLayout
+                android:id="@+id/btn_phone"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginLeft="48dp"
+                android:layout_marginRight="48dp"
+                android:background="@drawable/background_fff_d20"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="20dp"
+                    android:src="@mipmap/entry_phone" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/login_use_phone"
+                    android:layout_marginLeft="35dp"
+                    android:textColor="@color/black1"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+
         <!--        <RelativeLayout-->
         <!--            android:layout_width="match_parent"-->
         <!--            android:layout_height="wrap_content"-->
@@ -141,7 +177,7 @@
             android:layout_marginRight="25dp"
             android:orientation="vertical">
 
-            <LinearLayout
+            <!--<LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="12dp"
@@ -221,7 +257,7 @@
                 </RelativeLayout>
 
 
-            </LinearLayout>
+            </LinearLayout>-->
 
 
             <LinearLayout
@@ -246,14 +282,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:layout_marginBottom="22dp"
+                android:layout_marginBottom="40dp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/next_step_is_consent"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF999999"
                     android:textSize="10sp" />
 
 
@@ -263,7 +299,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/user_protocol2"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF000000"
                     android:textSize="10sp" />
 
                 <TextView
@@ -271,7 +307,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/and"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF999999"
                     android:textSize="10sp" />
 
                 <TextView
@@ -280,7 +316,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/privacy_terms"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF000000"
                     android:textSize="10sp" />
 
             </LinearLayout>
@@ -292,8 +328,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="125dp"
-        android:visibility="gone"
         android:src="@mipmap/white_logo" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -301,7 +336,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <View
             android:id="@+id/view2"

main/src/main/res/layout/activity_my_wallet.xml

@@ -17,7 +17,6 @@
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_content"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />

main/src/main/res/values-en/strings.xml

@@ -156,4 +156,5 @@
     <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
 
     <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
+    <string name="login_use_phone">Sign in with Phone Number</string>
 </resources>

main/src/main/res/values-zh/strings.xml

@@ -106,5 +106,5 @@
     <string name="activity_feedback_edit_img_select">從相冊選取</string>
     <string name="activity_feedback_edit_img_camera">拍照</string>
     <string name="activity_battle_pass_all_get">一鍵領取</string>
-
+    <string name="login_use_phone">使用手機號登錄</string>
 </resources>

main/src/main/res/values/strings.xml

@@ -107,4 +107,5 @@
     <string name="activity_battle_pass_all_get">Receive all</string>
     <string name="live_room_sud_hint_join">Join</string>
     <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
+    <string name="login_use_phone">Sign in with Phone Number</string>
 </resources>