pengcong001
/
qymessagecenter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整模板

master
shanji 1 year ago
parent
73873d7f9d
commit
64f701c949
9 changed files with 66 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      QYMessageCenter.Client/App.xaml.cs
  2. 1
      QYMessageCenter.Client/GlobalContext.cs
  3. 2
      QYMessageCenter.Client/MainWindow.xaml.cs
  4. 3
      QYMessageCenter.Client/Models/MappingProfile.cs
  5. 61
      QYMessageCenter.Client/PopupWindow.xaml
  6. 13
      QYMessageCenter.Client/TemplateSelector/MessageTemplateSelector.cs
  7. 4
      QYMessageCenter.Client/static/index.html
  8. 6
      QYMessageCenter.Model/DTO/Message/SendMessageRequest.cs
  9. 7
      QYMessageCenter.Model/MappingProfiles.cs

8
QYMessageCenter.Client/App.xaml.cs
View File

@ -4,8 +4,6 @@ using QYMessageCenter.Client.Helpers;
using QYMessageCenter.Client.Models;
using QYMessageCenter.Common.Extensions;
using QYMessageCenter.Common.Http;
using System.Configuration;
using System.Data;
using System.Windows;
namespace QYMessageCenter.Client
@ -23,9 +21,9 @@ namespace QYMessageCenter.Client
#if DEBUG
//齐越山鸡
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
//userToken="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzQwMTM3NzY5fQ.Wq7IRvAkrVpn28Bj3ImG_KAg9MZ3C2Ux84vSjXyd0ZY"; //测试
//userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
//测试
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzQwMTM3NzY5fQ.Wq7IRvAkrVpn28Bj3ImG_KAg9MZ3C2Ux84vSjXyd0ZY";
#else
var tokenResult = ReadMMF();

1
QYMessageCenter.Client/GlobalContext.cs
View File

@ -117,6 +117,7 @@ namespace QYMessageCenter.Client
AppCode = "PJZS",
ShopId = "12899501",
Title = "信奉玩具专营店",
CustomTypeCode = "NOTASK",
Content = "上架sku失败-com,jd.bk,saf.exception.SafJosException:这是一个普通模板消息",
});
});

2
QYMessageCenter.Client/MainWindow.xaml.cs
View File

@ -66,7 +66,7 @@ namespace QYMessageCenter.Client
var htmlPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "static", "index.html");
wb2.CoreWebView2.Navigate(htmlPath);
this.Visibility = Visibility.Collapsed;
//this.Visibility = Visibility.Collapsed;
//globalContext.Test();
}

3
QYMessageCenter.Client/Models/MappingProfile.cs
View File

@ -1,4 +1,5 @@
using AutoMapper;
using QYMessageCenter.Client.Models.Msg;
namespace QYMessageCenter.Client.Models
{
@ -17,6 +18,8 @@ namespace QYMessageCenter.Client.Models
CreateMap<PurchaseAccountResponse, PurchaseAccount>();
CreateMap<DepartmentResponse, Department>();
CreateMap<Message, Message_PJZS_SHANGJIASHIBAI>();
}
}
}

61
QYMessageCenter.Client/PopupWindow.xaml
View File

@ -7,7 +7,7 @@
xmlns:c="clr-namespace:SJ.Controls;assembly=SJ.Controls"
xmlns:templateSelector="clr-namespace:QYMessageCenter.Client.TemplateSelector"
mc:Ignorable="d"
Title="PopupWindow" Height="260" Width="350"
Title="PopupWindow" Height="265" Width="350"
MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed"
CloseButtonVisibility="Collapsed"
@ -31,13 +31,14 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="80"/>
<RowDefinition Height="70"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding AppCode,Converter={StaticResource appCodeCtr}}"
VerticalAlignment="Center" Margin="10,0,0,0" FontSize="14"/>
VerticalAlignment="Center" Margin="22,0,0,0" FontSize="18"/>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="25"/>
<RowDefinition Height="25"/>
<RowDefinition/>
</Grid.RowDefinitions>
@ -45,14 +46,16 @@
<ColumnDefinition Width="90"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<c:BAsyncImage UrlSource="{Binding SpuLogo}" DecodePixelWidth="70" Width="70"
Grid.RowSpan="2"
<c:BAsyncImage UrlSource="{Binding SpuLogo}" Margin="15,2,0,0" DecodePixelWidth="60" Width="60"
Grid.RowSpan="3"
VerticalAlignment="Top"/>
<TextBlock Grid.Column="1">
<Run Text="活动名称:" Foreground="{StaticResource Text.Property.Color}"/>
<TextBlock Text="任务执行失败" Grid.Column="1"/>
<TextBlock Grid.Column="1" Grid.Row="1">
<Run Text="活动:" Foreground="{StaticResource Text.Property.Color}"/>
<Run Text="{Binding ActivityName}"/>
</TextBlock>
<TextBlock Grid.Column="1" Grid.Row="1" VerticalAlignment="Top">
<TextBlock Grid.Column="1" Grid.Row="2" VerticalAlignment="Top">
<Run Text="SPU:" Foreground="{StaticResource Text.Property.Color}"/>
<Run Text="{Binding MainProductSpu}"/>
</TextBlock>
@ -60,31 +63,44 @@
<TextBlock Text="{Binding ErrorMsg}"
TextWrapping="Wrap"
Grid.Row="2"
Margin="10,0"/>
Margin="22,0"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="Template_Normal">
<DataTemplate x:Key="Template_PJZS_NOTASK">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="20"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding AppCode,Converter={StaticResource appCodeCtr}}"
VerticalAlignment="Center" Margin="10,0,0,0" FontSize="14"/>
<TextBlock Text="{Binding Content}" Grid.Row="1" Margin="10,0" TextWrapping="Wrap"/>
VerticalAlignment="Center" Margin="22,0,0,0" FontSize="18"/>
<TextBlock Text="无可执行的任务" Grid.Row="1" Margin="22,0" Foreground="{StaticResource Text.Property.Color}"/>
<TextBlock Text="{Binding Content}" Grid.Row="2" Margin="22,0" TextWrapping="Wrap"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="Template_Normal">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding AppCode,Converter={StaticResource appCodeCtr}}"
VerticalAlignment="Center" Margin="22,0,0,0" FontSize="18"/>
<TextBlock Text="{Binding Content}" Grid.Row="1" Margin="22,0" TextWrapping="Wrap"/>
</Grid>
</DataTemplate>
<templateSelector:MessageTemplateSelector x:Key="mtSelector"
Template_Normal="{StaticResource Template_Normal}"
Template_PJZS_SHANGJIASHIBAI="{StaticResource Template_PJZS_SHANGJIASHIBAI}"/>
Template_PJZS_SHANGJIASHIBAI="{StaticResource Template_PJZS_SHANGJIASHIBAI}"
Template_PJZS_NOTASK="{StaticResource Template_PJZS_NOTASK}"/>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="35"/>
<RowDefinition Height="32"/>
<RowDefinition/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
@ -92,11 +108,12 @@
<Border BorderBrush="{StaticResource Border.Brush}"
Background="{StaticResource Border.Background}"/>
<TextBlock Text="{Binding Msg.Title}" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0,0,0"
<TextBlock Text="{Binding Msg.Title}" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="14,0,0,0"
Foreground="White" FontSize="14"/>
<c:BButton HorizontalAlignment="Right" Margin="0,0,10,0" BorderThickness="0"
x:Name="btn_Close" Click="btn_Close_Click">
<c:BButton HorizontalAlignment="Right" Margin="0,0,14,0" BorderThickness="0"
x:Name="btn_Close" Click="btn_Close_Click"
Background="#0CFFFFFF" WindowChrome.IsHitTestVisibleInChrome="True">
<Path x:Name="p" Stretch="Uniform" SnapsToDevicePixels="True" UseLayoutRounding="True"
Data="M814.060 781.227q-67.241-67.241-269.773-269.773 67.241-67.241 269.773-269.773 5.671-6.481 5.671-12.962 0 0-0.81-0.81 0-6.481-4.861-9.722-4.861-4.051-11.342-4.861-0.81 0-0.81 0-5.671 0-11.342 4.861-89.924 89.924-269.773 269.773-67.241-67.241-269.773-269.773-4.861-4.861-12.962-4.861-7.291 0.81-10.532 4.861-5.671 5.671-5.671 11.342 0 6.481 5.671 12.152 89.924 89.924 269.773 269.773-67.241 67.241-269.773 269.773-11.342 11.342 0 23.494 12.152 11.342 23.494 0 89.924-89.924 269.773-269.773 67.241 67.241 269.773 269.773 5.671 5.671 11.342 5.671 5.671 0 12.152-5.671 4.861-5.671 4.861-12.962 0-6.481-4.861-10.532z"
Width="14" Height="14" Stroke="White"/>
@ -106,14 +123,16 @@
<c:BButton Style="{StaticResource LinkButton}"
Content="查看详情"
Grid.Row="2"
Margin="10,0,0,0"
HorizontalAlignment="Left"/>
Margin="22,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"/>
<c:BButton x:Name="btn_showNext" Style="{StaticResource LinkButton}"
Content="下一条"
Grid.Row="2"
Margin="0,0,10,0"
Margin="0,0,22,0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Click="btn_showNext_Click"/>
<ContentControl Content="{Binding Msg,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ContentTemplateSelector="{StaticResource mtSelector}"

13
QYMessageCenter.Client/TemplateSelector/MessageTemplateSelector.cs
View File

@ -6,9 +6,16 @@ namespace QYMessageCenter.Client.TemplateSelector
{
public class MessageTemplateSelector : DataTemplateSelector
{
#region PJZS
public DataTemplate Template_PJZS_SHANGJIASHIBAI { get; set; }
public DataTemplate Template_PJZS_NOTASK { get; set; }
#endregion
public DataTemplate Template_Normal { get; set; }
public DataTemplate Template_PJZS_SHANGJIASHIBAI { get; set; }
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
@ -19,9 +26,9 @@ namespace QYMessageCenter.Client.TemplateSelector
if (msg.AppCode == "PJZS")
{
if (msg.CustomTypeCode == "SHANGJIASHIBAI")
{
return Template_PJZS_SHANGJIASHIBAI;
}
else if(msg.CustomTypeCode == "NOTASK")
return Template_PJZS_NOTASK;
}
return Template_Normal;

4
QYMessageCenter.Client/static/index.html
View File

@ -11,8 +11,10 @@
<script type="text/javascript" async>
var user;
var goeasy;
var hostOjbect;
async function init() {
var hostOjbect = await window?.chrome?.webview?.hostObjects?.sync?.qymsgcenter;
hostOjbect = await window?.chrome?.webview?.hostObjects?.sync?.qymsgcenter;
var userString = hostOjbect.GetUserString();
user = JSON.parse(userString);
//alert(user.Name);

6
QYMessageCenter.Model/DTO/Message/SendMessageRequest.cs
View File

@ -41,14 +41,8 @@ namespace QYMessageCenter.Model.DTO
/// <summary>
/// 自定义类型编码
/// </summary>
[Required(ErrorMessage = "自定义类型编码不能为空")]
public string CustomTypeCode { get; set; }
/// <summary>
/// 已读人员
/// </summary>
public string ReaderId { get; set; }
/// <summary>
/// 发送人
/// </summary>

7
QYMessageCenter.Model/MappingProfiles.cs
View File

@ -1,4 +1,7 @@
namespace QYMessageCenter.Model
using QYMessageCenter.Model.DB;
using QYMessageCenter.Model.DTO;
namespace QYMessageCenter.Model
{
public class MappingProfiles : AutoMapper.Profile
{
@ -6,7 +9,7 @@
public MappingProfiles()
{
CreateMap<SendMessageRequest, QYNotification>();
}
}
}

Write Preview
Loading…
Cancel
Save