Merge pull request #40 from myvas/update-received-view

Update ReceivedText view

Author: huangxiangyao

Directory.Build.props

@@ -11,7 +11,7 @@
 		<MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
 		<MinVerTagPrefix>v</MinVerTagPrefix>
 		<MinVerDefaultPreReleaseIdentifiers>alpha</MinVerDefaultPreReleaseIdentifiers>
-		<MinVerIgnoreHeight>true</MinVerIgnoreHeight>
+		<MinVerIgnoreHeight>false</MinVerIgnoreHeight>
 		<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
 	</PropertyGroup>
 	<Target Name="CustomFileVersion" AfterTargets="MinVer">

src/MvcDemo/Views/Weixin/ReceivedText.cshtml

@@ -1,48 +1,51 @@
-@model ReturnableViewModel<IEnumerable<MessageReceivedEntry>>
+@model ReturnableViewModel<IList<WeixinReceivedMessageEntity>>
 
 @{
     ViewData["Title"] = "Received Text";
 }
 
 <h2>@ViewData["Title"] (@Model.Item.Count())</h2>
 
-
-@foreach (var item in Model.Item.Where(x => x is TextMessageReceivedEntry).Select(x => x as TextMessageReceivedEntry).ToList())
+@foreach (var item in Model.Item)
 {
-    //if (itemEntry is TextMessageReceivedEntry item)
-    {
-        <div class="media">
-            @*<img class="mr-3" src="@item.headimgurl" style="width:64px;" />*@
-            <div class="media-body">
-                @*<h5 class="mt-0">
-                    <span>@item.From</span>
-                    @{
-                    switch (item.sex)
-                    {
-                    case 1:
-                    <i class="fas fa-mars text-primary"></i>
-                    break;
-                    case 2:
-                    <i class="fas fa-venus text-danger"></i>
-                    break;
-                    default:
-                    break;
-                    }
-                    }
-                    </h5>*@
-                <dl class="dl-horizontal">
-                    <dt>OpenId</dt>
-                    <dd>
-                        <div class="text-truncate" style="width:150px;" data-container="body" data-toggle="popover" data-placement="bottom" data-content="@item.FromUserName">@item.FromUserName</div>
-                    </dd>
+    <div class="media">
+        <div class="media-body">
+            <dl class="dl-horizontal">
+                <dt>OpenId</dt>
+                <dd>
+                    <div class="text-truncate" style="width:150px;" data-container="body" data-toggle="popover"
+                        data-placement="bottom" data-content="@item.FromUserName">@item.FromUserName</div>
+                </dd>
+                @if (!string.IsNullOrEmpty(item.Content))
+                {
                     <dt>Content</dt>
                     <dd>@item.Content</dd>
-                    <dt>Received Time</dt>
-                    <dd>@item.GetCreateTime()?.ToLocalTime().ToString("yyyy-MM-dd hh:mm:ss")</dd>
-                </dl>
-                <a asp-action="SendWeixin" asp-route-openid="@item.FromUserName">发送微信消息</a>
-            </div>
+                }
+                @if(!string.IsNullOrEmpty(item.Url))
+                {
+                    <dt>Url</dt>
+                    <dd>@item.Url</dd>
+                }
+                @if(!string.IsNullOrEmpty(item.PicUrl))
+                {
+                    <dt>PicUrl</dt>
+                    <dd>@item.PicUrl</dd>
+                }
+                @if(!string.IsNullOrEmpty(item.MediaId))
+                {
+                    <dt>media Id</dt>
+                    <dd>@item.MediaId</dd>
+                }
+                @if(!string.IsNullOrEmpty(item.ThumbMediaId))
+                {
+                    <dt>mThumbmedia Id</dt>
+                    <dd>@item.ThumbMediaId</dd>
+                }
+                <dt>Received Time</dt>
+                <dd>@(new UnixDateTime(item.CreateTime ?? 0).DateTime.ToLocalTime().ToString("yyyy-MM-dd hh:mm:ss"))</dd>
+            </dl>
+            <a asp-action="SendWeixin" asp-route-openid="@item.FromUserName">发送微信消息</a>
         </div>
-        <hr />
-    }
+    </div>
+    <hr />
 }

src/MvcDemo/Views/Weixin/Subscribers.cshtml

@@ -38,12 +38,22 @@ else
 					<dd>
 						<div class="text-truncate" style="width:150px;" data-container="body" data-toggle="popover" data-placement="bottom" data-content="@item.OpenId">@item.OpenId</div>
 					</dd>
+					<dt>UnionId</dt>
+					<dd>@item.UnionId</dd>
 					<dt>Province</dt>
 					<dd>@item.Province</dd>
 					<dt>City</dt>
 					<dd>@item.City</dd>
-					<dt>Subscribe Time</dt>
-					<dd>@item.SubscribeTime?.ToString("yyyy-MM-dd HH:mm:ss")</dd>
+					@if(item.SubscribeTime.HasValue)
+					{
+						<dt>Subscribe Time</dt>
+						<dd>@(new UnixDateTime(item.SubscribeTime??0).DateTime.ToString("yyyy-MM-dd HH:mm:ss"))</dd>
+					}					
+					@if(!item.Subscribed && item.UnsubscribeTime.HasValue)
+					{
+						<dt>Unsubscribe Time</dt>
+						<dd>@(new UnixDateTime(item.UnsubscribeTime??0).DateTime.ToString("yyyy-MM-dd HH:mm:ss"))</dd>
+					}
 				</dl>
 				<a asp-action="SendWeixin" asp-route-openid="@item.OpenId">发送微信消息</a>
 			</div>