Merge branch 'fix/lp/lp_fix_back_audio' into 'd/v4.4.08'

feat: 隐藏马甲包qq登录

See merge request app_android_lib/YDL-Component!320

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.39-SNAPSHOT"
+        componentVersion = "0.3.0.40-SNAPSHOT"
     }
     repositories {
         mavenCentral()

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

@@ -22,6 +22,8 @@ import com.umeng.socialize.UMShareConfig
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.BaseMvpActivity
+import com.ydl.ydlcommon.base.config.ChannelConfig
+import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.data.PlatformRamImpl
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.JPushUtils
@@ -41,7 +43,6 @@ import com.yidianling.user.UserHelper.isLogin
 import com.yidianling.user.api.bean.UserResponseBean
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.http.LoginApiRequestUtil
-import com.yidianling.user.http.request.BindPhoneJavaParam
 import com.yidianling.user.http.request.PhoneLoginAutoParam
 import com.yidianling.user.http.response.ChcekPhoneResponeBean
 import com.yidianling.user.route.UserIn
@@ -52,9 +53,6 @@ import com.yidianling.user.ui.CountryListActivity
 import com.yidianling.user.ui.login.contract.ILoginContract
 import com.yidianling.user.ui.login.presenter.LoginPresenterImpl
 import com.yidianling.user.widget.AgreePrivacyBottomDialog
-import com.yidianling.user.widget.SecretDialog
-import com.yidianling.user.widget.ZDialog
-import com.yidianling.user.widget.ZDialogDirection
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.user_activity_register_and_login_bottom.*
@@ -255,6 +253,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             tv_protocol.visibility = View.GONE
             other_login_style.visibility = View.GONE
         }
+        if (PlatformDataManager.getRam().getChannelName()
+                .startsWith(ChannelConfig.ATK_3.name) || PlatformDataManager.getRam()
+                .getChannelName().startsWith(ChannelConfig.ATK_4.name)
+        ) {
+            login_qq.visibility = View.GONE
+        }
 
 
         if (!TextUtils.isEmpty(YDLCacheUtils.getUserPhone())) {

m-user/src/main/res/layout/user_activity_register_and_login_bottom.xml

@@ -53,10 +53,10 @@
             android:id="@+id/login_wechat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/platform_dp_35"
             android:src="@drawable/user_login_wechat_new" />
 
         <ImageView
+            android:layout_marginLeft="@dimen/platform_dp_35"
             android:id="@+id/login_qq"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"