From fce62de6533d85a2381e275017542861ecd3c806 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 07 四月 2021 14:18:25 +0800
Subject: [PATCH] 2021-4-7-1

---
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs      |   12 +++---
 .vs/HDL_APP_Project/xs/UserPrefs.xml                         |   41 +++++++++++---------
 HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs |    6 +-
 HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs |    7 +--
 HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs    |    6 +-
 5 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f9d32a6..60afe34 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,34 +1,39 @@
 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs">
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini">
     <Files>
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="48" Column="10" />
-      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
-      <File FileName="HDL-ON_iOS/Resources/Language.ini" />
-      <File FileName="HDL_ON/Common/R.cs" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="116" Column="54" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="70" Column="57" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs" Line="99" Column="16" />
-      <File FileName="HDL_ON/Entity/FunctionList.cs" Line="131" Column="22" />
-      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="279" Column="76" />
+      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="464" Column="40" />
+      <File FileName="HDL_ON/Common/R.cs" Line="1" Column="1" />
+      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1" Column="1" />
+      <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
+      <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="84" Column="98" />
+      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="254" Column="72" />
+      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1454" Column="33" />
+      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="29" Column="10" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="HDL_APP_Project" expanded="True">
             <Node name="HDL_ON" expanded="True">
-              <Node name="Common" expanded="True">
-                <Node name="ApiUtlis.cs" selected="True" />
+              <Node name="Common" expanded="True" />
+              <Node name="DAL" expanded="True">
+                <Node name="Server" expanded="True" />
               </Node>
-              <Node name="DAL" expanded="True" />
-              <Node name="Entity" expanded="True" />
               <Node name="UI" expanded="True">
                 <Node name="UI2" expanded="True">
-                  <Node name="4-PersonalCenter" expanded="True" />
                   <Node name="FuntionControlView" expanded="True">
                     <Node name="Video" expanded="True" />
                   </Node>
                 </Node>
+              </Node>
+            </Node>
+            <Node name="HDL-ON_Android" expanded="True">
+              <Node name="Assets" expanded="True">
+                <Node name="Language.ini" selected="True" />
+              </Node>
+              <Node name="Other" expanded="True">
+                <Node name="JPush" expanded="True" />
               </Node>
             </Node>
             <Node name="HDL-ON_iOS" expanded="True">
@@ -45,8 +50,8 @@
     <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
     <String>Shared.IOS/Shared.IOS.csproj</String>
   </DisabledProjects>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.4b65c4650918" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index e70db56..88f2e84 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -4,7 +4,6 @@
 using Shared;
 using HDL_ON.Stan;
 using ZXing.QrCode.Internal;
-using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod;
 
 namespace HDL_ON.UI.UI2.FuntionControlView.Video
 {
@@ -348,13 +347,13 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = StringId.baolu30,
             };
-            bjFl.AddChidren(regionBtn);
+            //bjFl.AddChidren(regionBtn);
 
             var vv = new VerticalRefreshLayout
             {
                 X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(58 + 17),
-                Height = Application.GetRealHeight(458 - 17),
+                Y = Application.GetRealHeight(58),
+                Height = Application.GetRealHeight(458),
                 Width = Application.GetRealWidth(295),
             };
             bjFl.AddChidren(vv);
@@ -394,7 +393,6 @@
                     frameLayout60.btnTime.Text = getTime(call.callTime);
                     ///鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級锛涙槸鍚﹀紑閿侊紱
                     frameLayout60.btnStateText.Text = getStateText(call.callStatus) + "," + getUnlockText(call.isUnlock);
-
                 }
 
             }
@@ -461,7 +459,9 @@
         {
             var utcTime = Convert.ToDateTime(str);
             var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
-            return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+            var monday = dateTime.ToString("MM") + Language.StringByID(StringId.month) + dateTime.ToString("dd") + Language.StringByID(StringId.day);
+            var time = dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+            return monday + " " + time;
         }
         /// <summary>
         /// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
index fa8d245..53c9190 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout50.cs
@@ -8,10 +8,10 @@
         /// <summary>
         /// 涓绘帶浠禫iew
         /// </summary>
-        public FrameLayout frameLayout = new FrameLayout
+        public RowLayout frameLayout = new RowLayout
         {
             Height = Application.GetRealHeight(50),
-            // BackgroundColor = CSS.CSS_Color.view,
+            LineColor = CSS.CSS_Color.view,
         };
         /// <summary>
         /// 鏂囨湰鎻忚堪
@@ -36,7 +36,7 @@
         /// View鐨勬柟娉�
         /// </summary>
         /// <returns></returns>
-        public FrameLayout FLayoutView()
+        public RowLayout FLayoutView()
         {
             frameLayout.AddChidren(btnText);
             frameLayout.AddChidren(btnClick);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
index 9eb9fc4..20c5da2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
@@ -8,10 +8,10 @@
         /// <summary>
         /// 涓绘帶浠禫iew
         /// </summary>
-        public FrameLayout frameLayout = new FrameLayout
+        public RowLayout frameLayout = new RowLayout
         {
             Height = Application.GetRealHeight(60),
-            //BackgroundColor = CSS.CSS_Color.view,
+            LineColor = CSS.CSS_Color.view,
         };
 
         /// <summary>
@@ -53,7 +53,6 @@
             TextSize = TextSize.text12,
             TextColor = CSS.CSS_Color.textCancelColor,
             TextAlignment = TextAlignment.CenterLeft,
-            Text = "宸叉帴鍚�, 宸插紑閿�",
         };
 
 
@@ -88,7 +87,7 @@
         /// View鐨勬柟娉�
         /// </summary>
         /// <returns></returns>
-        public FrameLayout FLayoutView()
+        public RowLayout FLayoutView()
         {
             frameLayout.AddChidren(btnText);
             frameLayout.AddChidren(btnTime);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
index 42bcf97..814a7ed 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
@@ -125,12 +125,12 @@
             //瀵嗙爜
             Button btnpaw = new Button()
             {
-                X=Application.GetRealWidth(100),
+                X=Application.GetRealWidth(95),
                 Y = Application.GetRealHeight(62),
                 Height = Application.GetRealHeight(32),
-                Width = Application.GetRealWidth(82),
+                Width = Application.GetRealWidth(82+5),
                 TextColor = MusicColor.SelectedColor,
-                TextSize =24,
+                TextSize =20,//24
                 TextAlignment = TextAlignment.Center,
                 IsBold = true,
                 Text = str1,

--
Gitblit v1.8.0