同步前提交，安卓自动切换线路

lua_probject/base_project/Game/View/LoginView.lua

@@ -50,46 +50,8 @@ function M:init()
             iOSWXLoginErrorView.new()
             return
         end
-        GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex))
-        ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
-        coroutine.start(function()
-            coroutine.wait(8)
-            if self.isWXCallBackMark then
-                return
-            end
-            ViewUtil.CloseModalWait()
-            ViewUtil.ErrorTip(10000, "微信登录失败！")
-            if GetPlatform() == "iOS" then
-                view:GetController('wx').selectedIndex = 0
-                view:GetChild('btn_ShowLine').visible = false
-            end
-            iOSWXLoginErrorView.new()
-        end)
-        if (not GameApplication.Instance.accountTest) then
-            GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack))
-        else
-            --local ctr_user = view:GetController("user")
 
-            local _tex_unionid = view:GetChild("tex_unionid")
+        self:CallWxLogin()
-
-            local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1)
-
-            local _data = {}
-            _data["userId"] = utez
-            local key = "userId"
-            local s, e = pcall(function()
-                Utils.SaveLocalFile(key, json.encode(_data))
-            end)
-            if not s then
-                print("Error:" .. e)
-            end
-            DataManager.SelfUser.acc = utez
-            -- DataManager.SelfUser.acc = utez
-            DataManager.SelfUser.nick_name = utez
-            DataManager.SelfUser.sex = 1
-            DataManager.SelfUser.head_url = ""
-            self:LoginCallBack(0)
-        end
 
         --  end
         -- end)
@@ -288,10 +250,10 @@ function M:QuickLogin()
 end
 
 function M:LoginCallBack(result, data)
-    self.isWXCallBackMark = true
+    -- self.isWXCallBackMark = true
-    --print("微信登录返回================================================================")
+    -- print("微信登录返回================================================================")
-    --print("result===>"..result)
+    -- print("result===>" .. result)
-    --pt(data)
+    -- pt(data)
     if (not result) or result ~= 0 then
         if result == 10 then
             ViewUtil.ShowModalWait(true, nil, 2)
@@ -300,7 +262,8 @@ function M:LoginCallBack(result, data)
         ViewUtil.CloseModalWait()
         return
     end
-
+    ViewUtil.CloseModalWait()
+    PlayerPrefs.SetString("chooseLine", self._chooseIndex - 1)
     if data then
         local jd = json.decode(data)
         pt(jd)
@@ -358,3 +321,56 @@ function M:ReplaceClip1(e, t, i, n)
     t.url = string.format("%s%03d", n, i)
     return i + 6
 end
+
+function M:CallWxLogin(index)
+    local index = index or 0
+    local view = self._view
+
+    GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex))
+    ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
+    coroutine.start(function()
+        coroutine.wait(3)
+        if self.isWXCallBackMark then
+            return
+        end
+        if GetPlatform() == "iOS" then
+            ViewUtil.CloseModalWait()
+            ViewUtil.ErrorTip(10000, "微信登录失败！")
+            view:GetController('wx').selectedIndex = 0
+            view:GetChild('btn_ShowLine').visible = false
+        else
+            if index > 8 then
+                ViewUtil.CloseModalWait()
+                ViewUtil.ErrorTip(10000, "微信登录失败！")
+                iOSWXLoginErrorView.new()
+            else
+                self._chooseIndex = self._chooseIndex % 8 + 1
+                self._view:GetChild('list_show').selectedIndex = self._chooseIndex - 1
+                self:CallWxLogin(index + 1)
+            end
+        end
+    end)
+    if (not GameApplication.Instance.accountTest) then
+        GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack))
+    else
+        local _tex_unionid = view:GetChild("tex_unionid")
+
+        local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1)
+
+        local _data = {}
+        _data["userId"] = utez
+        local key = "userId"
+        local s, e = pcall(function()
+            Utils.SaveLocalFile(key, json.encode(_data))
+        end)
+        if not s then
+            print("Error:" .. e)
+        end
+        DataManager.SelfUser.acc = utez
+        -- DataManager.SelfUser.acc = utez
+        DataManager.SelfUser.nick_name = utez
+        DataManager.SelfUser.sex = 1
+        DataManager.SelfUser.head_url = ""
+        self:LoginCallBack(0)
+    end
+end