From e9b3f0a2439f507f1d4e12587e5dbacb578447fb Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 11 Sep 2020 16:48:36 +0800
Subject: [PATCH] update

Former-commit-id: c52d66badb890a3f86517143c347cd19a5f45c9f
Former-commit-id: acfd5badd91d7b36b5a635c788f2e42a58d55b90
---
 labs/doris/DorisTest/Program.cs                    |  4 ++--
 .../wwwroot/pages/iot/device/color-light.html      | 10 +++++-----
 .../WebSPA/wwwroot/pages/iot/device/socket.html    | 14 +++++++-------
 .../WebSPA/wwwroot/pages/iot/device/switch.html    |  6 +++---
 .../WebSPA/wwwroot/pages/iot/device/switch3.html   | 14 +++++++-------
 .../XamarinApp.Android/Properties/AssemblyInfo.cs  |  2 +-
 .../XamarinApp.Android/XamarinApp.Android.csproj   |  4 +++-
 7 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/labs/doris/DorisTest/Program.cs b/labs/doris/DorisTest/Program.cs
index b66bc9e2..636e8621 100644
--- a/labs/doris/DorisTest/Program.cs
+++ b/labs/doris/DorisTest/Program.cs
@@ -33,10 +33,10 @@ namespace DorisTest
             //properties(
             //    "replication_num" = "1"
             //);
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 32; i++)
             {
                 var b = i + 1;
-                Task.Run(() => UpdateDB(b, 10000));
+                Task.Run(() => UpdateDB(b, 100000));
             }
             while (true)
             {
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/color-light.html b/projects/WebSPA/wwwroot/pages/iot/device/color-light.html
index b8197b7f..464282df 100644
--- a/projects/WebSPA/wwwroot/pages/iot/device/color-light.html
+++ b/projects/WebSPA/wwwroot/pages/iot/device/color-light.html
@@ -1,4 +1,4 @@
-<template>
+<template>
     <div class="card color-light" style="box-sizing:border-box;height:150px;margin-top:10px;">
         <div class="card-header">
             {{device.displayName}}
@@ -13,13 +13,13 @@
                 <div class="col-8 align-self-center">
                     <div class="row" style="height:58px;">
                         <input v-on:change="changeHue($event.target.value)" type="range" min="0" step="1" max="255" name="hue" :value="hue" style="height:5px;margin:5px auto;-webkit-appearance:none;background: -webkit-linear-gradient(left, #F00 0%, #FF0 16.66%, #0F0 33.33%, #0FF 50%,#00F 66.66%, #F0F 83.33%, #F00 100%);" />
-                        <input v-on:change="changeSaturation($event.target.value)" type="range" min="0" step="1" max="254" name="saturation" :value="saturation" :style="'height:5px;margin:5px auto;-webkit-appearance:none;background: -webkit-linear-gradient(left, #fff 0%, '+color+' 100%);'"/>
-                        <input v-on:change="changeBrightness($event.target.value)" type="range" min="0" step="1" max="254" name="brightness" :value="brightness" style="height:5px;margin:5px auto;-webkit-appearance:none;background: -webkit-linear-gradient(left, #000 0%, #fff 100%);"/>
+                        <input v-on:change="changeSaturation($event.target.value)" type="range" min="0" step="1" max="254" name="saturation" :value="saturation" :style="'height:5px;margin:5px auto;-webkit-appearance:none;background: -webkit-linear-gradient(left, #fff 0%, '+color+' 100%);'" />
+                        <input v-on:change="changeBrightness($event.target.value)" type="range" min="0" step="1" max="254" name="brightness" :value="brightness" style="height:5px;margin:5px auto;-webkit-appearance:none;background: -webkit-linear-gradient(left, #000 0%, #fff 100%);" />
                     </div>
                 </div>
                 <div class="col-2 align-self-center text-center">
-                    <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" src="config.apigateway+'/IoTCenter/images/on.png'" />
-                    <img style="height:32px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" src="config.apigateway+'/IoTCenter/images/off.png'" />
+                    <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                    <img style="height:32px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
                 </div>
             </div>
         </div>
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/socket.html b/projects/WebSPA/wwwroot/pages/iot/device/socket.html
index aa839c98..f926a357 100644
--- a/projects/WebSPA/wwwroot/pages/iot/device/socket.html
+++ b/projects/WebSPA/wwwroot/pages/iot/device/socket.html
@@ -1,4 +1,4 @@
-<template>
+<template>
     <div class="card socket" style="box-sizing:border-box;height:150px;margin-top:10px;">
         <div class="card-header">
             {{device.displayName}}
@@ -13,9 +13,9 @@
                 <div class="col-9 align-self-center">
                     <div class="row" style="line-height:28px;">
                         <span class="badge badge-info" style="line-height:26px; margin:0 10px 0 0" v-if="getDeviceDataValue(this.device, '电量')">{{electricity}} kW‧h</span>
-                        <span class="badge badge-info" style="line-height:26px; margin:0 10px 0 0" >{{power}} W</span>
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                        <img style="height:32px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
+                        <span class="badge badge-info" style="line-height:26px; margin:0 10px 0 0">{{power}} W</span>
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                        <img style="height:32px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
                     </div>
                 </div>
             </div>
@@ -27,10 +27,10 @@
         props: ['device'],
         computed: {
             electricity: function () {
-                return parseFloat(getDeviceDataValue(this.device, '电量')||0).toFixed(2);
+                return parseFloat(getDeviceDataValue(this.device, '电量') || 0).toFixed(2);
             },
-            power: function (){
-                return parseFloat(getDeviceDataValue(this.device, '功率')||0).toFixed(2);
+            power: function () {
+                return parseFloat(getDeviceDataValue(this.device, '功率') || 0).toFixed(2);
             }
         }
     });
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/switch.html b/projects/WebSPA/wwwroot/pages/iot/device/switch.html
index 9d2df4f8..fc5408df 100644
--- a/projects/WebSPA/wwwroot/pages/iot/device/switch.html
+++ b/projects/WebSPA/wwwroot/pages/iot/device/switch.html
@@ -1,4 +1,4 @@
-<template>
+<template>
     <div class="card switch" style="box-sizing:border-box;height:150px;margin-top:10px;">
         <div class="card-header">
             {{device.displayName}}
@@ -12,8 +12,8 @@
                 </div>
                 <div class="col-9 align-self-center">
                     <div class="row" style="line-height:28px;">
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')=='开'" v-on:click="execApi(device.number,'/Switch/Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')=='关'" v-on:click="execApi(device.number,'/Switch/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')=='开'" v-on:click="execApi(device.number,'/Switch/Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'状态')=='关'" v-on:click="execApi(device.number,'/Switch/On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
                     </div>
                 </div>
             </div>
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/switch3.html b/projects/WebSPA/wwwroot/pages/iot/device/switch3.html
index f8f6b08c..d8ebb78f 100644
--- a/projects/WebSPA/wwwroot/pages/iot/device/switch3.html
+++ b/projects/WebSPA/wwwroot/pages/iot/device/switch3.html
@@ -1,4 +1,4 @@
-<template>
+<template>
     <div class="card switch3" style="box-sizing:border-box;height:150px;margin-top:10px;">
         <div class="card-header">
             {{device.displayName}}
@@ -12,12 +12,12 @@
                 </div>
                 <div class="col-4 align-self-center">
                     <div class="row" style="line-height:28px;">
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L1状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L1Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L1状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L1On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L2状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L2Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L2状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L2On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L3状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L3Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L3状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L3On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L1状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L1Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L1状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L1On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L2状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L2Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L2状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L2On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L3状态')=='开'" v-on:click="execApi(device.number,'/Switch3/L3Off')" :src="config.apigateway+'/IoTCenter/images/on.svg'" />
+                        <img style="height:32px;" v-if="getDeviceDataValue(device,'L3状态')=='关'" v-on:click="execApi(device.number,'/Switch3/L3On')" :src="config.apigateway+'/IoTCenter/images/off.svg'" />
                     </div>
                 </div>
             </div>
diff --git a/projects/XamarinApp/XamarinApp.Android/Properties/AssemblyInfo.cs b/projects/XamarinApp/XamarinApp.Android/Properties/AssemblyInfo.cs
index 445945e3..a42af063 100644
--- a/projects/XamarinApp/XamarinApp.Android/Properties/AssemblyInfo.cs
+++ b/projects/XamarinApp/XamarinApp.Android/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@ using System.Runtime.InteropServices;
 [assembly: Application(UsesCleartextTraffic = true)]
 [assembly: UsesPermission(Android.Manifest.Permission.Internet)]
 [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
-[assembly: AssemblyInformationalVersion("1.0.2")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.9")]
\ No newline at end of file
diff --git a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
index 112b0c0c..5e9a5daf 100644
--- a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
+++ b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj
@@ -37,7 +37,9 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
-    <AndroidKeyStore>true</AndroidKeyStore>
+    <AndroidKeyStore>false</AndroidKeyStore>
+    <AndroidSigningKeyStore>C:\Users\WG\AppData\Local\Xamarin\Mono for Android\Keystore\iot\iot.keystore</AndroidSigningKeyStore>
+    <AndroidSigningStorePass>123456</AndroidSigningStorePass>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>