2020-06-04 1.更新。

JLChen

2020-06-04 6d55af8792cf8fbef0055e677b900fc352dba9a2

2020-06-04 1.更新。

 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 ();
            //});
        }
    }
}

 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>

 SmartHome/ON/Application.cs

@@ -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,8 +302,7 @@
                else if (JPushInterface.ActionRegistrationId == intent.Action) {
                    string regId = bundle.GetString (JPushInterface.ExtraRegistrationId);
                    //System.Console.WriteLine ("Registration ID:" + regId);
                }
                else if (JPushInterface.ActionNotificationOpened == intent.Action) {
                } else if (JPushInterface.ActionNotificationOpened == intent.Action) {
                Console.WriteLine ("用户点击打开了通知");
                    Application.IsShowTip = false;


 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" />

 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);
                //添加这一句表示对目标应用临时授权该Uri所代表的文件
                intent.AddFlags (ActivityFlags.GrantReadUriPermission);
                intent.SetDataAndType (apkUri, "application/vnd.android.package-archive");

 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

 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 ();