Compare commits

..

2 Commits

Author SHA1 Message Date
胡宇飞 11002aaccd update: 更新 SKADNetwork 文件 (2024/6/27)
Signed-off-by: huyufei <yufei.hu@castbox.fm>
2024-07-29 19:16:50 +08:00
胡宇飞 88d29fe2f2 update: 暂时移除 UserProguard 修复器
--story=1020956 --user=yufei.hu 【中台】【Android】构建插件 API 升级 34 验证 https://www.tapd.cn/33527076/s/1160300

Signed-off-by: huyufei <yufei.hu@castbox.fm>
2024-07-29 19:06:12 +08:00
4 changed files with 185 additions and 63 deletions

View File

@ -1,3 +1,6 @@
using System.Collections.Generic;
using NUnit.Framework;
#if UNITY_ANDROID
namespace Guru
{
@ -13,7 +16,8 @@ namespace Guru
/// Android混淆器内容填充
/// 于应用构建前执行
/// </summary>
public class UserProguardHelper: IPreprocessBuildWithReport
// public class UserProguardHelper: IPreprocessBuildWithReport
public class UserProguardHelper
{
public int callbackOrder { get; } = 0;
public void OnPreprocessBuild(BuildReport report)
@ -27,7 +31,6 @@ namespace Guru
string proguardPath = $"{Application.dataPath}/Plugins/Android/proguard-user.txt";
if (File.Exists(proguardPath))
{
List<string> keeps = new List<string>();
DirectoryInfo dir = new DirectoryInfo(Application.dataPath);
string raw = File.ReadAllText(proguardPath);
@ -42,33 +45,37 @@ namespace Guru
// Debug.Log($"--- Proguard Files: {files.Length}");
string[] lens = null;
string l = "";
ProguardItemBuilder builder = new ProguardItemBuilder();
var allItems = new List<ProguardItem>(30);
string[] lines = null;
for (int i = 0; i < files.Count; i++)
{
lens = File.ReadAllLines(files[i].FullName);
foreach (var s in lens)
lines = File.ReadAllLines(files[i].FullName);
var items = builder.BuildItemsFormLines(lines);
if(items != null && items.Count > 0) allItems.AddRange(items);
}
List<string> finalLines = new List<string>(50);
foreach (var item in allItems)
{
l = s.TrimStart();
if(string.IsNullOrEmpty(l)) continue;
if(raw.Contains(l)) continue;
keeps.Add(l);
Debug.Log($"--- ✏️ Apply: [ {l} ]");
}
}
finalLines.AddRange(item.lines);
}
if (keeps.Count == 0) return; // 无注入文件则退出
List<string> lines = File.ReadAllLines(proguardPath).ToList();
lines.Add("");
lines.AddRange(keeps);
File.WriteAllLines(proguardPath, lines.ToArray());
File.WriteAllLines(proguardPath, finalLines.ToArray());
Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
}
}
}
}
}
[MenuItem("Tools/Android/Add proguard-user")]
@ -78,6 +85,67 @@ namespace Guru
}
}
internal class ProguardItemBuilder
{
public List<ProguardItem> BuildItemsFormLines(string[] lines)
{
List<ProguardItem> items = new List<ProguardItem>(30);
string line = "";
ProguardItem curItem = null;
for(int i =0; i < lines.Length; i++)
{
line = lines[i];
if(string.IsNullOrEmpty(line)) continue;
if (curItem == null)
{
curItem = new ProguardItem();
}
curItem.Append(line);
if(line.Contains("}"))
{
items.Add(curItem);
curItem = null;
}
}
return items;
}
}
internal class ProguardItem
{
public List<string> lines = new List<string>();
public string key = "";
public void Append(string line)
{
if (string.IsNullOrEmpty(key) &&
line.StartsWith("-"))
{
key = line;
}
if (lines == null) lines = new List<string>(5);
lines.Add(line);
}
}
}
#endif

View File

@ -8,6 +8,8 @@ namespace Guru.Editor
using UnityEditor.iOS.Xcode;
using UnityEngine;
// ----------- SKAdNetwork 更新版本日志: 2024-06-27 --------------------
/// <summary>
/// SKAdNetwork 注入逻辑
/// </summary>

View File

@ -596,6 +596,10 @@
<key>SKAdNetworkIdentifier</key>
<string>k6y4y55b64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6yxyv74ff7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>t6d3zquu66.skadnetwork</string>
@ -608,6 +612,10 @@
<key>SKAdNetworkIdentifier</key>
<string>h65wbv5k3f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tvvz7th9br.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bvpn9ufa9b.skadnetwork</string>
@ -616,21 +624,13 @@
<key>SKAdNetworkIdentifier</key>
<string>hjevpa356n.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6yxyv74ff7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mqn7fxpca7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7953jerfzd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>qu637u8glc.skadnetwork</string>
<string>vhf287vqwu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
@ -638,7 +638,11 @@
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ln5gz23vtd.skadnetwork</string>
<string>ce8ybjwass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>jk2fsx2rgz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
@ -646,19 +650,7 @@
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>nu4557a4je.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gvmwg8q7h5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pu4na253f3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yrqqpx2mcb.skadnetwork</string>
<string>dt3cjx1a9i.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
@ -666,7 +658,67 @@
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bd757ywx3.skadnetwork</string>
<string>ln5gz23vtd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pu4na253f3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6rd35atwn8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gvmwg8q7h5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>fz2k2k5tej.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7953jerfzd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>577p5t736z.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tmhh9296z4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7fbxrn65az.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>r8lj5b58b5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>qu637u8glc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7bxrt786m8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>xga6mpmplv.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>55644vm79v.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>nu4557a4je.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mj797d8u6f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
@ -678,11 +730,11 @@
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>633vhxswh4.skadnetwork</string>
<string>qwpu75vrh2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tmhh9296z4.skadnetwork</string>
<string>633vhxswh4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
@ -732,10 +784,6 @@
<key>SKAdNetworkIdentifier</key>
<string>899vrgt9g8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mj797d8u6f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>88k8774x49.skadnetwork</string>
@ -768,10 +816,6 @@
<key>SKAdNetworkIdentifier</key>
<string>t7ky8fmwkd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>fz2k2k5tej.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>w28pnjg2k4.skadnetwork</string>
@ -824,10 +868,6 @@
<key>SKAdNetworkIdentifier</key>
<string>dmv22haz9p.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7fbxrn65az.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>b55w3d8y8z.skadnetwork</string>
@ -920,6 +960,18 @@
<key>SKAdNetworkIdentifier</key>
<string>x2jnk7ly8j.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yrqqpx2mcb.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>w7jznl3r6g.skadnetwork</string>
</dict>
</array>
</dict>
</plist>

View File

@ -71,7 +71,7 @@ PluginImporter:
second:
enabled: 1
settings:
AddToEmbeddedBinaries: false
AddToEmbeddedBinaries: true
CPU: AnyCPU
CompileFlags:
FrameworkDependencies: