Merge branch 'fix/lp/lp_fix_login' into 'release'

feat: 隐私协议更改、马甲包隐藏qq、微信登录

See merge request app_android_lib/YDL-Component!363

m-user/src/main/java/com/yidianling/user/ui/login/H5Activity.java

@@ -9,7 +9,6 @@ import android.widget.ImageView;
 
 import com.ydl.ydlcommon.base.BaseActivity;
 import com.ydl.ydlcommon.base.BaseApp;
-import com.ydl.ydlcommon.base.config.ChannelConfig;
 import com.ydl.ydlcommon.bean.StatusBarOptions;
 import com.ydl.ydlcommon.data.PlatformDataManager;
 import com.yidianling.common.tools.RxNetTool;
@@ -65,11 +64,9 @@ public class H5Activity extends BaseActivity {
             if (!RxNetTool.isConnected(BaseApp.Companion.getApp())) {
                 //无网络 读取本地文件
                 web_view.loadUrl("file:///android_asset/html/yinsi.html");
-            } else if (ffrom.startsWith(ChannelConfig.ATK_4.name())) {
-                //心理测试包更改隐私协议地址
-                web_view.loadUrl("https://m.ydl.com/Protol/yinsi/shdh/test");
             } else {
-                web_view.loadUrl("https://m.ydl.com/Protol/yinsi/shdh");//加载url
+                //加载url
+                web_view.loadUrl("https://m.ydl.com/Protol/yinsi/shdh");
             }
         } else {
             //用户协议0
@@ -77,7 +74,8 @@ public class H5Activity extends BaseActivity {
                 //无网络 读取本地文件
                 web_view.loadUrl("file:///android_asset/html/sdkuserprotol.html");
             }else {
-                web_view.loadUrl("https://h5.ydl.com/SDUserProtol");//加载url
+                //加载url
+                web_view.loadUrl("https://h5.ydl.com/SDUserProtol");
             }
         }
     }

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -17,8 +17,6 @@ import com.mobile.auth.gatewayauth.model.TokenRet
 import com.ydl.ydlcommon.app.Apm
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.BaseApp
-import com.ydl.ydlcommon.base.config.ChannelConfig
-import com.ydl.ydlcommon.data.PlatformDataManager.getRam
 import com.ydl.ydlcommon.utils.JPushUtils
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.YDLCacheUtils
@@ -442,13 +440,7 @@ object OneKeyLoginHelp {
     }
 
     private fun getPrivacyUrl(): String {
-        val ffrom = getRam().getChannelName()
-        var appPrivacyTwo = "https://m.ydl.com/Protol/yinsi/shdh"
-        if (ffrom.startsWith(ChannelConfig.ATK_4.name)) {
-            //心理测试包更改隐私协议地址
-            appPrivacyTwo = "https://m.ydl.com/Protol/yinsi/shdh/test"
-        }
-        return appPrivacyTwo
+        return "https://m.ydl.com/Protol/yinsi/shdh"
     }
 
 

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -257,7 +257,9 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                 .startsWith(ChannelConfig.ATK_3.name) || PlatformDataManager.getRam()
                 .getChannelName().startsWith(ChannelConfig.ATK_4.name)
         ) {
+            other_login_style.visibility = View.GONE
             login_qq.visibility = View.GONE
+            login_wechat.visibility = View.GONE
         }