Crabtree/CrabtreeOnCertificates:ProvisioningProfile/2023/adhoc/CrabtreeSmartH_Prod.mobileprovisionBinary files differ
Crabtree/CrabtreeOnCertificates:ProvisioningProfile/2023/adhoc/Production.p12Binary files differ
Crabtree/ON.Ios/Info.plist
@@ -17,9 +17,9 @@ <key>CFBundleIdentifier</key> <string>com.hdl.crabtreenew</string> <key>CFBundleShortVersionString</key> <string>2.701111</string> <string>2.800526</string> <key>CFBundleVersion</key> <string>2.701111</string> <string>2.800526</string> <key>LSRequiresIPhoneOS</key> <true/> <key>MinimumOSVersion</key> Crabtree/ON.Ios/ON.Ios.csproj
@@ -37,7 +37,7 @@ <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;HDL;HDLVideo;</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodesignKey>iPhone Distribution: Havells India Limited (6FQDUKMB48)</CodesignKey> <CodesignKey>Apple Distribution: Havells India Limited (6FQDUKMB48)</CodesignKey> <MtouchFloat32>true</MtouchFloat32> <MtouchLink>SdkOnly</MtouchLink> <MtouchArch>ARM64</MtouchArch> Crabtree/ON/ON.Droid.csproj
@@ -52,7 +52,7 @@ <NoWarn></NoWarn> <AndroidDexTool>d8</AndroidDexTool> <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis> <AndroidPackageFormat>apk</AndroidPackageFormat> <AndroidPackageFormat>aab</AndroidPackageFormat> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Crabtree/ON/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.804131" android:versionCode="202304131"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" /> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.806101" android:versionCode="202306101"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" /> <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 --> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 定位权限，用于APP通过获取定位坐标查询当前地区天气--> Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs
@@ -93,6 +93,6 @@ //备注不能为空。 public readonly static string RemarksCannotBeEmpty = "Device name cannot be empty"; //请求服务器失败，请稍后再试！ public readonly static string FailedRequestServer = "Failed to request the server, please try again later!"; public readonly static string FailedRequestServer = "Failed to request the server, please try again later!";//Request exception, please return and try again } } Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs
@@ -193,9 +193,9 @@ /// 获取网关信息 /// </summary> public const string Api_Post_GetGatewayInfo = "/home-wisdom/app/gateway/info"; ///// <summary> ///// 解绑绑网关到住宅 ///// </summary> /// <summary> /// 解绑住宅网关 /// </summary> public const string API_POST_UntieGateway = "/home-wisdom/app/gateway/untieGateway"; /// <summary> /// 强制换绑网关 Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -106,9 +106,8 @@ //MainPage.AddTip (Language.StringByID (R.MyInternationalizationString.SearchingGatewayLocally)); MainPage.LoadingStart (Language.StringByID (R.MyInternationalizationString.SearchingGatewayLocally)); var control = new Control (); UserConfig.Instance.IsLocalEncrypt = false; var control = new Control (); control.Send (new Target () { IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000), Command = Command.ReadGateway, Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -38,7 +38,7 @@ //public static Button LogoButton = new Button (); public static string RequestVersion = "2.804131"; public static string RequestVersion = "2.805291"; public static UserInfo LoginUser; /// <summary> /// 是否是管理员权限(变更了,成员的时候,这个也为ture。为什么会声明这样变量,因为有些接口必须使用原来的Token) Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
@@ -412,7 +412,8 @@ UserConfig.Instance.SaveUserConfig (); return true; } } else if (revertObj.Code == "147103") { } else if (revertObj.Code == "147103") { var pack = HttpServerRequest.Current.UnBindGateway (bindGatewayObj.homeId, UserConfig.Instance.HomeGateway.gatewayId); if (pack.Code == StateCode.SUCCESS) { var homeGatewayInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo> (revertObj.Data.ToString ()); @@ -429,7 +430,8 @@ } else { IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code); } } else { } else { IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code); } } catch { Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs
@@ -170,6 +170,77 @@ }; contentView.AddChidren (btnModifyNullLine); #endregion #region LocalEncryption var LocalEncryptionView = new FrameLayout () { Height = Application.GetRealHeight (100), }; contentView.AddChidren (LocalEncryptionView); Button btnLocalEncryptionTitle = new Button () { X = Application.GetRealWidth (40), Text = "Set local encryption", TextAlignment = TextAlignment.CenterLeft, TextColor = SkinStyle.Current.TextColor1, }; LocalEncryptionView.AddChidren (btnLocalEncryptionTitle); Button btnLocalEncryptionRight = new Button () { X = Application.GetRealWidth (580), Width = Application.GetRealWidth (28), Height = Application.GetRealHeight (40), Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Item/Right.png", SelectedImagePath = "Item/RightSelected.png", }; LocalEncryptionView.AddChidren (btnLocalEncryptionRight); EventHandler<MouseEventArgs> localEncryptionHandler = (sender, e) => { var waitPage = new Loading (); this.AddChidren (waitPage); waitPage.Start ("wait..."); new System.Threading.Thread (() => { try { byte [] AseKeyBytes = UserConfig.Instance.GenerateLocalEncryptionKey (); byte [] sendBytes = new byte [17]; sendBytes [0] = (byte)1; //0:不加密 1:加密 Array.Copy (AseKeyBytes, 0, sendBytes, 1, 16); UserConfig.Instance.IsLocalEncrypt = false; var control = new Control (); control.Send (new Target () { IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000), Command = Command.SetGateWayLocalEncryption, SubnetID = 255, DeviceID = 0, AddData = sendBytes }, SendCount.Three, true, true); var backBytes = control.UsefulBytes; }catch(Exception ex) { } finally { Application.RunOnMainThread (() => { waitPage.Hide (); }); } }) { IsBackground = true }.Start (); }; LocalEncryptionView.MouseUpEventHandler += localEncryptionHandler; btnLocalEncryptionTitle.MouseUpEventHandler += localEncryptionHandler; btnModifyPasswordRight.MouseUpEventHandler += localEncryptionHandler; Button btnLocalEncryptionLine = new Button () { Height = Application.GetRealHeight (5), BackgroundColor = SkinStyle.Current.MainColor, }; contentView.AddChidren (btnLocalEncryptionLine); #endregion Button btnLogout = new Button () { Y = contentView.Bottom, Height = Application.GetRealHeight (93),
