diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 2b63d17..91d6f28 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 957;
+ public static int VersionCount = 958;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 1ccb298..35f6175 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -1664,6 +1664,7 @@
+
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
index e031194..f02206d 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
@@ -30,13 +30,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.chk15996 = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -166,6 +166,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.panel1 = new System.Windows.Forms.Panel();
+ this.chkDisturbGoodsName = new TemuKJD.UserComponent.UcCheckBox(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -224,6 +225,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx2.Controls.Add(this.chkDisturbGoodsName);
this.ucGroupBoxEx2.Controls.Add(this.chk15996);
this.ucGroupBoxEx2.Controls.Add(this.chk21365);
this.ucGroupBoxEx2.Controls.Add(this.label21);
@@ -1454,19 +1456,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1633,19 +1635,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1707,8 +1709,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
// colSupplierName
//
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle12;
this.colSupplierName.Frozen = true;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
@@ -1786,8 +1788,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
// colProductName
//
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductName.DefaultCellStyle = dataGridViewCellStyle13;
this.colProductName.HeaderText = "商品标题";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -1847,8 +1849,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
// colAddTime
//
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colAddTime.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colAddTime.DefaultCellStyle = dataGridViewCellStyle14;
this.colAddTime.FillWeight = 80F;
this.colAddTime.HeaderText = "上传时间";
this.colAddTime.Name = "colAddTime";
@@ -1952,6 +1954,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.panel1.TabIndex = 189;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
+ // chkDisturbGoodsName
+ //
+ this.chkDisturbGoodsName.AutoSize = true;
+ this.chkDisturbGoodsName.Location = new System.Drawing.Point(845, 38);
+ this.chkDisturbGoodsName.Name = "chkDisturbGoodsName";
+ this.chkDisturbGoodsName.Size = new System.Drawing.Size(75, 21);
+ this.chkDisturbGoodsName.TabIndex = 838;
+ this.chkDisturbGoodsName.Text = "标题打乱";
+ this.chkDisturbGoodsName.UseVisualStyleBackColor = true;
+ //
// PDDDBProdUserSelectForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2134,5 +2146,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
private System.Windows.Forms.Label label13;
private DevComponents.DotNetBar.Controls.Line line1;
private DevComponents.DotNetBar.Controls.Line line2;
+ private UserComponent.UcCheckBox chkDisturbGoodsName;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
index a75fd66..9870f2a 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
@@ -7145,9 +7145,9 @@ Content-Type: image/jpeg
if (!string.IsNullOrEmpty(prodInfo.detail.goods_desc))
pddApi.Data["goods_desc"] = prodInfo.detail.goods_desc;
pddApi.Data["goods_name"] = prodInfo.detail.goods_name;
- if (chkActivity.Checked)
+ if (chkDisturbGoodsName.Checked)
{
- //pddApi.Data["goods_name"] = new string(("精品家用好物很好的产品" + prodInfo.detail.goods_name).ToArray().OrderBy(x => Randomx.GetId(999999)).Take(30).ToArray());
+ pddApi.Data["goods_name"] = new string(("精品家用好物很好的产品" + prodInfo.detail.goods_name).ToArray().OrderBy(x => Randomx.GetId(999999)).Take(30).ToArray());
}
Invoke(new Action(() =>
@@ -7236,7 +7236,7 @@ Content-Type: image/jpeg
propParam.values = new List() { contentOther };
propParamLst.Add(propParam);
}
- else if (propApiInfo.name == "成分含量")
+ else if (propApiInfo.name == "成分含量" && prodInfo.property.goods_properties.Any(p => p.name.Contains("材质")))
{
var contentValue = propApiInfo.values?.FirstOrDefault(v => v.value.Contains("以下"));
if (contentValue != null)
@@ -7448,6 +7448,8 @@ Content-Type: image/jpeg
else
{
skuFakeSpecNameDic1[skuInfo.spec[0].spec_name] = skuInfo.spec[0].parent_name + (skuFakeSpecNameDic1.Keys.Count + 1);
+ //skuFakeSpecNameDic1[skuInfo.spec[0].spec_name] = skuInfo.spec[0].parent_name + (skuFakeSpecNameDic1.Keys.Count + 1) + " 请您下单";
+ //skuFakeSpecNameDic1[skuInfo.spec[0].spec_name] = /*skuInfo.spec[0].parent_name*/ "A00" + (skuFakeSpecNameDic1.Keys.Count + 1) + " 专柜品质 先生请下单";
skuInfo.spec[0].spec_name = skuFakeSpecNameDic1[skuInfo.spec[0].spec_name];
}
}
@@ -7457,8 +7459,9 @@ Content-Type: image/jpeg
skuInfo.spec[1].spec_name = skuFakeSpecNameDic2[skuInfo.spec[1].spec_name];
else
{
- skuFakeSpecNameDic2[skuInfo.spec[1].spec_name] = "" + Randomx.GetId(50, 301) + "个 人买过 " + Randomx.GetId(3000, 12001) + "件 " +
+ skuFakeSpecNameDic2[skuInfo.spec[1].spec_name] = "" + Randomx.GetId(50, 301) + "个 人买过 " + Randomx.GetId(3000, 12001) + "件 " +
skuInfo.spec[1].parent_name + (skuFakeSpecNameDic2.Keys.Count + 1);
+ //skuFakeSpecNameDic2[skuInfo.spec[1].spec_name] = "" + Randomx.GetId(300, 601) + "个 人买了 " + Randomx.GetId(3000, 12001) + "件 ";
skuInfo.spec[1].spec_name = skuFakeSpecNameDic2[skuInfo.spec[1].spec_name];
}
}
@@ -7652,6 +7655,12 @@ Content-Type: image/jpeg
//skuFakeSpecNameDic1
var text1 = skuFakeSpecNameDic1.FirstOrDefault(s => s.Value == addPriceSkuInfoLst[i].spec[0].spec_name).Key;
var text2 = skuFakeSpecNameDic2.FirstOrDefault(s => s.Value == addPriceSkuInfoLst[i].spec[1].spec_name).Key.Replace("无规格", "").Replace("默认规格", "");
+ //if (dbProd.cat_name.Contains("鞋"))
+ // text1 = "阿迪代工" + text1;
+ //if (text1.Length + text2.Length <= 6)
+ // text1 = "专柜产品" + text1;
+ //if (text1.Length + text2.Length <= 6)
+ // text2 = "专柜品质 " + text2; // 专柜正品
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, "到手 " + text1 + " " + text2);
imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, text1 + " " + text2);
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha);
@@ -8081,6 +8090,9 @@ Content-Type: image/jpeg
if (!string.IsNullOrEmpty(text))
{
+ //if (text.Length <= 6)
+ // text = "专柜正品" + text;
+
//var textBg = Properties.Resources.up_spec_text;
//g.DrawImage(textBg, new Rectangle(0, 0, imageBg.Width, imageBg.Height), 0, 0, textBg.Width, textBg.Height, GraphicsUnit.Pixel);
@@ -8118,9 +8130,17 @@ Content-Type: image/jpeg
var textBg = Properties.Resources.up_spec_text;
g.DrawImage(textBg, new Rectangle(0, 0, imageBg.Width, imageBg.Height), 0, 0, textBg.Width, textBg.Height, GraphicsUnit.Pixel);
+ //if (text.Contains("阿迪代工"))
+ //{
+ // var prodLogo = Properties.Resources.prod_logo;
+ // g.DrawImage(prodLogo, new Rectangle(0, 0, 160 * imageBg.Width / 800, 160 * imageBg.Height / 800), 0, 0, prodLogo.Width, prodLogo.Height, GraphicsUnit.Pixel);
+ //}
+
var text1 = "";
var deltaX = 180 * imageBg.Width / 800;
- var colors = new List { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
+ var colors = new List { Color.Red, Color.DarkRed, Color.Green, Color.LightSeaGreen, Color.DarkOrange, Color.Aqua, Color.DeepSkyBlue, Color.Blue, Color.Magenta };
+ var backColors = new List { Color.Black, Color.DarkBlue, Color.Purple, Color.White, Color.LightYellow, Color.SkyBlue };
+ //colors = new List { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
var line = 0;
var textCount = 0;
foreach (var t in text)
@@ -8130,15 +8150,18 @@ Content-Type: image/jpeg
//Font font = new Font("宋体", 20f * imageBg.Height / 800, FontStyle.Regular);
//Font font = new Font("华文琥珀", 22f * imageBg.Height / 800, FontStyle.Regular);
+ List fontNames = new List() { "宋体", "仿宋", "黑体", "微软雅黑" };
+ string fontName = fontNames[Randomx.GetId(fontNames.Count)];
+ fontName = "微软雅黑";
int lineHeight = 76;
- int fontSize = Randomx.GetId(45, 50) * imageBg.Height / 800;
+ int fontSize = Randomx.GetId(40, 50) * imageBg.Height / 800;
if (text.Length >= 15)
{
- fontSize = Randomx.GetId(30, 35) * imageBg.Height / 800;
+ fontSize = Randomx.GetId(28, 35) * imageBg.Height / 800;
lineHeight = 50;
}
- Font font = new Font("微软雅黑", fontSize, FontStyle.Bold);
+ Font font = new Font(fontName, fontSize, FontStyle.Bold);
SizeF textSize = g.MeasureString(text1, font);
@@ -8148,17 +8171,81 @@ Content-Type: image/jpeg
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
//RectangleF rectF = new RectangleF(90, imageBg.Height * 728 / 800, imageBg.Width - 80, imageBg.Height - 80);
int yPos = line * lineHeight * imageBg.Height / 800 + imageBg.Height * 8 / 800 + (Randomx.GetId(16) - 8) * imageBg.Height / 800;
- RectangleF rectF = new RectangleF(deltaX, yPos, deltaX + textSize.Width, yPos + textSize.Height);
+ RectangleF rectF = new RectangleF(deltaX, yPos, textSize.Width, textSize.Height);
+
+ // 先画文字背景再写字
+ //if (1 == 1)
+ //{
+ // var backBrush = new SolidBrush(backColors[Randomx.GetId(backColors.Count)]);
+ // g.FillRectangle(backBrush, rectF);
+ // var pen = new Pen(backColors[Randomx.GetId(backColors.Count)], 2);
+ // g.DrawRectangle(pen, rectF.X, rectF.Y, rectF.Width, rectF.Height);
+ //}
+ // 随机背景
+ //if (Randomx.GetId(4) == 3)
+ //{
+ // var backBrush = new SolidBrush(backColors[Randomx.GetId(backColors.Count)]);
+ // g.FillRectangle(backBrush, rectF);
+ //}
+ //if (Randomx.GetId(4) == 2)
+ //{
+ // var pen = new Pen(backColors[Randomx.GetId(backColors.Count)]);
+ // g.DrawRectangle(pen, rectF.X, rectF.Y, rectF.Width, rectF.Height);
+ //}
+ // 写字
g.DrawString(text1.Trim(), font, textBrush, rectF);
- font = new Font("微软雅黑", fontSize, FontStyle.Regular);
- textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
- rectF = new RectangleF(deltaX, yPos, deltaX + textSize.Width / 2, yPos + textSize.Height);
- g.DrawString(text1.Trim(), font, textBrush, rectF);
+
+ List posXLst = new List();
+ List posYLst = new List();
+ for (int i = 0; i < 3; i++)
+ {
+ posXLst.Add(Randomx.GetId((textSize.Width * 0.2).ParseToInt(), (textSize.Width * 0.8).ParseToInt()));
+ posYLst.Add(Randomx.GetId((textSize.Height * 0.2).ParseToInt(), (textSize.Height * 0.8).ParseToInt()));
+ }
+ posXLst.Add(textSize.Width);
+ posYLst.Add(textSize.Height);
+ posXLst = posXLst.OrderByDescending(px => px).ToList();
+ posYLst = posYLst.OrderByDescending(py => py).ToList();
+
+ foreach(var py in posYLst)
+ {
+ foreach(var px in posXLst)
+ {
+ font = new Font(fontName, fontSize, FontStyle.Regular);
+ textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
+ rectF = new RectangleF(deltaX, yPos, px, py);
+ g.DrawString(text1.Trim(), font, textBrush, rectF);
+
+ //break;
+ }
+
+ //break;
+ }
+
+ //font = new Font("微软雅黑", fontSize, FontStyle.Regular);
+ //textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
+ //rectF = new RectangleF(deltaX, yPos, textSize.Width, textSize.Height);
+ //g.DrawString(text1.Trim(), font, textBrush, rectF);
+
+ //font = new Font("微软雅黑", fontSize, FontStyle.Regular);
+ //textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
+ //rectF = new RectangleF(deltaX, yPos, textSize.Width, textSize.Height / 2);
+ //g.DrawString(text1.Trim(), font, textBrush, rectF);
+
+ //font = new Font("微软雅黑", fontSize, FontStyle.Regular);
+ //textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
+ //rectF = new RectangleF(deltaX, yPos, textSize.Width / 2, textSize.Height);
+ //g.DrawString(text1.Trim(), font, textBrush, rectF);
+
+ //font = new Font("微软雅黑", fontSize, FontStyle.Regular);
+ //textBrush = new SolidBrush(colors[Randomx.GetId(colors.Count)]);
+ //rectF = new RectangleF(deltaX, yPos, textSize.Width / 2, textSize.Height / 2);
+ //g.DrawString(text1.Trim(), font, textBrush, rectF);
deltaX += textSize.Width.ParseToInt();
- if (/*textCount == 2 ||*/ deltaX > imageBg.Width - 80 * imageBg.Width / 800)
+ if (/*textCount == 2 ||*/ deltaX > imageBg.Width - 60 * imageBg.Width / 800)
{
deltaX = 180 * imageBg.Width / 800;
line++;
diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs
index 740c311..9754b57 100644
--- a/TEMUKJD/Properties/Resources.Designer.cs
+++ b/TEMUKJD/Properties/Resources.Designer.cs
@@ -593,6 +593,16 @@ namespace TemuKJD.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap prod_logo {
+ get {
+ object obj = ResourceManager.GetObject("prod_logo", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx
index 9e4e806..59bb89e 100644
--- a/TEMUKJD/Properties/Resources.resx
+++ b/TEMUKJD/Properties/Resources.resx
@@ -268,6 +268,9 @@
..\resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\resources\prod_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\resources\qingqu.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/TEMUKJD/Resources/prod_logo.jpg b/TEMUKJD/Resources/prod_logo.jpg
new file mode 100644
index 0000000..5019bc9
Binary files /dev/null and b/TEMUKJD/Resources/prod_logo.jpg differ