Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -48,7 +48,7 @@ ext {
             "m-fm"            : "0.0.10",
             "m-muse"          : "0.0.6",
             "m-tests"         : "0.0.3",
-            "m-user"          : "0.0.23",
+            "m-user"          : "0.0.24",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.1",
             "m-confide-api"   : "0.0.1",

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

@@ -315,18 +315,17 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         setCountryIcon(countryCode)
 
 
-        if (isFromGuide) {0
+        if (isFromGuide) {
             img_reg_back.visibility = View.INVISIBLE
             img_reg_back.isEnabled = false
             tv_skip.visibility = View.VISIBLE
             tv_skip.text = "随便逛逛"
-
-            //根据来源不同为当前页面埋点
-            if (isFromGuide) {
-                ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_ONE_PAGE_VISIT,url =  "无url",api =  "无api",sign1 =  "")
-            }else {
-                ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position =  UserBIConstants.POSITION_LOGIN_TWO_PAGE_VISIT, url = "无url", api = "无api",sign1 =  "")
-            }
+        }
+        //根据来源不同为当前页面埋点
+        if (isFromGuide) {
+            ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_ONE_PAGE_VISIT,url =  "无url",api =  "无api",sign1 =  "")
+        }else {
+            ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position =  UserBIConstants.POSITION_LOGIN_TWO_PAGE_VISIT, url = "无url", api = "无api",sign1 =  "")
         }
     }