接动态地图,忘记密码,文件弹窗置顶

This commit is contained in:
Caiyanpeng committed 2021-04-27 14:58:49 +08:00
1 parent 2b275d6dc5
commit 1002b0433a
206 files changed
+13484 -2849

No files matched your search

+188 -152
View File
@@ -13,6 +13,7 @@ using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using UnityEngine;
@@ -109,30 +110,11 @@ public class LoginController : MonoBehaviour
void Start()
{
App.FromLogin = true;
GetRotateImage();
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
userInfos = UIManager.Instance.userInfos;
//userInfos.RemoveAt(0);
//PlayerPrefs.SetString("UserInfos", "");
//transform.Find("RawImage").DOMove(new Vector3(0.5f,0.5f,0),1);
//if (loginForm.Length == 2 && loginForm[0] != null && loginForm[1] != null)
//{
// foreach (var ipt in loginForm)
// {
// UIManager.AddEvent(ipt.gameObject, EventTriggerType.PointerClick, new UnityAction<BaseEventData>
// ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
// UIManager.AddEvent(ipt.gameObject, EventTriggerType.Select, new UnityAction<BaseEventData>
// ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
// UIManager.AddEvent(ipt.gameObject, EventTriggerType.Deselect, new UnityAction<BaseEventData>
// ((BaseEventData arg0) => { OnLoginInputDeSelect(arg0, ipt.gameObject); }));
// }
// //loginForm[0].
//}
if (loading != null)
{
//loading.texture.wrapMode = TextureWrapMode.Mirror;
}
App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");
if (loginScrollView != null)
{
scrollPanel = loginScrollView.GetComponent<ScrollRect>();
@@ -149,6 +131,8 @@ public class LoginController : MonoBehaviour
signPage1 = content.Find("FirstPage");
UIManager.AddEvent(signPage1.Find("next").GetComponent<Button>().gameObject,
EventTriggerType.PointerClick, (b) => goRegNext());
UIManager.AddEvent(signPage1.Find("BtnModiPass").GetComponent<Button>().gameObject,
EventTriggerType.PointerClick, (b) => goResetPassword());
//signPage1.Find("next").GetComponent<Button>().onClick.AddListener(() => { goRegNext(); });
UIManager.AddEvent(signPage1.Find("Captcha").Find("BtnGet").gameObject,
EventTriggerType.PointerClick,(b)=> GetCaptcha());
@@ -267,6 +251,7 @@ public class LoginController : MonoBehaviour
gou.gameObject.SetActive(true);
}
});
UIManager.AddEvent(loginContainer.Find("ForgetPassword").gameObject, EventTriggerType.PointerClick, (e) =>goSign(type:1));
var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
UIManager.AddEvent(wechatLogin.gameObject, EventTriggerType.PointerClick, (b) =>
{
@@ -282,10 +267,7 @@ public class LoginController : MonoBehaviour
//wx1.GetComponent<CanvasGroup>().DOFade(1, 0.8f).onComplete = () => { wxLock = false; };
wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
});
//wechatLogin.onClick.AddListener(() =>
//{
//});
var login = loginContainer.Find("login").GetComponent<Button>();
UIManager.AddEvent(login.gameObject, EventTriggerType.PointerClick, (b) => Submit());
//login.onClick.AddListener(Submit);
@@ -450,6 +432,43 @@ public class LoginController : MonoBehaviour
};
avatar = Resources.Load<Texture>("Images/New Account");
}
async void GetRotateImage()
{
if (!App.TextureCache.ContainsKey("rotateImage"))
{
var locationInfo = await ConfigHelper.thirdPartApi.GetLocationInfo();
App.latitude = locationInfo.latitude;
App.longitude = locationInfo.longitude;
//if (locationInfo.status == 0)
//{
// Debug.Log(locationInfo.address);
// Utils.DownloadImageToLocal(StartCoroutine,
// $"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.content.point.x},{locationInfo.content.point.y},12.14,0/1280x1280?access_token=pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA",
// "rotateImage");
//}
//else
//{
// Debug.Log(locationInfo.message);
//}
Debug.Log(JsonConvert.SerializeObject(locationInfo));
var i = await ConfigHelper.thirdPartApi.GetMapImage(locationInfo);
var t = new Texture2D(2, 2);
if (t.LoadImage(Utils.StreamToBytes(i)))
{
Debug.Log("成功");
App.TextureCache["rotateImage"] = t;
Utils.WriteTextureToPlayerPrefs("rotateImage", t);
}
//Debug.Log(locationInfo.country);
//Utils.DownloadImageToLocal(StartCoroutine,
//$"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA",
//"rotateImage");
}
}
/// <summary>
/// 执行js 修改微信登录页样式
/// </summary>
private void AdjustWxQrCode()
{
wxBrowser.EvalJS(@"
@@ -551,8 +570,7 @@ public class LoginController : MonoBehaviour
{
}
//用于倒计时获取验证码
#region 倒计时获取验证码
int time = 0;
float timer = 0f;
bool startCaptcha = false;
@@ -586,37 +604,8 @@ public class LoginController : MonoBehaviour
Utils.showToast(gameObject, r.errMsg);
}
}
void HidePassword()
{
signPage1.Find("Password").gameObject.SetActive(false);
signPage1.Find("CPassword").gameObject.SetActive(false);
UIManager.RemoveEvent(signPage1.Find("signThird").gameObject);
UIManager.AddEvent(signPage1.Find("signThird").gameObject, EventTriggerType.PointerClick, (b) =>
{
goRegNextWithoutPass();
});
//signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
//signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(goRegNextWithoutPass);
}
void ShowPassword()
{
signForm.email.text = "";
signForm.password.text = "";
signForm.captcha.text = "";
signForm.cpassword.text = "";
signPage1.Find("Password").gameObject.SetActive(true);
signPage1.Find("CPassword").gameObject.SetActive(true);
UIManager.RemoveEvent(signPage1.Find("signThird").gameObject);
UIManager.AddEvent(signPage1.Find("signThird").gameObject, EventTriggerType.PointerClick, (b) =>
{
goRegNext(1);
});
//signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
//signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { ; });
}
#endregion
void CaptchaTimerTick()
{
timer -= Time.deltaTime;
@@ -637,22 +626,6 @@ public class LoginController : MonoBehaviour
}
}
private void OnLoginInputDeSelect(BaseEventData arg0, GameObject game)
{
var image = game.transform.GetComponent<Image>();
image.sprite = Resources.Load<Sprite>("Images/gl-no");
//var rect = game.transform.GetComponent<RectTransform>();
//rect.SetSiblingIndex(rect.childCount-1);
}
private void OnLoginInputSelect(BaseEventData arg0, GameObject game)
{
var image = game.transform.GetComponent<Image>();
image.sprite = Resources.Load<Sprite>("Images/gl");
//var rect = game.transform.GetComponent<RectTransform>();
//rect.SetSiblingIndex(0);
}
private void goRegPrev()
{
signForm.email.text = "";
@@ -728,6 +701,31 @@ public class LoginController : MonoBehaviour
Utils.showToast(gameObject, r.errMsg);
}
}
/// <summary>
/// 重置密码逻辑
/// </summary>
async void goResetPassword()
{
var Email = signForm.email;
var Captcha = signForm.captcha;
var Password = signForm.password;
var CPassword = signForm.cpassword;
if (Password.text != CPassword.text)
{
Utils.showToast(gameObject, "两次密码输入不一致");
return;
}
var r = await ConfigHelper.userApi.ResetPassword(Email.text, Captcha.text, Password.text);
if (r.result)
{
Utils.showToast(gameObject, "修改成功",type:1);
goLoginReturn2();
}
else
{
Utils.showToast(gameObject, r.errMsg);
}
}
void RefreshWx3(UserResultModel data)
{
Utils.DisplayImage(StartCoroutine,
@@ -736,6 +734,9 @@ public class LoginController : MonoBehaviour
wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
userResult = data;
}
/// <summary>
/// 去最后一页准备进入主场景
/// </summary>
async void goRegEnd()
{
if (!await UpdateInfo()) return;
@@ -749,6 +750,9 @@ public class LoginController : MonoBehaviour
}
//throw new NotImplementedException();
}
/// <summary>
/// 加载信息
/// </summary>
void LoadInfo()
{
var _days = signForm.days.GetComponent<PFUIDropdown>();
@@ -772,6 +776,10 @@ public class LoginController : MonoBehaviour
_weight.Text = userResult.Weight.ToString();
_height.Text = userResult.Height.ToString();
}
/// <summary>
/// 注册页2 修改信息
/// </summary>
/// <returns></returns>
async Task<bool> UpdateInfo()
{
if (userResult == null) return false;
@@ -789,11 +797,12 @@ public class LoginController : MonoBehaviour
}
else
{
var errorList = new List<object>();
errorList.Add(new { Field="Years", ErrMsg="" });
errorList.Add(new { Field = "Months", ErrMsg = "" });
errorList.Add(new { Field = "Days", ErrMsg = "" });
Utils.SetValidate(signFormDict, JArray.FromObject(errorList));
Utils.SetValidate(signFormDict, JArray.FromObject(new object[]
{
new { Field = "Years", ErrMsg = "" },
new { Field = "Months", ErrMsg = "" },
new { Field = "Days", ErrMsg = "" }
}));
Utils.showToast(gameObject, "请选择生日");
return false;
}
@@ -810,6 +819,9 @@ public class LoginController : MonoBehaviour
return r.result;
//userResult.Birthday.v
}
/// <summary>
/// 微信2/注册返回登录
/// </summary>
private void goLoginReturn2()
{
if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false);
@@ -819,6 +831,23 @@ public class LoginController : MonoBehaviour
this.StartScrollPanel(1);
}
/// <summary>
/// 立刻跳到登录页并且返回按钮强行失效
/// </summary>
private void goLoginImmediately()
{
imagedf.localPosition = new Vector3(-580, -34, 0);
imagexf.localPosition = new Vector3(0, -669, 0);
LoginBg.localPosition = Vector3.zero;
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
var scrollValue = 1f / (pageNums - 1);
var value = 1 * scrollValue;
scrollPanel.horizontalNormalizedPosition = value;
loginContainer.Find("returnQuick").GetComponent<Button>().gameObject.SetActive(false);
}
/// <summary>
/// 返回快速登录页
/// </summary>
void ReturnQuick()
{
if (imagexf != null)
@@ -836,6 +865,10 @@ public class LoginController : MonoBehaviour
}
this.StartScrollPanel(0);
}
/// <summary>
/// 去登录页
/// </summary>
/// <param name="noReturn"></param>
public void goLogin(bool noReturn = false)
{
if (imagexf != null)
@@ -853,33 +886,56 @@ public class LoginController : MonoBehaviour
}
//DOTween.To(() => o, x => o = x, t, 0.3f);
this.StartScrollPanel(1);
if (noReturn)
if (noReturn)
{
loginContainer.Find("returnQuick").GetComponent<Button>().gameObject.SetActive(false);
}
}
/// <summary>
/// 立刻跳到登录页并且返回按钮强行失效
/// </summary>
private void goLoginImmediately()
void HidePassword()
{
imagedf.localPosition = new Vector3(-580, -34, 0);
imagexf.localPosition = new Vector3(0, -669, 0);
LoginBg.localPosition = Vector3.zero;
LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
var scrollValue = 1f / (pageNums - 1);
var value = 1 * scrollValue;
scrollPanel.horizontalNormalizedPosition = value;
loginContainer.Find("returnQuick").GetComponent<Button>().gameObject.SetActive(false);
signPage1.Find("Password").gameObject.SetActive(false);
signPage1.Find("CPassword").gameObject.SetActive(false);
UIManager.RemoveEvent(signPage1.Find("signThird").gameObject);
UIManager.AddEvent(signPage1.Find("signThird").gameObject, EventTriggerType.PointerClick, (b) =>
{
goRegNextWithoutPass();
});
//signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
//signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(goRegNextWithoutPass);
}
void goSign(bool isAccount = true)
void ShowPassword()
{
signForm.email.text = "";
signForm.password.text = "";
signForm.captcha.text = "";
signForm.cpassword.text = "";
signPage1.Find("Password").gameObject.SetActive(true);
signPage1.Find("CPassword").gameObject.SetActive(true);
UIManager.RemoveEvent(signPage1.Find("signThird").gameObject);
UIManager.AddEvent(signPage1.Find("signThird").gameObject, EventTriggerType.PointerClick, (b) =>
{
goRegNext(1);
});
//signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
//signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { ; });
}
/// <summary>
///
/// </summary>
/// <param name="isAccount"></param>
/// <param name="type">0 注册 1 忘记密码</param>
void goSign(bool isAccount = true,int type = 0)
{
if (!isAccount)
{
pageNums = 5;
//wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(false);
signPage1.Find("BtnModiPass").gameObject.SetActive(false);
signPage1.Find("previousThird").gameObject.SetActive(true);
signPage1.Find("signThird").gameObject.SetActive(true);
ShowPassword();
@@ -888,17 +944,38 @@ public class LoginController : MonoBehaviour
}
else
{
pageNums = 4;
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(true);
signPage1.Find("previousThird").gameObject.SetActive(false);
signPage1.Find("signThird").gameObject.SetActive(false);
ShowPassword();
this.StartScrollPanel(2);
this.StartScrollSign(0);
if (type == 0)
{
pageNums = 4;
signContainer.Find("signText").GetComponent<Text>().text = "SIGN UP";
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(true);
signPage1.Find("BtnModiPass").gameObject.SetActive(false);
signPage1.Find("previousThird").gameObject.SetActive(false);
signPage1.Find("signThird").gameObject.SetActive(false);
ShowPassword();
this.StartScrollPanel(2);
this.StartScrollSign(0);
}
else
{
pageNums = 4;
signContainer.Find("signText").GetComponent<Text>().text = "RESET PASSWORD";
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(false);
signPage1.Find("BtnModiPass").gameObject.SetActive(true);
signPage1.Find("previousThird").gameObject.SetActive(false);
signPage1.Find("signThird").gameObject.SetActive(false);
ShowPassword();
this.StartScrollPanel(2);
this.StartScrollSign(0);
}
}
}
/// <summary>
/// 登录/注册完成,去首页
/// </summary>
/// <param name="gou"></param>
void goMain(Transform gou)
{
var data = userResult;
@@ -920,19 +997,12 @@ public class LoginController : MonoBehaviour
UIManager.Instance.userInfoIndex = 0;
}
App.CurrentUser = data;
//App.CurrentUser = new UserModel
//{
// NickName = data.Nickname,
// Ftp = data.FTP,
// Weight = data.Weight,
// BicycleWeight = data.BicycleWeight,
// Carlories = "",
// Avatar = data.WxHeadImg,
// Distance = 0,
// Climb = "",
//};
SceneManager.LoadScene("MainScene");
}
/// <summary>
/// 缓存打钩的用户信息
/// </summary>
/// <param name="data"></param>
public void SaveInfo(UserResultModel data)
{
var index = userInfos.FindIndex(x => x.Id == data.Id);
@@ -967,23 +1037,12 @@ public class LoginController : MonoBehaviour
}
UIManager.Instance.userInfos = userInfos;
UIManager.Instance.userInfoIndex = index;
//PlayerPrefs.SetInt("UserInfoIndex", index);
}
/// <summary>
/// 登录提交
/// </summary>
async void Submit()
{
//if (loginForm.email == null || loginForm.password == null)
//{
// Utils.showToast(gameObject, "未绑定", 1);
// return;
//}
//if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
//{
// Utils.showToast(gameObject, "请输入信息", 1);
// return;
//}
//var res = await Global.userApi.Login(phone.text, pwd.text, "");
//测试用
var res = await ConfigHelper.userApi.LoginV1(loginForm.email.text, loginForm.password.text, "");
//var res = await NoAuthApi.Login(phone.text, pwd.text);
if (res.result)
@@ -1022,16 +1081,6 @@ public class LoginController : MonoBehaviour
}
goScrollPanel();
goScrollSign();
//if (Input.GetKeyDown(KeyCode.Return) && )
//{
//}
//if (Input.GetKeyDown(KeyCode.Return)) {
// Debug.Log("回车键");
// if (pwd.isFocused)
// {
// this.Submit();
// }
//}
}
#region 主页面滑动逻辑
@@ -1074,20 +1123,7 @@ public class LoginController : MonoBehaviour
}
}
#endregion
private void Test()
{
//if (startScrollPanel) return;
//scrollPanelIndex = ((int)System.Math.Pow(tmpImdex, 3)
// + 2*(int)System.Math.Pow(tmpImdex, 2)
// + 1) % 4;
//tmpImdex++;
//Debug.Log(scrollPanelIndex);
//startScrollPanel = true;
if (startScrollSign) return;
scrollSignIndex = (scrollSignIndex + 1) % 2;
Debug.Log(scrollSignIndex);
startScrollSign = true;
}
#region 注册页面滑动逻辑
private bool startScrollSign = false;
private int scrollSignIndex = 0;