Просмотр исходного кода

屏蔽教学链接跳转、登出要断开蓝牙、注册时自动发起定位

lvjincheng 3 лет назад
Родитель
Сommit
837715f164

+ 8 - 0
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginMgr.cs

@@ -46,6 +46,14 @@ public class LoginMgr : MonoBehaviour
         transform.Find("AgreementPopup").gameObject.SetActive(true);
         ViewMgr.Instance.DestroyAllViews();
     }
+
+    void Start()
+    {
+        //退出到登录界面,也要把蓝牙断开
+        if (BluetoothAim.ins && BluetoothAim.ins.status == BluetoothStatusEnum.ConnectSuccess) {
+            BluetoothAim.ins.DoConnect();
+        }
+    }
 }
 public class UserInfo
 {

+ 26 - 15
Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs

@@ -67,7 +67,9 @@ public class RegisterView : MonoBehaviour
         registerInBirthday.SetActive(isNext);
         registerInLocation.SetActive(isNext);
         btnSave.SetActive(isNext);
-        if (!isNext) {
+        if (isNext) {
+            GetLocation();
+        } else {
             ChnageCaptcha();
         }
     }
@@ -204,20 +206,29 @@ public class RegisterView : MonoBehaviour
             // };
 
             //2022-12-6 gps获取地理位置
-            System.Action eOnAgree = () => {
-                GPSTool.GetAddress((address) => {
-                    if (address != null) {
-                        countryCode = address[0];
-                        stateCode = address[1];
-                        cityCode = address[2];
-                        GetInputField(registerInLocation).text = 
-                            countryCode + " " + 
-                            stateCode + " " + 
-                            cityCode;
-                    }
-                });
-            };
-            if (!HomeView.ShowProminentBeforeConnectBLE(eOnAgree)) eOnAgree.Invoke();
+            GetLocation();
+        }
+
+        void GetLocation()
+        {
+            try
+            {
+                System.Action eOnAgree = () => {
+                    GPSTool.GetAddress((address) => {
+                        if (address != null) {
+                            countryCode = address[0];
+                            stateCode = address[1];
+                            cityCode = address[2];
+                            GetInputField(registerInLocation).text = 
+                                countryCode + " " + 
+                                stateCode + " " + 
+                                cityCode;
+                        }
+                    });
+                };
+                if (!HomeView.ShowProminentBeforeConnectBLE(eOnAgree)) eOnAgree.Invoke();
+            }
+            catch (System.Exception e) { Debug.LogError(e); }
         }
     #endregion
 }

+ 64 - 13
Assets/BowArrow/Scripts/View/Home/CourseView.cs

@@ -9,18 +9,7 @@ public class CourseView : JCUnityLib.ViewBase, MenuBackInterface
     [SerializeField] GameObject scrollViewContentItem;
 
     string[] videoUrls = {
-        "新手教程-无连接",
-        "https://www.bilibili.com/video/BV1WW41167iT?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1hW411U7hF?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1hW411U7Vk?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1YW411U7gY?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1ZW41117X4?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1Yt411R7ki?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1Yt411R71r?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1Wb411P7Qe?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1Bt411U74h?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1ut411272K?spm_id_from=333.999.0.0",
-        "https://www.bilibili.com/video/BV1it411Q7Ky?spm_id_from=333.999.0.0"
+        "新手教程-无连接"
     };
 
     public void Awake() {
@@ -40,7 +29,6 @@ public class CourseView : JCUnityLib.ViewBase, MenuBackInterface
                     NewUserGuiderManager.ins.ReviewNewUserGuide();
                     return;
                 }
-                Application.OpenURL(videoUrls[id - 1]);
             });
             icon.gameObject.SetActive(true);
             item.SetActive(true);
@@ -66,3 +54,66 @@ public class CourseView : JCUnityLib.ViewBase, MenuBackInterface
         return true;
     }
 }
+// public class CourseView : JCUnityLib.ViewBase, MenuBackInterface
+// {
+//     [SerializeField] GameObject scrollViewContent;
+//     [SerializeField] GameObject scrollViewContentItem;
+
+//     string[] videoUrls = {
+//         "新手教程-无连接",
+//         "https://www.bilibili.com/video/BV1WW41167iT?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1hW411U7hF?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1hW411U7Vk?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1YW411U7gY?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1ZW41117X4?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1Yt411R7ki?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1Yt411R71r?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1Wb411P7Qe?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1Bt411U74h?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1ut411272K?spm_id_from=333.999.0.0",
+//         "https://www.bilibili.com/video/BV1it411Q7Ky?spm_id_from=333.999.0.0"
+//     };
+
+//     public void Awake() {
+//         scrollViewContentItem.transform.Find("Icon").gameObject.SetActive(false);
+//         scrollViewContentItem.transform.Find("Icon-1").gameObject.SetActive(false);
+//         scrollViewContentItem.SetActive(false);
+//         for (int i = 1; i <= videoUrls.Length; i++)
+//         {
+//             int id = i;
+//             string title = TextAutoLanguage2.GetTextByKey("course_title_" + (id - 1));
+//             GameObject item = Instantiate<GameObject>(scrollViewContentItem, scrollViewContent.transform);
+//             item.GetComponent<Text>().text = id + "、" + title;
+//             Transform icon = item.transform.Find(id == 1 ? "Icon-1" : "Icon");
+//             icon.GetComponent<Button>().onClick.AddListener(delegate() {
+//                 AudioMgr.ins.PlayBtn();
+//                 if (id == 1) {
+//                     NewUserGuiderManager.ins.ReviewNewUserGuide();
+//                     return;
+//                 }
+//                 Application.OpenURL(videoUrls[id - 1]);
+//             });
+//             icon.gameObject.SetActive(true);
+//             item.SetActive(true);
+//         }
+//     }
+
+//     void Start()
+//     {
+//         PersistenHandler.ins?.menuBackCtr.views.Add(this);
+//     }
+//     void OnDestroy()
+//     {
+//         PersistenHandler.ins?.menuBackCtr.views.Remove(this);
+//     }
+
+//     public void back() {
+//         AudioMgr.ins.PlayBtn();
+//         ViewMgr.Instance.DestroyView<CourseView>();
+//     }
+
+//     public bool OnMenuBack() {
+//         ViewMgr.Instance.DestroyView<CourseView>();
+//         return true;
+//     }
+// }