Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2fac37f

Browse files
AigioLAigioL
committed
Replace with package XAB.TinyPinyin & fix UnitTest
1 parent b045c98 commit 2fac37f

24 files changed

Lines changed: 249 additions & 285 deletions

‎Directory.Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177

178178
<!-- Pinyin -->
179179
<PackageVersion Include="TinyPinyin.Net" Version="1.0.2" />
180+
<PackageVersion Include="XAB.TinyPinyin" Version="2.0.4.2" />
180181

181182
<!-- Win32/Windows -->
182183
<PackageVersion Include="TaskScheduler" Version="2.10.1" />
@@ -261,7 +262,7 @@
261262
<PackageVersion Include="Square.Picasso" Version="2.71828.0" />
262263
<!--<PackageVersion Include="LeakCanaryBinding" Version="1.5.1.1" />-->
263264
<!--<PackageVersion Include="TencentOpenApiSDK.Android" Version="3.5.4.11" />-->
264-
<PackageVersion Include="XAB.FlexboxLayout" Version="3.0.0" />
265+
<PackageVersion Include="XAB.FlexboxLayout" Version="3.0.0.1" />
265266

266267
<!-- V2Ray -->
267268
<PackageVersion Include="XAB.AndroidLibV2rayLite" Version="1.0.0.1" />

‎references/Android Assets/cncity.txt‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+

2+
DU'LAN 都兰
3+
ZHA'SHUI 柞水
4+
LU'HE 六合
5+
JUN'LIAN 筠连
6+
JIANG'DU 江都
7+
BAI'XIANG 柏乡
8+
CHANG'YANG 长阳
9+
CHANG'CHUN 长春
10+
CHANG'BAI 长白
11+
CHENG'DU 成都
12+
MIN'HANG 闵行
13+
XIN'DU 新都
14+
TIAN'CHANG 天长
15+
PAN'YU 番禺
16+
DU'YUN 都匀
17+
CHANG'YUAN 长垣
18+
CHANG'ZHI'XIAN 长治县
19+
WU'DU 武都
20+
CHEN'QIU 沈丘
21+
WEN'XIU 温宿
22+
BENG'BU 蚌埠
23+
CHANG'SHUN 长顺
24+
BI'YANG 泌阳
25+
SHEN'XIAN 莘县
26+
DA'BU 大埔
27+
TA'SHI'KU'ER'GAN 塔什库尔干
28+
SAN'DU 三都
29+
YAN'DU 盐都
30+
ZI'CHANG 子长
31+
YU'DU 于都
32+
MIN'YUE 民乐
33+
HUA'DU 花都
34+
SHANG'DU 商都
35+
DU'CHANG 都昌
36+
KE'SHI'KE'TENG'QI 克什克腾旗
37+
YAN'CHANG 延长
38+
CHANG'BAI'SHAN 长白山
39+
NING'DU 宁都
40+
ZENG'MU'AN'SHA 曾母暗沙
41+
NAN'YUE 南乐
42+
CHANG'WU 长武
43+
CHANG'NING 长宁
44+
CHANG'AN 长安
45+
CHONG'QING 重庆
46+
HANG'TANG 行唐
47+
GA'SHI 伽师
48+
CHANG'SHOU 长寿
49+
SUI'LING 绥棱
50+
CHANG'TING 长汀
51+
FAN'SHI 繁峙
52+
CHANG'SHA 长沙
53+
CHANG'DAO 长岛
54+
XIA'MEN 厦门
55+
CHANG'LING 长岭
56+
CHANG'TAI 长泰
57+
YU'LI 尉犁
58+
LU'AN 六安
59+
BA'XIU 八宿
60+
CHANG'HAI 长海
61+
MU'PING 牟平
62+
A'TU'SHI 阿图什
63+
CHANG'ZHI'SHI 长治市
64+
CHANG'QING 长清
65+
CHANG'FENG 长丰
66+
CHANG'LE 长乐
67+
FENG'DU 丰都
68+
KA'SHI 喀什
69+
TONG'BAI 桐柏
70+
YUE'QING 乐清
71+
ZHONG'MU 中牟
72+
SHI'FANG 什邡
73+
WU'SHI 乌什
74+
DU'AN 都安
75+
LAO'TING 乐亭
76+
WU'BU 吴堡
77+
NA'QU 那曲
78+
SHAN'XIAN 单县
79+
NA'PO 那坡
80+
JU'MO 且末
81+
CHANG'XING 长兴
82+
GONG'CHANG'LING 弓长岭
83+
CHANG'DU 昌都
84+
XIAO'TING 猇亭
85+
GUO'YANG 涡阳
86+
QIAN'WEI 犍为
87+
WANG'DU 望都
88+
LUE'YANG 略阳
89+
SHUANG'BAI 双柏
90+
CHANG'SHA'XIAN 长沙县
91+
XIN'YUE 新乐
92+
CHANG'GE 长葛
93+
CUO'NA 错那
94+
DU'JIANG'YAN 都江堰
95+
LANG'QIA'ZI 浪卡子
96+
XING'YANG 荥阳
97+
LU'QU 碌曲
98+
HUANG'PI 黄陂

‎resources/ProjectPathUtil.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static partial class ProjectPathUtil
2828
public const string MainDllPath_ =
2929
@"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Steam++.dll";
3030

31-
[Obsolete("use DirPublishWinX86_", true)]
31+
[Obsolete("use DirPublishWinX86_")]
3232
public const string DirPublishWinX86 =
3333
@"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x86";
3434

‎src/Common.CoreLib/Application/Services/Implementation/ModelValidator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ModelValidator : IModelValidator
1313
static readonly IDictionary<Type, object> validators = new Dictionary<Type, object>();
1414

1515
public static void AddColumnValidate<T>(Func<T, string?> validate)
16-
=> validators.Add(typeof(T), validate);
16+
=> validators.TryAdd(typeof(T), validate);
1717

1818
const string I = "I";
1919
const string IReadOnly = "IReadOnly";

‎src/Common.CoreLib/Properties/InternalsVisibleTo.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
[assembly: InternalsVisibleTo("System.Common.UnitTest.Droid" + PublicKey)]
77
[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.UnitTest" + PublicKey)]
88
[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Desktop.UnitTest" + PublicKey)]
9-
[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Droid.UnitTest" + PublicKey)]
9+
[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Droid.UnitTest" + PublicKey)]
10+
[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Droid.UnitTest.App" + PublicKey)]

‎src/Common.PinyinLib.TinyPinyin/Common.PinyinLib.TinyPinyin.csproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) Or $(TargetFramework.Contains('-android')) ">
1010
<AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>
11-
<IsBindingProject>true</IsBindingProject>
11+
<!--<IsBindingProject>true</IsBindingProject>-->
12+
<DefineConstants>ANDROID;$(DefineConstants)</DefineConstants>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
@@ -28,26 +29,27 @@
2829
</ItemGroup>
2930

3031
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) Or $(TargetFramework.Contains('-android')) ">
31-
<EmbeddedJar Include="Jars\ahocorasick-0.3.0.jar" />
32+
<!--<EmbeddedJar Include="Jars\ahocorasick-0.3.0.jar" />
3233
<EmbeddedJar Include="Jars\tinypinyin-2.0.3.jar" />
3334
<EmbeddedJar Include="Jars\tinypinyin-android-asset-lexicons-2.0.3.jar" />
3435
<LibraryProjectZip Include="Jars\tinypinyin-lexicons-android-cncity-2.0.3.aar" />
35-
<TransformFile Include="Transforms\Metadata.xml" />
36+
<TransformFile Include="Transforms\Metadata.xml" />-->
37+
<PackageReference Include="XAB.TinyPinyin" />
3638
</ItemGroup>
3739

3840
<ItemGroup Condition=" !($(TargetFramework.StartsWith('MonoAndroid')) Or $(TargetFramework.Contains('-android'))) ">
39-
<Compile Remove="Jars\**" />
41+
<!--<Compile Remove="Jars\**" />
4042
<EmbeddedResource Remove="Jars\**" />
4143
<None Remove="Jars\**" />
4244
<Compile Remove="Transforms\**" />
4345
<EmbeddedResource Remove="Transforms\**" />
44-
<None Remove="Transforms\**" />
46+
<None Remove="Transforms\**" />-->
4547
<PackageReference Include="TinyPinyin.Net" />
4648
</ItemGroup>
4749

48-
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
50+
<!--<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
4951
<Compile Remove="obj\Debug\net6.0-android\**" />
5052
<Compile Remove="obj\Release\net6.0-android\**" />
51-
</ItemGroup>
53+
</ItemGroup>-->
5254

5355
</Project>

‎src/Common.PinyinLib.TinyPinyin/Engine.cs‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎src/Common.PinyinLib.TinyPinyin/ISegmentationSelector.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Common.PinyinLib.TinyPinyin/Jars/README.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Common.PinyinLib.TinyPinyin/Jars/ahocorasick-0.3.0.jar‎

-20.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)