From 6d55af8792cf8fbef0055e677b900fc352dba9a2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 六月 2020 15:17:14 +0800
Subject: [PATCH] 2020-06-04 1.更新。
---
SmartHome/ON.Ios/AppDelegate.cs | 6 +++---
SmartHome/ON/Application.cs | 21 ++++++++++-----------
SmartHome/ON/Properties/AndroidManifest.xml | 2 +-
SmartHome/SmartHome/UI/SimpleControl/MainPage.cs | 4 ++--
SmartHome/ON.Ios/Info.plist | 4 ++--
SmartHome/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 4 ++--
SmartHome/ON/SharedMethod.cs | 2 +-
7 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/SmartHome/ON.Ios/AppDelegate.cs b/SmartHome/ON.Ios/AppDelegate.cs
index 5ba6f69..31643d1 100644
--- a/SmartHome/ON.Ios/AppDelegate.cs
+++ b/SmartHome/ON.Ios/AppDelegate.cs
@@ -341,9 +341,9 @@
if (netStatus == 0)
return;
- System.Threading.Tasks.Task.Run (() => {
- SharedMethod.SharedMethod.CheckVersion ();
- });
+ //System.Threading.Tasks.Task.Run (() => {
+ // SharedMethod.SharedMethod.CheckVersion ();
+ //});
}
}
}
\ No newline at end of file
diff --git a/SmartHome/ON.Ios/Info.plist b/SmartHome/ON.Ios/Info.plist
index 0e8e441..c3a7579 100755
--- a/SmartHome/ON.Ios/Info.plist
+++ b/SmartHome/ON.Ios/Info.plist
@@ -17,7 +17,7 @@
<key>CFBundleIdentifier</key>
<string>com.hdl.in</string>
<key>CFBundleShortVersionString</key>
- <string>2.52005281</string>
+ <string>2.52006021</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
@@ -102,7 +102,7 @@
<key>CFBundleDisplayName</key>
<string>Control In</string>
<key>CFBundleVersion</key>
- <string>2.52005281</string>
+ <string>2.52006021</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Get the weather</string>
</dict>
diff --git a/SmartHome/ON/Application.cs b/SmartHome/ON/Application.cs
index 8b1230b..d9c63b4 100644
--- a/SmartHome/ON/Application.cs
+++ b/SmartHome/ON/Application.cs
@@ -56,7 +56,7 @@
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
//if(localeList.Language == "zh") {
- //Language.CurrentLanguage = "Chinese";
+ //Language.CurrentLanguage = "Chinese";
//}
string [] permissions = new string [] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
@@ -129,7 +129,7 @@
while (string.IsNullOrEmpty (tokenID)) {
System.Threading.Thread.Sleep (1000);
tokenID = JPushInterface.GetRegistrationID (activity);
- Console.WriteLine ("Sleep.tokenID + "+ JPushInterface.GetRegistrationID (activity));
+ Console.WriteLine ("Sleep.tokenID + " + JPushInterface.GetRegistrationID (activity));
loadTokenCount++;
if (loadTokenCount > 30) {
break;
@@ -144,14 +144,14 @@
#endif
BaseActivity.NetworkStateChanged += (int obj) => {
- MqttCommon.DisConnectRemoteMqttClient("NetworkStateChanged") ;
+ MqttCommon.DisConnectRemoteMqttClient ("NetworkStateChanged");
Shared.SimpleControl.EquipmentPublicClass.CheckLinkRemote (obj);
};
-
+
};
BaseActivity.RefreshUIAction += (activity) => {
MainPage.Show ();
- checkSomeInfo ();
+ checkSomeInfo ();
};
BaseActivity.OnResumeAction += (activity) => {
//new System.Threading.Thread (() => {
@@ -159,7 +159,7 @@
// System.Threading.Thread.Sleep (50);
// }
MqttCommon.DisConnectRemoteMqttClient ();
- checkSomeInfo ();
+ checkSomeInfo ();
Console.WriteLine ("Close OnResumeAction!!!");
WiFiSet.refreshView?.Invoke ();
};
@@ -281,7 +281,7 @@
"cn.jpush.android.intent.NOTIFICATION_OPENED",
"cn.jpush.android.intent.CONNECTION"
},
- Categories = new string [] { "com.hdl.on" })
+ Categories = new string [] { "com.hdl.in" })
]
public class JpushNotificationReceiver : BroadcastReceiver
{
@@ -302,9 +302,8 @@
else if (JPushInterface.ActionRegistrationId == intent.Action) {
string regId = bundle.GetString (JPushInterface.ExtraRegistrationId);
//System.Console.WriteLine ("Registration ID:" + regId);
- }
- else if (JPushInterface.ActionNotificationOpened == intent.Action) {
- Console.WriteLine ("鐢ㄦ埛鐐瑰嚮鎵撳紑浜嗛�氱煡");
+ } else if (JPushInterface.ActionNotificationOpened == intent.Action) {
+ Console.WriteLine ("鐢ㄦ埛鐐瑰嚮鎵撳紑浜嗛�氱煡");
Application.IsShowTip = false;
if (Shared.Application.Activity == null) {
@@ -313,7 +312,7 @@
context.StartActivity (tempIntent);
} else {
(Shared.Application.Activity as BaseActivity).MoveToFront ();
- RemoteInfo.Current.ReadMsgList ( false);
+ RemoteInfo.Current.ReadMsgList (false);
}
} else {
Console.WriteLine ("鏋佸厜鎺ㄩ��!!!");
diff --git a/SmartHome/ON/Properties/AndroidManifest.xml b/SmartHome/ON/Properties/AndroidManifest.xml
index 8889cd5..fe7c555 100644
--- a/SmartHome/ON/Properties/AndroidManifest.xml
+++ b/SmartHome/ON/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2020060101" android:versionName="2.506011" package="com.hdl.in">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2020060201" android:versionName="2.506021" package="com.hdl.in">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<!--Ezviz 鏉冮檺 -->
<uses-permission android:name="android.permission.FLASHLIGHT" />
diff --git a/SmartHome/ON/SharedMethod.cs b/SmartHome/ON/SharedMethod.cs
index 0027bbd..9d9fc31 100644
--- a/SmartHome/ON/SharedMethod.cs
+++ b/SmartHome/ON/SharedMethod.cs
@@ -71,7 +71,7 @@
if (BuildVersionCodes.M < Android.OS.Build.VERSION.SdkInt) {
//鍙傛暟1 涓婁笅鏂�, 鍙傛暟2 Provider涓绘満鍦板潃 鍜岄厤缃枃浠朵腑淇濇寔涓�鑷� 鍙傛暟3 鍏变韩鐨勬枃浠�
- var apkUri = Android.Support.V4.Content.FileProvider.GetUriForFile (context, "com.hdl.on.fileProvider", file);
+ var apkUri = Android.Support.V4.Content.FileProvider.GetUriForFile (context, "com.hdl.in.fileProvider", file);
//娣诲姞杩欎竴鍙ヨ〃绀哄鐩爣搴旂敤涓存椂鎺堟潈璇ri鎵�浠ｈ〃鐨勬枃浠�
intent.AddFlags (ActivityFlags.GrantReadUriPermission);
intent.SetDataAndType (apkUri, "application/vnd.android.package-archive");
diff --git a/SmartHome/SmartHome/UI/SimpleControl/MainPage.cs b/SmartHome/SmartHome/UI/SimpleControl/MainPage.cs
index 9a84137..f76c0e7 100644
--- a/SmartHome/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/SmartHome/SmartHome/UI/SimpleControl/MainPage.cs
@@ -48,9 +48,9 @@
public static string sendTime = "";
public static string recTime = "";
#if wallon
- public static string CodeIDString = "202006011";
+ public static string CodeIDString = "202006021";
#else
- public static string CodeIDString = "2.506011";
+ public static string CodeIDString = "2.506021";
#endif
public static UserInfo LoginUser;
public static string RequestSource = "1"; //0:Zigbee銆�1:HdlOn銆�2:GraphicsMonitor銆�3:BusproSoft銆�4:AgentWeb
diff --git a/SmartHome/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/SmartHome/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index 6424928..eeab2e6 100644
--- a/SmartHome/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/SmartHome/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -970,8 +970,8 @@
EventHandler<MouseEventArgs> UpdateAppEventHandler = (sender, e) => {
#if Android
- UserConfig.Instance.TipUpdataVersion = DateTime.MinValue;
- CheckVersionInfo ();
+ //UserConfig.Instance.TipUpdataVersion = DateTime.MinValue;
+ //CheckVersionInfo ();
//var updateView = new UpdateAppPage ();
//UserMiddle.SettingPageView.AddChidren (updateView);
//updateView.ShowUpdateAppPage ();
--
Gitblit v1.8.0