HDL-ON_Android/Assets/Language.ini
@@ -549,6 +549,7 @@ 2548=Please enter a correct phone number 2549=Please select a effective time 2550=Please select a expire time 2551=Temporary password is invalid 1000=Room Humidity @@ -1733,6 +1734,7 @@ 2548=请输入正确的手机号码 2549=请选择生效时间 2550=请选择失效时间 2551=动态密码已失效 @@ -2893,6 +2895,7 @@ 2548=Please enter a correct phone number 2549=Please select a effective time 2550=Please select a expire time 2551=Temporary password is invalid 1000=Влажность в Помещении HDL-ON_Android/HDL-ON_Android.csproj
@@ -1454,7 +1454,7 @@ <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\HDLLinphoneSDK_AndroidNew\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj"> <ProjectReference Include="..\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj"> <Project>{703D29ED-674F-44A8-8AAD-863035899D4B}</Project> <Name>Shared.Droid.HDLLinphone</Name> </ProjectReference> HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs
@@ -20,7 +20,6 @@ class JPushFirmBroadcast : BroadcastReceiver { public override void OnReceive(Context context, Intent intent) { @@ -45,17 +44,10 @@ notificationMessage.NotificationExtras = extra; JPushReceiver.OpenNotification(context, notificationMessage); } catch { } } } } HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs
@@ -19,15 +19,12 @@ ] public class JPushOpenClickActivity : Activity { protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); View v = new View(this); SetContentView(v); HandleOpenClick(Intent); } protected void HandleOpenClick(Intent intent) @@ -49,7 +46,6 @@ { base.OnNewIntent(intent); HandleOpenClick(intent); } } } HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -111,42 +111,6 @@ Utlis.WriteLine("JPushOnRegister: " + p1); } ///// <summary> ///// 处理极光信息推送 ///// </summary> ///// <param name="title">标题</param> ///// <param name="message">信息</param> ///// <param name="extras">负载数据</param> //public void AdjustJiguangMsgPush(JPushMessageInfo JPushMessageInfo) //{ // try // { // if (JPushMessageInfo.Extras.Contains("Offline") == true) // { // Shared.Application.RunOnMainThread(() => // { // //账号在别处登陆，被踢下线 跳转到登录页面 // new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show(); // //2020-12-04 待增加退出登录操作 // }); // return; // } // else // { // Shared.Application.RunOnMainThread(() => // { // new Alert(JPushMessageInfo.Title, JPushMessageInfo.Content, Language.StringByID(StringId.Close)).Show(); // }); // return; // } // } // catch // { // } //} /// <summary> /// 打开消息显示界面.010000 /// </summary> @@ -154,7 +118,6 @@ /// <param name="notificationMessage"></param> public static void OpenNotification(Context context, NotificationMessage notificationMessage) { try { var pushMes = new JPushMessageInfo() @@ -178,42 +141,17 @@ Utlis.WriteLine("PushMes extras : " + pushMes.Extras); Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId); Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class); i.SetFlags(ActivityFlags.NewTask); context.StartActivity(i); context.StartActivity(i); //解析msg AdjustPushMessage(pushMes); //Shared.Application.RunOnMainThread(() => //{ // if (Shared.Application.Activity == null) // { // var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class); // tempIntent.SetFlags(ActivityFlags.BroughtToFront); // context.StartActivity(tempIntent); // HDLCommon.Current.AdjustPushMessage(pushMes); // } // else // { // (Shared.Application.Activity as BaseActivity).MoveToFront(); // HDLCommon.Current.AdjustPushMessage(pushMes); // } //}); } catch { } //catch (Exception ex) //{ // Utlis.WriteLine(ex.ToString()); //} } public static void AdjustPushMessage(JPushMessageInfo pushMes) { HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL_ON/Common/R.cs
@@ -51,6 +51,10 @@ /// </summary> public const int VisitorEndTime = 2550; /// <summary> /// 动态密码已失效 /// </summary> public const int TemporaryPasswordInvalid = 2551; /// <summary> /// 访客二维码开始时间 /// </summary> public const int VisitorStartTime = 2549; HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -308,21 +308,12 @@ intent.PutExtra("callId", mESVideoInfo.callId); intent.PutExtra("Type", 1); Shared.Application.Activity.StartActivity(intent); } else { HDLUtils.WriteLine("未支持的可视对讲类型"); } #endregion #endif } HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -126,14 +126,12 @@ #else if (mInterphoneType == InterphoneType.FREEVIEW.ToString()) { //HDLLinphoneKit.Instance.SetAccountAndLogin( // mHDLSipInfo.sipAccount, // mHDLSipInfo.sipPasswd, // mHDLSipInfo.realm, // HDLLinphoneKit.InterPhoneTypeFreeview // ); HDLLinphoneKit.Instance.SetAccountAndLogin("A583853817423247", "763548", "139.159.157.75:46000", HDLLinphoneKit.InterPhoneTypeFreeview); HDLLinphoneKit.Instance.SetAccountAndLogin( mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, "139.159.157.75:46000", HDLLinphoneKit.InterPhoneTypeFreeview ); } else { @@ -144,7 +142,6 @@ HDLLinphoneKit.InterPhoneTypeHdl ); } // "A583853817423247","763548","139.159.157.75:46000", #endif }
@@ -549,7 +549,6 @@ Utlis.WriteLine("上传结果：" + pack.message); uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS); } } catch (Exception ex) { HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -189,7 +189,6 @@ { Height = Application.GetRealHeight(40), Y = Application.GetRealWidth(10), BackgroundColor = CSS_Color.BackgroundColor, }; startLayout.AddChidren(new Button() @@ -492,7 +491,8 @@ if (tempPassword != null && tempPassword.id != null && tempPassword.id != "") { pwdEditText.Text = tempPassword.tempPwd; pwdEditText.Text = ""; pwdEditText.PlaceholderText = Language.StringByID(StringId.TemporaryPasswordInvalid); pwdEditText.Enable = false; phoneNumberEditText.Enable = false; randomBtn.Enable = false; HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -23,7 +23,6 @@ this.AddChidren(topView.TopFLayoutView()); topView.topNameBtn.TextID = StringId.keshiduijiang; var pageView = new PageLayout() { Y = Application.GetRealHeight(64), Shared.Droid.HDLLinphone/Jars/HDLLinphoneSDK-V1.0.1.aarBinary files differ
