lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注销用户两步+删除用户线路

Browse Source
This commit is contained in:
Caiyanpeng authored and lishuo committed 2022-07-18 17:14:29 +08:00
1 parent 5b39dd985b
commit 99e916905d
17 files changed
+976 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/MapApi.cs
+7 -1
View File
@@ -237,7 +237,11 @@ namespace Assets.Scripts.Apis
return result;
}
public async Task<JsonResult<object>> DeleteRoute(int id)
{
var result = await PostAsync<JsonResult<object>>($"Map/DeleteRoute", new { id });
return result;
}
public async Task<JsonResult<List<MapRouteAreaItem>>> GetRecommendAreaList()
{
var result = await GetAsync<JsonResult<List<MapRouteAreaItem>>>($"MapRouteArea/GetRecommendAreaList");
@@ -248,6 +252,8 @@ namespace Assets.Scripts.Apis
var result = await GetAsync<JsonResult<List<Recommand>>>($"Recommand/GetList?pageIndex={pageIndex}&pageSize={pageSize}");
return result;
}
public async Task<JsonResult<List<MapRouteAreaItem>>> GetMemberMapRouteAreaList(int pageIndex, int pageSize)
{
var result = await GetAsync<JsonResult<List<MapRouteAreaItem>>>($"MapRouteArea/GetMemberMapRouteAreaList?pageIndex={pageIndex}&pageSize={pageSize}");
Assets/Scripts/Apis/UserApi.cs
+8 -3
View File
@@ -84,10 +84,15 @@ namespace Assets.Scripts.Apis
return new JsonResult<UserResultModel>() { result = false, data = null, errMsg = ret.errMsg };
}
}
public async Task<JsonResult<object>> DeleteAccount(string pwd)
/// <summary>
///
/// </summary>
/// <param name="pwd"></param>
/// <param name="isFirst">false直接删除 true仅判断</param>
/// <returns></returns>
public async Task<JsonResult<object>> DeleteAccount(string pwd,bool isFirst)
{
return await PostAsync<JsonResult<object>>("User/DeleteAccount", new { pwd });
return await PostAsync<JsonResult<object>>("User/DeleteAccount", new { pwd,isFirst });
}
public async Task<JsonResult<object>> AppleCompleteInfo(string phone, string Captcha, string pwd)
Assets/Scripts/App.cs
+3
View File
@@ -194,6 +194,9 @@ public static class App
}
}
}
public static bool isUploadDeleteMode { get; set; } = false;
public static bool CanOpenAd = false;
public static Dictionary<string, string> websiteDict = new Dictionary<string, string>()
Assets/Scripts/UI/Prefab/Login/DeleteAccount.cs
+18 -4
View File
@@ -7,9 +7,10 @@ using UnityEngine.SceneManagement;
public class DeleteAccount : PFUIPanel
{
PFUIInputField password;
protected override void Awake()
{
PFUIInputField password = transform.Find("Content/Password").GetComponent<PFUIInputField>();
password = transform.Find("Content/Password").GetComponent<PFUIInputField>();
UIManager.AddEvent(transform.Find("Content/Delete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
Delete(password.Text);
@@ -21,15 +22,28 @@ public class DeleteAccount : PFUIPanel
}
async void Delete(string pwd)
{
var res = await ConfigHelper.userApi.DeleteAccount(pwd);
var res = await ConfigHelper.userApi.DeleteAccount(pwd,true);
if (res.result)
{
UIManager.ShowConfirm(App.GetLocalString("Delete Your Account"), App.GetLocalString("Are you sure you want to delete the account?"), async () =>
{
var res1 = await ConfigHelper.userApi.DeleteAccount(pwd, false);
if (res1.result)
{
#if !(UNITY_ANDROID || UNITY_IOS)
SceneManager.LoadScene("Login");
#else
SceneManager.LoadScene("Login-Mobile");
SceneManager.LoadScene("Login-Mobile");
#endif
Close();
Close();
UIManager.CloseConfirm();
}
else
{
Utils.showToast(null, res1.errMsg);
}
});
}
else
{
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+54 -1
View File
@@ -46,13 +46,15 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
MapRoute map;
Dictionary<string, Texture> caches;
private MapRouteAreaItem area = null;
public void Initial(MapRoute myMap, Dictionary<string, Texture> caches, MapRouteAreaItem area = null)
private Action refresh = null;
public void Initial(MapRoute myMap, Dictionary<string, Texture> caches, MapRouteAreaItem area = null,Action refresh = null)
{
if (caches != null)
{
this.caches = caches;
}
this.area = area;
this.refresh = refresh;
map = myMap;
//localY = transform.GetComponent<RectTransform>().rect.height;
//Debug.Log(localY);
@@ -129,6 +131,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
{
transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
}
ChangeUploadImageMode();
#if !(UNITY_ANDROID || UNITY_IOS)
transform.Find("CollectImg").gameObject.SetActive(false);
#endif
@@ -176,6 +179,56 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
transform.Find("BtnReride").GetComponent<Button>().onClick.AddListener(Ride);
}
}
public void ChangeUploadImageMode()
{
if (App.CurrentRouteType != "My Upload")
{
return;
}
if (!App.isUploadDeleteMode)
{
if (!isModal)
{
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(ApplyOpenRoute);
}
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite = UIManager.Instance.uploadDict[map.IsEnabled];
if (App.CurrentRouteType == "My Upload")
{
transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
}
}
else
{
if (!isModal)
{
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(DeleteUploadRoute);
}
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/Delete");
if (App.CurrentRouteType == "My Upload")
{
transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(18, 20f);
}
}
}
private void DeleteUploadRoute()
{
UIManager.ShowConfirm(App.GetLocalString("Delete Your Route"), App.GetLocalString("Are you sure you want to delete this route?"), async () =>
{
var res = await ConfigHelper.mapApi.DeleteRoute(map.Id);
if (res.result)
{
refresh();
UIManager.CloseConfirm();
}
else
{
Utils.showToast(null, res.errMsg);
}
});
}
void ApplyOpenRoute()
{
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+50 -1
View File
@@ -57,6 +57,7 @@ public class MapListController : PFUIPanel
rect.localPosition = Vector3.zero;
}
private GameObject btnDelete;
protected override void Start()
{
#if (UNITY_ANDROID || UNITY_IOS)
@@ -129,6 +130,52 @@ public class MapListController : PFUIPanel
transform.Find("MainNav").GetComponent<MainNav>().ShowBack();
#endif
#if UNITY_ANDROID || UNITY_IOS
btnDelete = transform.Find("Upload/Delete").gameObject;
#else
btnDelete = topContainer.Find("Delete").gameObject;
#endif
UIManager.AddEvent(btnDelete, EventTriggerType.PointerClick, b =>
{
if (btnDelete.name == "Delete")
{
btnDelete.name = "DeleteFinish";
App.isUploadDeleteMode = true;
foreach (Transform map in content.transform)
{
if (map.GetComponent<MapItem>())
map.GetComponent<MapItem>().ChangeUploadImageMode();
}
#if UNITY_ANDROID || UNITY_IOS
btnDelete.GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/routedelete/ICON_done_44");
#else
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#f93086");
var image = btnDelete.transform.Find("Image");
image.GetComponent<RectTransform>().sizeDelta = new Vector2(24, 18);
image.GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/Done");
#endif
}
else
{
btnDelete.name = "Delete";
App.isUploadDeleteMode = false;
foreach (Transform map in content.transform)
{
if (map.GetComponent<MapItem>())
map.GetComponent<MapItem>().ChangeUploadImageMode();
}
#if UNITY_ANDROID || UNITY_IOS
btnDelete.GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/routedelete/ICON_delete_44");
#else
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#23232d");
var image = btnDelete.transform.Find("Image");
image.GetComponent<RectTransform>().sizeDelta = new Vector2(18, 20);
image.GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/Delete");
#endif
}
});
sort = "Near";
sortDire = "asc";
@@ -432,7 +479,7 @@ public class MapListController : PFUIPanel
foreach (var item in list)
{
var obj = Instantiate(map);
obj.GetComponent<MapItem>().Initial(item, caches);
obj.GetComponent<MapItem>().Initial(item, caches,null,Refresh);
//obj.SendMessage("Initial", );
obj.transform.SetParent(content.transform);
obj.transform.localScale = new Vector3(1, 1, 1);
@@ -519,6 +566,8 @@ public class MapListController : PFUIPanel
btnMapMode.SetActive(App.CurrentRouteType == "My Upload");
topContainer.Find("line2").gameObject.SetActive(App.CurrentRouteType == "All Route");
topContainer.Find("SearchInput").gameObject.SetActive(App.CurrentRouteType == "All Route");
topContainer.Find("line3").gameObject.SetActive(App.CurrentRouteType == "My Upload");
btnDelete.gameObject.SetActive(App.CurrentRouteType == "My Upload");
#else
transform.Find("Upload").gameObject.SetActive(App.CurrentRouteType == "My Upload");
#endif