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

调整后提交

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-04-20 18:22:54 +08:00
1 parent a2de06fede
commit affc775226
100 files changed
+6319 -2125
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
+126 -23
View File
@@ -90,7 +90,7 @@ public class RowerHomeScript : PFUIPanel
Transform left, bottom, mid;
float timer = 1.0f;
List<DoubleVector2> pullList = new List<DoubleVector2>();
public Dictionary<object, Sprite> spriteDict;
public Dictionary<object, Sprite> spriteDict,spriteDict2;
List<string> records;
List<TempRowerCalc> values;
DateTime startTime,createTime;
@@ -136,6 +136,24 @@ public class RowerHomeScript : PFUIPanel
{13,Resources.Load<Sprite>("Images/Rower/序列帧/划船机0014") },
{14,Resources.Load<Sprite>("Images/Rower/序列帧/划船机0015") },
};
spriteDict2 = new Dictionary<object, Sprite>()
{
{0,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0001") },
{1,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0002") },
{2,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0003") },
{3,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0004") },
{4,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0005") },
{5,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0006") },
{6,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0007") },
{7,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0008") },
{8,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0009") },
{9,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0010") },
{10,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0011") },
{11,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0012") },
{12,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0013") },
{13,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0014") },
{14,Resources.Load<Sprite>("Images/RowerNew/序列帧/划船机0015") },
};
GetComponent<RectTransform>().localScale = Vector3.one;
GetComponent<RectTransform>().localPosition = Vector3.zero;
@@ -189,7 +207,9 @@ public class RowerHomeScript : PFUIPanel
var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
var c1 = new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_create_44"), () =>
{
//UIManager.ShowRowerWelldone("33171855-66FC-4121-935C-0F4DA98E5BB2");
//UIManager.ShowRowerWelldone("33171855-66FC-4121-935C-0F4DA98E5BB2", Init);
//return;
//UIManager.ShowRowerWelldone("2B6E8414-AF47-4B49-99E9-A89B83C65305", Init);
//return;
if (checkRowing()) return;
if (C2RowerData.IsEnabled == true && C2RowerData.rowerType != null) return;
@@ -242,13 +262,27 @@ public class RowerHomeScript : PFUIPanel
//RowerPanel/Rower/Bottom/Expected/Title
//var dw = rowerType.type == 1 ? $"{rowerType.value}M" : $"{(rowerType.value / 60).ToString("#0.00")}Min";
//bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST\n/ {dw}";
var dw = rowerType.type == 1 ? $"" : $"\nM";
var dw = "";
if (rowerType.type == 0)
{
dw = $"\nM/ 30Min";
}
else if (rowerType.type == 2)
{
dw = $"\nM";
}
bottom.Find("Expected/Title").GetComponent<Text>().text = $"{App.GetLocalString("EST")}{dw}";
}
}
private void Discard()
{
if (Application.internetReachability == NetworkReachability.NotReachable)
{
transform.Find("Stopped").gameObject.SetActive(true);
Utils.showToast(null, App.GetLocalString("Please check the network status!"));
return;
}
transform.Find("Stopped").gameObject.SetActive(false);
openTimer = false;
isPause = true;
@@ -268,10 +302,19 @@ public class RowerHomeScript : PFUIPanel
{
Rower.Reset();
}
reRowData = null;
//RowerPanel/Rower/Bottom/Expected/Title
//var dw = rowerType.type == 1 ? $"{rowerType.value}M" : $"{(rowerType.value / 60).ToString("#0.00")}Min";
//bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST\n/ {dw}";
var dw = rowerType.type == 1 ? $"" : $"\nM";
var dw = "";
if (rowerType.type == 0)
{
dw = $"\nM/ 30Min";
}
else if (rowerType.type == 2)
{
dw = $"\nM";
}
bottom.Find("Expected/Title").GetComponent<Text>().text = $"{App.GetLocalString("EST")}{dw}";
Init();
//Utils.showToast(null, "请滑动划船机并开始", isLowest: true, type: 1);
@@ -319,8 +362,16 @@ public class RowerHomeScript : PFUIPanel
//Utils.showToast()
Action f = () =>
{
Save();
Init();
reRowData = null;
if (tempRecordData == null)
{
if (Save()) Init();
}
else
{
if (SaveFunc(tempRecordData.model, tempRecordData.files)) Init();
}
};
if (C2RowerData.IsEnabled == true)
{
@@ -398,6 +449,10 @@ public class RowerHomeScript : PFUIPanel
private void StartFunc()
{
if (transform.parent.parent.Find("ModalPanel/RowerWelldone(Clone)") && transform.parent.parent.Find("ModalPanel/RowerWelldone(Clone)").gameObject.activeInHierarchy)
{
return;
}
//设定一个标准 如果满足条件不让他开始
if (C2RowerData.IsEnabled && RowerData != null && RowerData.ElapsedTime >= 5)
{
@@ -415,11 +470,46 @@ public class RowerHomeScript : PFUIPanel
timer = 1.0f;
}
transform.Find("Ready").gameObject.SetActive(false);
//if (UIManager.Instance.RowerWelldone)
//{
// UIManager.Instance.RowerWelldone.CloseModal();
//}
btnStart.GetComponent<Image>().sprite = spriteDict["Untagged"];
btnStart.tag = "Untagged";
}
private void Save()
private bool SaveFunc(RowerRecordModel model, List<string> files)
{
if (Application.internetReachability == NetworkReachability.NotReachable)
{
transform.Find("Stopped").gameObject.SetActive(true);
Utils.showToast(null, App.GetLocalString("Please check the network status!"));
tempRecordData = new TempRecordData(model, files);
return false;
}
var res = ConfigHelper.rowerApi.Add(model, files);
if (res.result)
{
UIManager.ShowRowerWelldone(model.Id, Init);
}
else
{
Utils.showToast(null, res.errMsg);
}
tempRecordData = null;
return true;
}
public class TempRecordData
{
public RowerRecordModel model;
public List<string> files;
public TempRecordData(RowerRecordModel model, List<string> files)
{
this.model = model;
this.files = files;
}
}
TempRecordData tempRecordData;
private bool Save()
{
createTime = UIManager.Now.GetDateTime();
var bleDevice = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected || d.State == DeviceState.Connecting) && d.Sensor == SensorType.Rower) as BleDevice;
@@ -482,20 +572,13 @@ public class RowerHomeScript : PFUIPanel
Helper.DelectDir(path);
Debug.Log(ex.Message);
}
var res = ConfigHelper.rowerApi.Add(model, files);
if (res.result)
{
UIManager.ShowRowerWelldone(model.Id);
}
else
{
Utils.showToast(null, res.errMsg);
}
return SaveFunc(model, files);
//Disconnect();
}
private void Init()
{
print("初始化");
if (RowerData != null)
{
RowerData.Reset();
@@ -536,9 +619,7 @@ public class RowerHomeScript : PFUIPanel
}
mid.Find("W/Value").GetComponent<Text>().text = "---";
//bottom.Find("W/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("500/Value").GetComponent<Text>().text = "---";
//bottom.Find("500/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("MS/Value").GetComponent<Text>().text = "---";
//bottom.Find("MS/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("BPM/Value").GetComponent<Text>().text = "---";
@@ -674,11 +755,8 @@ public class RowerHomeScript : PFUIPanel
bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(++seconds).ToPFString();
}
mid.Find("W/Value").GetComponent<Text>().text = "---";
//bottom.Find("W/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("500/Value").GetComponent<Text>().text = "---";
//bottom.Find("500/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("MS/Value").GetComponent<Text>().text = "---";
//bottom.Find("MS/AvgValue").GetComponent<Text>().text = "---";
bottom.Find("Expected/Value").GetComponent<Text>().text = "---";
records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},0,0,0,{RowerData.ResistanceLevel},{heartRate},{energy}");
tmpdata = new TempRowerCalc() { strokeCount = strokeCount, pace = 0, power = 0, rate = 0, heartRate = heartRate, distance = distance, energy = energy };
@@ -879,7 +957,7 @@ public class RowerHomeScript : PFUIPanel
// x += 0.1f;
//}
}
float staticTimer = 1f;
float staticTimer = 1f,shortTimer = 0.1f;
void Update()
{
if (openTimer)
@@ -898,6 +976,31 @@ public class RowerHomeScript : PFUIPanel
HandleStatic();
staticTimer += 1f;
}
shortTimer -= Time.deltaTime;
if (shortTimer <= 0)
{
if (openTimer)
{
ShortUpdateData();
}
shortTimer += 0.1f;
}
}
void ShortUpdateData()
{
if (RowerData == null) return;
var power = RowerData.InstantaneousPower;
var rate = RowerData.StrokeRate;
var pace = RowerData.InstantaneousPace;
if (stopSeconds >= 2)
{
return;
}
mid.Find("W/Value").GetComponent<Text>().text = power.ToString();
bottom.Find("500/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(pace).ToPFString();
bottom.Find("MS/Value").GetComponent<Text>().text = rate.ToString();
}
void HandleStatic()
{