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

修改bug

Browse Source
This commit is contained in:
CaiYanPeng 2022-04-02 18:15:09 +08:00
parent 30e09c9c7a
commit 0a4925bb39
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Resources/UI/Prefab/Device/Mobile/ConnectDeviceModal.prefab
View File

@ -59,6 +59,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2a0878e6d65232b4eb49c2aa886ab9da, type: 3} m_Script: {fileID: 11500000, guid: 2a0878e6d65232b4eb49c2aa886ab9da, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
newNav: {fileID: 0}
--- !u!1 &2752224541465288006 --- !u!1 &2752224541465288006
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -411,7 +412,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Smart Trainer m_Text:
--- !u!114 &3003252341395391391 --- !u!114 &3003252341395391391
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

7
Assets/Scripts/App.cs
View File

@ -222,9 +222,8 @@ public static class App
{ {
InitLanguage(); InitLanguage();
#if !UNITY_EDITOR #if !UNITY_EDITOR
//测试服务器 //测试服务器 Host = "http://192.168.0.101:5083/";
//Host = "http://pf.juze.pro/"; Host = "http://pf.juze.pro/";
Host = "http://192.168.0.101:5083/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
//线上 //线上
@ -235,7 +234,7 @@ public static class App
//Host = "http://192.168.0.101:5087/"; //Host = "http://192.168.0.101:5087/";
//UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
//TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001); //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
//Debug.unityLogger.logEnabled = false; Debug.unityLogger.logEnabled = false;
#else #else
//Host = "http://pf.juze.pro/"; //Host = "http://pf.juze.pro/";
//Host = "http://192.168.0.101:5087/"; //Host = "http://192.168.0.101:5087/";

14
Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs
View File

@ -154,13 +154,13 @@ namespace Assets.Scripts.Devices.Ble.Devices
{ {
if (C2RowerData.IsEnabled == true) if (C2RowerData.IsEnabled == true)
{ {
//等对csafe协议研究透彻后写 ////等对csafe协议研究透彻后写
if (this.c2Control != null) //if (this.c2Control != null)
{ //{
Debug.Log("发送重置命令" + this.c2Control.ToString()); // Debug.Log("发送重置命令" + this.c2Control.ToString());
hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x80, 0x80, 0xF2 }); // hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x80, 0x80, 0xF2 });
//hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x81, 0x81, 0xF2 }); // //hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x81, 0x81, 0xF2 });
} //}
} }
else else
{ {

3
Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
View File

@ -22,7 +22,6 @@ public class ConnectDeviceModal : PFUIPanel
} }
set set
{ {
//Debug.Log(value);
mSensorType = value; mSensorType = value;
var deviceInfoStr = Utils.deviceDict[value.ToString()]; var deviceInfoStr = Utils.deviceDict[value.ToString()];
if (deviceInfoStr != null) if (deviceInfoStr != null)
@ -30,7 +29,7 @@ public class ConnectDeviceModal : PFUIPanel
var deviceInfo = deviceInfoStr.Split('|'); var deviceInfo = deviceInfoStr.Split('|');
if (deviceInfo.Length == 2) if (deviceInfo.Length == 2)
{ {
Title.text = deviceInfo[0]; Title.text = App.GetLocalString(deviceInfo[0]);
Logo.sprite = Resources.Load<Sprite>(deviceInfo[1]); Logo.sprite = Resources.Load<Sprite>(deviceInfo[1]);
} }
} }

6
Assets/Scripts/UI/Prefab/Rower/RowerTaskPanel.cs
View File

@ -98,6 +98,12 @@ public class RowerTaskPanel : PFUIPanel
Utils.showToast(null, "Minimum mileage is 100M.", isOnly: true); Utils.showToast(null, "Minimum mileage is 100M.", isOnly: true);
return; return;
} }
if (rowerType.type == 2 && rowerType.value < 20)
{
Utils.showToast(null, "Minimum time is 20s.", isOnly: true);
return;
}
if (callBack != null) if (callBack != null)
{ {
callBack.Invoke(rowerType); callBack.Invoke(rowerType);