From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 11 九月 2020 09:16:59 +0800 Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节 --- ZigbeeApp/GateWay.Droid/Application.cs | 443 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 443 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs new file mode 100755 index 0000000..46946fd --- /dev/null +++ b/ZigbeeApp/GateWay.Droid/Application.cs @@ -0,0 +1,443 @@ +using Android.App; +using Android.Widget; +using Android.OS; +using Shared; +using Android.Content.PM; +using System; +using Android.Content; +using Android.Net; +using Shared.Phone.UserView; +using CN.Jpush.Android.Api; +using CN.Jpush.Android.Service; +using Org.Json; + +using Microsoft.AppCenter; +using Microsoft.AppCenter.Analytics; +using Microsoft.AppCenter.Crashes; +using Com.Tencent.MM.Sdk.Openapi; +using ZXing.Mobile; +using System.IO; + +namespace com.hdl.home +{ + + [Activity(Name = "com.hdl.home.wxapi.WXEntryActivity", Exported = true, Theme = "@android:style/Theme.Translucent", LaunchMode = Android.Content.PM.LaunchMode.SingleTask)] + class WXEntryActivity : Android.App.Activity, IWXAPIEventHandler + { + public void OnReq(BaseReq p0) + { + + } + protected override void OnNewIntent(Intent intent) + { + base.OnNewIntent(intent); + Intent = intent; + com.hdl.home.Application.api?.HandleIntent(intent, this); + //Finish(); + } + public static Action<string> RespAction; + public void OnResp(BaseResp p0) + { + + if (p0 is SendAuth.Resp) + { + var resp = p0 as SendAuth.Resp; + + switch (resp.ErrCode) + { + case SendAuth.Resp.InnerErrCode.ErrOk: + var result = new System.Net.WebClient { }.DownloadString($"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx2ec8f53f6fa36e82&secret=a08585cd6ff2ce64570b9e7e6525dd8e&code={resp.Token}&grant_type=authorization_code"); + RespAction?.Invoke(result); + break; + default: + RespAction?.Invoke(null); + break; + + //case SendAuth.Resp.InnerErrCode.ErrUserCancel: + // break; + //case SendAuth.Resp.InnerErrCode.ErrAuthDenied: + // break; + + } + } + + this.Finish(); + } + //IWXAPI api; + protected override void OnCreate(Bundle savedInstanceState) + { + base.OnCreate(savedInstanceState); + // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚� + //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", false); + + // 灏嗗簲鐢ㄧ殑appId娉ㄥ唽鍒板井淇� + //api.RegisterApp("wx2ec8f53f6fa36e82"); + + com.hdl.home.Application.api?.HandleIntent(Intent, this); + } + } + /// <summary>鈥� /// 璁惧畾涓洪粯璁ゅ惎鍔ㄧ殑Application鈥� /// </summary>鈥� [Android.App.Application()]鈥� public class Application : Android.App.Application鈥� {鈥� public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }鈥ㄢ�� public override void OnCreate()鈥� { + //濡傛灉涓嶆槸App鐨勪富杩涚▼,鍒欎笉闇�瑕佸鐞� + if (this.IsCurrentAppProcess == false) + { + base.OnCreate(); + return; + } + try + { + //杩欎釜涓滆タ濂藉儚鍙兘浼氬嚭寮傚父 + this.initAll(); + }鈥� catch (Exception ex)鈥� { + //璋冭瘯:璁板綍绯荤粺寮傚父 + Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.SystemLogFile, ex.Message + "\r\n" + ex.StackTrace, true, false); + }鈥� base.OnCreate(); + // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚� + //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", true); + + // 灏嗗簲鐢ㄧ殑appId娉ㄥ唽鍒板井淇� + api?.RegisterApp("wx2ec8f53f6fa36e82"); + } + + /// <summary> + /// 鍒ゆ柇褰撳墠杩涚▼鏄笉鏄疉pp鑷繁鐨勪富杩涚▼ + /// </summary> + private bool IsCurrentAppProcess + { + get + { + var activityManager = (ActivityManager)GetSystemService(ActivityService); + var listProcess = activityManager.RunningAppProcesses; + foreach (var process in listProcess) + { + if (process.ProcessName == "com.evoyo.home" && process.Pid == Android.OS.Process.MyPid()) + { + return true; + } + } + return false; + } + } + + internal static IWXAPI api; + + public static void WXLogin() { + var req = new SendAuth.Req { Scope = "snsapi_userinfo", State = "ZigbeeApp" }; + api?.SendReq(req); + } + /// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� { + Shared.Application.IsGpsEnable = System.IO.File.Exists(Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile); + + //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅 + // System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}"); +#if Release鈥� JPushInterface.SetDebugMode(false); + //淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠� + //System.Console.WriteLine($"BBB : {System .DateTime .Now .ToString ()}"); + + JPushInterface.Init(this); + //System.Console.WriteLine($"CCC : {System.DateTime.Now.ToString()}"); +#endif + + + BaseActivity.BackKeyAction = () => { + try + { + if (Shared.Common.CommonPage.BackKeyCanClick == false) + { + //涓嶅厑璁告寜杩斿洖閿� + return; + } + if (Shared.Common.CommonPage.Loading != null) + { + Console.WriteLine(Shared.Common.CommonPage.Loading.CurStatus); + if (Shared.Common.CommonPage.Loading.CurStatus) + { + //Shared.SimpleControl.MainPage.Loading.Hide (); + return; + } + } + var lastView = Shared.Application.MainPage.GetChildren(Shared.Application.MainPage.ChildrenCount - 1); + if (lastView != null && lastView.Tag?.ToString() == "Dialog") + { + Console.WriteLine("Remove Dialog!!!!"); + var lastView2 = Shared.Application.MainPage.GetChildren(Shared.Application.MainPage.ChildrenCount - 2); + lastView.RemoveFromParent(); + lastView2.RemoveFromParent(); + Console.WriteLine("Remove Dialog End!!!!"); + return; + } + } + catch (System.Exception ezx) + { + Console.WriteLine(ezx.Message); + } + if (HomePage.Instance.ChildrenCount > 1) + { + Console.WriteLine("Remove PageLayout Children!!!!"); + HomePage.Instance.GetChildren(HomePage.Instance.ChildrenCount - 1).RemoveFromParent(); + Console.WriteLine("Remove PageLayout Children End!!!!"); + } + else + { + BaseActivity.VerifyDateTime = DateTime.MaxValue; + Console.WriteLine("BaseActivity VerifyDateTime Max!!!!"); + } + }; +鈥� BaseActivity.OnCreateActoin += (activity, application) => { + Shared.Application.FontSize = 12; + AppCenter.Start("4802834a-e7e9-4dd8-93f1-c2f88f0bd464", typeof(Analytics), typeof(Crashes));鈥�#if Release鈥� //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠垛�� var registrationId = JPushInterface.GetRegistrationID(activity); + System.Console.WriteLine("registrationId-鏋佸厜id=" + registrationId); + if (!string.IsNullOrEmpty(registrationId))鈥� {鈥� Shared.Common.Config.Instance.RegistrationID = registrationId;鈥� Shared.Common.Config.Instance.Save();鈥� }鈥� //璋冭瘯:璁板綍鏋佸厜ID鈥� Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive1:" + registrationId, true, true);鈥�#endif鈥� };鈥ㄢ�� 鈥� BaseActivity.RefreshUIAction += (activity) => {鈥� Shared.Language.CurrentLanguage = "Chinese";鈥� Shared.Common.CommonPage.Instance.Show();鈥� };鈥ㄢ�� BaseActivity.NetworkStateChanged += (v) =>鈥� {鈥� };鈥� BaseActivity.OnDestroyAction += (activity) => {鈥� //socket鍋滄杩炴帴鈥� //ZigBee.Device.ZbGateway.FindGateWaySocket.Stop();鈥� };鈥ㄢ�� HDLUtils.SetAuthoritiesName("com.evoyo.home.fileProvider");鈥� }鈥ㄢ�� public static bool IsShowTip = true;鈥� JpushNotificationReceiver myReceiver = new JpushNotificationReceiver { };鈥ㄢ�� /// <summary>鈥� /// 椤圭洰鍚姩鏃剁綉缁滄煡璇⑩�� /// </summary>鈥� void checkSomeInfo()鈥� {鈥� var status = isNetworkAvailable(this);鈥� string internetStatus = "Available";鈥� if (!status)鈥� {鈥� internetStatus = "UnaVailable";鈥� }鈥� else鈥� {鈥� var isWifi = isWifiConnected(this);鈥� if (isWifi)鈥� {鈥� internetStatus = "WiFiConnect";鈥� }鈥� else鈥� {鈥� internetStatus = "MobileConnect";鈥� }鈥� }鈥ㄢ�� int connectState = 0;鈥� if (internetStatus == "UnaVailable")鈥� {鈥� connectState = 0;鈥� }鈥� else if (internetStatus == "WiFiConnect")鈥� {鈥� connectState = 2;鈥� }鈥� else鈥� {鈥� connectState = 1;鈥� }鈥� //ZigBee.Device.ZbGateway.CheckConnection(connectState);鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁鍙敤鈥� /// </summary>鈥� /// <returns><c>true</c>, if network available was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isNetworkAvailable(Context context)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� if (cm == null || cm.ActiveNetworkInfo == null)鈥� {鈥� //褰撳墠缃戠粶涓嶅彲鐢ㄢ�� return false;鈥� }鈥� else鈥� {鈥� return cm.ActiveNetworkInfo.IsAvailable;鈥� }鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁杩炴帴鈥� /// </summary>鈥� /// <returns><c>true</c>, if wifi connected was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isWifiConnected(Context context)鈥� {鈥� if (context != null)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� var mWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Wifi);鈥� if (Android.Net.NetworkInfo.State.Connected == mWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疻i-Fi杩炴帴鈥� return true;鈥� }鈥ㄢ�� var moWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Mobile);鈥� if (Android.Net.NetworkInfo.State.Connected == moWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疢obile杩炴帴鈥� return false;鈥� }鈥� }鈥� return false;鈥� } + + + } + + [BroadcastReceiver(Name = "com.evoyo.home.JpushNotificationReceiver", Exported = false, Enabled = true)] + [IntentFilter(new string[] { "cn.jpush.android.intent.REGISTRATION", + "cn.jpush.android.intent.MESSAGE_RECEIVED", + "cn.jpush.android.intent.NOTIFICATION_RECEIVED", + "cn.jpush.android.intent.NOTIFICATION_OPENED", + "cn.jpush.android.intent.CONNECTION" }, Categories = new string[] { "com.evoyo.home" })] + public class JpushNotificationReceiver : BroadcastReceiver + { + private static string TAG = "JpushNotificationReceiver"; + private NotificationManager nm; + static string ACTION = "android.intent.action.BOOT_COMPLETED"; + public override void OnReceive(Context context, Intent intent) + { + if (nm == null) + { + nm = (NotificationManager)context.GetSystemService(Context.NotificationService); + } + //base.OnReceive (context, intent); + try + { + Bundle bundle = intent.Extras; + if (intent.Action == ACTION) + { + //寮�鏈鸿嚜鍔ㄦ湇鍔¤嚜鍔ㄥ惎鍔�,PushService鏄鍚姩鐨勬湇鍔� + Intent service = new Intent(context, typeof(PushService)); + context.StartService(service); + } + + //鎺ユ敹Registration Id + if (JPushInterface.ActionRegistrationId == intent.Action) + { + string regId = bundle.GetString(JPushInterface.ExtraRegistrationId); + if (!string.IsNullOrEmpty(regId)) + { + Shared.Common.Config.Instance.RegistrationID = regId; + Shared.Common.Config.Instance.Save(); + } +#if Release + //璋冭瘯:璁板綍鏋佸厜ID + Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive2:" + regId, false, true); +#endif + } + //鐢ㄦ埛鐐瑰嚮鎵撳紑浜嗛�氱煡 + else if (JPushInterface.ActionNotificationOpened == intent.Action) + { + OpenNotification(context, bundle); + } + //鎺ュ彈鍒版帹閫佷笅鏉ョ殑閫氱煡 + else if (JPushInterface.ActionNotificationReceived == intent.Action) + { + //int notifactionId = bundle.GetInt(JPushInterface.ExtraNotificationId); + ReceivingNotification(context, bundle); + //Shared.Common.CommonPage.Instance.SingOut(); + } + //鎺ユ敹鍒版帹閫佷笅鏉ョ殑鑷畾涔夋秷鎭� + else if (JPushInterface.ActionMessageReceived == intent.Action) + { + bundle.GetString(JPushInterface.ExtraMessage); + } + else + { + } + } + catch (System.Exception e) + { + + System.Console.WriteLine("鏋佸厜鎺ㄩ�佸嚭閿�:" + e.Message); + } + } + /// <summary> + /// 鎺ユ敹娑堟伅閫氱煡 + /// </summary> + /// <param name="context">Context.</param> + /// <param name="bundle">Bundle.</param> + private void ReceivingNotification(Context context, Bundle bundle) + { + String title = bundle.GetString(JPushInterface.ExtraNotificationTitle); + System.Console.WriteLine(TAG, " title : " + title); + String message = bundle.GetString(JPushInterface.ExtraAlert); + System.Console.WriteLine(TAG, "message : " + message); + String extras = bundle.GetString(JPushInterface.ExtraExtra); + System.Console.WriteLine(TAG, "extras : " + extras); + + //澶勭悊鏋佸厜娑堟伅鎺ㄩ�佺殑閫昏緫鍑芥暟 + Shared.Phone.UserCenter.HdlJiguangMsgPushLogic.Current.AdjustJiguangMsgPush(title, message, extras); + } + /// <summary> + /// 鎵撳紑娑堟伅鏄剧ず鐣岄潰 + /// </summary> + /// <param name="context">Context.</param> + /// <param name="bundle">Bundle.</param> + private void OpenNotification(Context context, Bundle bundle) + { + + Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class); + i.PutExtras(bundle); + i.SetFlags(ActivityFlags.NewTask); + context.StartActivity(i); + + String extras = bundle.GetString(JPushInterface.ExtraExtra); + //String myValue = ""; + try + { + VideoMethod(extras); + //JSONObject extrasJson = new JSONObject(extras); + //myValue = extrasJson.OptString("myKey"); + + } + catch (Exception e) + { + System.Console.WriteLine(TAG, "Unexpected: extras is not a valid json", e); + return; + } + + //if (TYPE_THIS.equals(myValue)) + //{ + //Intent mIntent = new Intent(context, ThisActivity.class); + //mIntent.putExtras(bundle); + //mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //context.startActivity(mIntent); + //} + //else if (TYPE_ANOTHER.equals(myValue)) + //{ + //Intent mIntent = new Intent(context, AnotherActivity.class); + //mIntent.putExtras(bundle); + //mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //context.startActivity(mIntent); + //} + } + + /// <summary> + /// android閫氱煡鏍忕偣鍑绘墦寮�鍙瀵硅鐨勬柟娉� + /// </summary> + /// <param name="hiddenJson">浜戠鎺ㄨ繃鏉ョ殑鏁版嵁</param> + private void VideoMethod(string hiddenJson) + { + var hiddanJson = Newtonsoft.Json.Linq.JObject.Parse(hiddenJson); + if (hiddanJson == null) + { + return; + } + var json = Newtonsoft.Json.Linq.JObject.Parse(hiddanJson["HiddanJson"].ToString()); + if (json == null) + { + return; + } + Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo(); + if (json["uuid"].ToString().Contains(",")) + { + var uuid = json["uuid"].ToString().Split(','); + eSVideoInfo.ESVideoUUID = uuid[0]; + + } + else + { + eSVideoInfo.ESVideoUUID = json["uuid"].ToString(); + } + + eSVideoInfo.DeviceName = Language.StringByID(Shared.R.MyInternationalizationString.theOutdoorUnit); + eSVideoInfo.ESRoomID = int.Parse(json["roomno"].ToString()); + if (!string.IsNullOrEmpty(json["unitno"].ToString())) + { + string str = json["unitno"].ToString(); + string str1 = str.Substring(0, 2).TrimStart('0'); + string str2 = str.Substring(2, 2).TrimStart('0'); + eSVideoInfo.RoomName = str1 + Language.StringByID(Shared.R.MyInternationalizationString.dong) + str2 + Language.StringByID(Shared.R.MyInternationalizationString.unit); + } + + Shared.Phone.VideoPhone.ESVideo.ShowESvideoVideoIntercom(eSVideoInfo); + + } + } +} + +namespace Shared +{ + public static class QRCode + { + static ZXing.Mobile.MobileBarcodeScanner scanner; + public static void ScanQRcode(Action<string> action, string cancel = "鍙栨秷", string flashText = "闂厜鐏�", string titleText = "浜岀淮鐮佹壂鎻�") + { + ((BaseActivity)Shared.Application.Activity).SetCamera(async (obj) => + { + if (obj) + { + if (scanner == null) + { + MobileBarcodeScanner.Initialize(Shared.Application.Activity.Application); + var mZXingCustomScanView = new GateWay.Droid.ZXingCustomScanView(Shared.Application.Activity.Application); + mZXingCustomScanView.cancelTextView.Text = cancel; + mZXingCustomScanView.flashTextView.Text = flashText; + mZXingCustomScanView.titleTextView.Text = titleText; + var bOn = false; + scanner = new ZXing.Mobile.MobileBarcodeScanner() + { + UseCustomOverlay = true, + CustomOverlay = mZXingCustomScanView + }; + + mZXingCustomScanView.OnCancel += () => { + + scanner?.Cancel(); + }; + + mZXingCustomScanView.OnTorch += () => + { + bOn = !bOn; + scanner?.Torch(bOn); + }; + } + + var result = await scanner.Scan(); + + if (result != null) + action?.Invoke(result.Text); + else + action?.Invoke(null); + + } + else + { + action?.Invoke(null); + } + }); + } + + public static byte[] BytesFromText(string text, int width = 300, int height = 300) + { + var barcodeWriter = new ZXing.Mobile.BarcodeWriter + { + Format = ZXing.BarcodeFormat.QR_CODE, + Options = new ZXing.Common.EncodingOptions + { + Width = width, + Height = height, + Margin = 0 + } + }; + + barcodeWriter.Renderer = new ZXing.Mobile.BitmapRenderer(); + var bitmap = barcodeWriter.Write(text); + using (var stream = new MemoryStream()) + { + bitmap.Compress(Android.Graphics.Bitmap.CompressFormat.Png, 100, stream); // this is the diff between iOS and Android + stream.Position = 0; + return stream.ToArray(); + } + } + } +} -- Gitblit v1.8.0