Skip to content

Commit dac6830

Browse files
committed
update Share API的分类修改
1 parent 5e876f8 commit dac6830

File tree

14 files changed

+142
-65
lines changed

14 files changed

+142
-65
lines changed

Demo/API_V2/Assets/API/Share/Favorites/Favorites.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private void DownloadFileImage()
4848
ShowLoading();
4949
WX.DownloadFile(new DownloadFileOption()
5050
{
51-
url = "https://picsum.photos/400/400?random=1",
51+
url = "https://mmgame.qpic.cn/image/b941692c4de1a46c180c84569cc24c20389bf176794048becdf2421e61483fd0/0",
5252
success = (res) =>
5353
{
5454
Debug.Log("WX.DownloadFile success");
@@ -81,6 +81,7 @@ private void InitializeFavoritesCallback()
8181
string title = GetOptionString(0, "");
8282
string imageUrl = GetOptionString(1, "");
8383
bool disableForward = !GetOptionBool(2, false);
84+
string query = GetOptionString(3, "");
8485

8586
if (imageUrl == "本地图片文件路径")
8687
{
@@ -94,10 +95,11 @@ private void InitializeFavoritesCallback()
9495
{
9596
title = title,
9697
imageUrl = imageUrl,
97-
disableForward = disableForward
98+
disableForward = disableForward,
99+
query = query
98100
}
99101
);
100-
Debug.Log($"收藏回调参数 - 标题: {title}, 图片URL: {imageUrl}, 禁止转发: {disableForward}");
102+
Debug.Log($"收藏回调参数 - 标题: {title}, 图片URL: {imageUrl}, 禁止转发: {disableForward}, Query: {query}");
101103
};
102104
}
103105

Demo/API_V2/Assets/API/Share/Favorites/FavoritesSO.asset

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
entryName: "\u6536\u85CF\u76D1\u542C"
1616
entryOrder: 0
1717
entryScriptTypeName: Favorites
18-
entryAPI: wx.onAddToFavorites | wx.offAddToFavorites
18+
entryAPI: OnAddToFavorites | OffAddToFavorites
1919
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u83DC\u5355\u300C\u6536\u85CF\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\n\uFF08\u5B89\u53537.0.15\u8D77\u652F\u6301\uFF0CiOS
2020
\u6682\u4E0D\u652F\u6301\uFF09\n\u6CE8\u610F\uFF1A\u7A7A\u9009\u9879\u5219\u4F7F\u7528\u9ED8\u8BA4\u503C"
2121
optionList:
@@ -32,6 +32,9 @@ MonoBehaviour:
3232
availableOptions:
3333
- false
3434
- true
35+
- optionName: query
36+
availableOptions:
37+
- key1=val1
3538
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u6536\u85CF"
3639
extraButtonList: []
3740
initialResultList: []

Demo/API_V2/Assets/API/Share/ShareAppMessage/ShareAppMessage.cs

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,45 @@
11
using UnityEngine;
22
using WeChatWASM;
3+
using System;
4+
using LitJson;
35

46
public class ShareAppMessage : Details
57
{
8+
private bool _isListening = false;
9+
10+
private readonly Action<OnShowListenerResult> _onShow = (res) =>
11+
{
12+
var result = "onShow\n" + JsonMapper.ToJson(res);
13+
GameManager.Instance.detailsController.AddResult(
14+
new ResultData() { initialContentText = result }
15+
);
16+
};
17+
18+
private readonly Action<GeneralCallbackResult> _onHide = (res) =>
19+
{
20+
var result = "onHide\n" + JsonMapper.ToJson(res);
21+
GameManager.Instance.detailsController.AddResult(
22+
new ResultData() { initialContentText = result }
23+
);
24+
};
25+
626
private string localImagePath;
727
protected override void TestAPI(string[] args)
828
{
29+
if (!_isListening)
30+
{
31+
WX.OnShow(_onShow);
32+
WX.OnHide(_onHide);
33+
}
34+
else
35+
{
36+
WX.OffShow(_onShow);
37+
WX.OffHide(_onHide);
38+
}
39+
_isListening = !_isListening;
40+
GameManager.Instance.detailsController.ChangeInitialButtonText(
41+
_isListening ? "取消监听" : "开始监听"
42+
);
943
if (GetOptionString(1, "") == "本地图片文件路径")
1044
{
1145
DownloadFileImage();
@@ -33,7 +67,7 @@ private void DownloadFileImage()
3367
ShowLoading();
3468
WX.DownloadFile(new DownloadFileOption()
3569
{
36-
url = "https://picsum.photos/400/400?random=1",
70+
url = "https://mmgame.qpic.cn/image/b941692c4de1a46c180c84569cc24c20389bf176794048becdf2421e61483fd0/0",
3771
success = (res) =>
3872
{
3973
Debug.Log("WX.DownloadFile success");
@@ -59,12 +93,22 @@ private void DownloadFileImage()
5993
});
6094
}
6195

96+
6297
private void shareAppMessage()
6398
{
6499
string title = GetOptionString(0, "");
65100
string imageUrl = GetOptionString(1, "");
66101
string imageUrlId = GetOptionString(2, "");
67102
bool toCurrentGroupValue = GetOptionBool(3, true);
103+
string query = GetOptionString(4, "");
104+
105+
//SO里面的配置参数
106+
string contentText = $"分享参数信息:\n" +
107+
$"标题:{title}\n" +
108+
$"图片URL:{imageUrl}\n" +
109+
$"图片ID:{imageUrlId}\n" +
110+
$"是否分享到当前群:{toCurrentGroupValue}\n" +
111+
$"分享参数:{query}";
68112

69113
// 如果选择了本地图片文件路径,使用下载保存到本地的文件路径
70114
if (imageUrl == "本地图片文件路径")
@@ -77,7 +121,24 @@ private void shareAppMessage()
77121
title = title,
78122
imageUrl = imageUrl,
79123
imageUrlId = imageUrlId,
80-
toCurrentGroup = toCurrentGroupValue
124+
toCurrentGroup = toCurrentGroupValue,
125+
query = query,
126+
});
127+
128+
WX.ShowModal(new ShowModalOption()
129+
{
130+
title = "分享成功",
131+
content = contentText,
132+
showCancel = false,
133+
confirmText = "好的",
134+
success = (res) =>
135+
{
136+
Debug.Log("分享成功");
137+
},
138+
fail = (res) =>
139+
{
140+
Debug.Log("分享失败");
141+
}
81142
});
82143
}
83144

@@ -90,5 +151,7 @@ private void OnDestroy()
90151
fs.UnlinkSync(localImagePath);
91152
Debug.Log("清理本地图片成功");
92153
}
154+
WX.OffShow(_onShow);
155+
WX.OffHide(_onHide);
93156
}
94157
}

Demo/API_V2/Assets/API/Share/ShareAppMessage/ShareAppMessageSO.asset

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareAppMessageSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: ShareAppMessage
1615
entryName: "\u5206\u4EAB\u8F6C\u53D1"
16+
entryOrder: 0
17+
entryScriptTypeName: ShareAppMessage
1718
entryAPI: ShareAppMessage
1819
entryDescription: "title\uFF1A\u4E0D\u4F20\u5219\u9ED8\u8BA4\u4F7F\u7528\u5F53\u524D\u5C0F\u6E38\u620F\u7684\u6635\u79F0\u3002\n\u4E3B\u52A8\u62C9\u8D77\u8F6C\u53D1\uFF0C\u8FDB\u5165\u9009\u62E9\u901A\u8BAF\u5F55\u754C\u9762\u3002\n\u6CE8\u610F\uFF1A\u7A7A\u9009\u9879\u5219\u4F7F\u7528\u9ED8\u8BA4\u503C"
1920
optionList:
@@ -34,6 +35,9 @@ MonoBehaviour:
3435
availableOptions:
3536
- false
3637
- true
38+
- optionName: query
39+
availableOptions:
40+
- key1=val1
3741
initialButtonText: "\u4E3B\u52A8\u8F6C\u53D1\u5206\u4EAB"
3842
extraButtonList: []
3943
initialResultList: []

Demo/API_V2/Assets/API/Share/ShareInfo/ShareInfo.cs

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected override void TestAPI(string[] args)
1313
{
1414
if (!isSetupInitialized)
1515
{
16-
GetShareInfoButton();
16+
GetGroupEnterInfoButton();
1717
isSetupInitialized = true;
1818
}
1919
else
@@ -23,7 +23,7 @@ protected override void TestAPI(string[] args)
2323
}
2424

2525
// 分享信息按钮
26-
private void GetShareInfoButton()
26+
private void GetGroupEnterInfoButton()
2727
{
2828
InitCloudFunction();//初始化云函数
2929
WX.UpdateShareMenu(new UpdateShareMenuOption
@@ -44,45 +44,13 @@ private void GetShareInfoButton()
4444
Debug.Log("shareTicket:" + res.shareTicket);
4545
Debug.Log("chatType:" + res.chatType);
4646

47-
GetShareInfo(res.shareTicket);
47+
getGroupEnterInfo();
4848
});
4949
}
5050

5151
// 获取分享Shareticket信息
52-
private void GetShareInfo(string shareTicket)
52+
private void getGroupEnterInfo()
5353
{
54-
if (string.IsNullOrEmpty(shareTicket))
55-
{
56-
Debug.LogError("shareTicket is empty!");
57-
return;
58-
}
59-
60-
// 获取转发详细信息
61-
WX.GetShareInfo(
62-
new GetShareInfoOption
63-
{
64-
shareTicket = shareTicket,
65-
timeout = 2000,
66-
success = (res) =>
67-
{
68-
Debug.Log("GetShareInfo success");
69-
Debug.Log("encryptedData:" + res.encryptedData);
70-
Debug.Log("iv:" + res.iv);
71-
Debug.Log("CloudID:" + res.cloudID);
72-
CloudID = res.cloudID;
73-
CloudCallFunction();// 传入CloudID调用
74-
},
75-
fail = (res) =>
76-
{
77-
Debug.Log("GetShareInfo fail:" + res.errMsg);
78-
},
79-
complete = (res) =>
80-
{
81-
Debug.Log("GetShareInfo complete");
82-
}
83-
}
84-
);
85-
8654
// 从基础库 v2.17.3 开始,推荐用 wx.getGroupEnterInfo 替代wx.getShareInfo接口
8755
WX.GetGroupEnterInfo(new GetGroupEnterInfoOption
8856
{
@@ -93,8 +61,8 @@ private void GetShareInfo(string shareTicket)
9361
Debug.Log("encryptedData:" + res.encryptedData);
9462
Debug.Log("iv:" + res.iv);
9563
Debug.Log("CloudID:" + res.cloudID);
96-
//CloudID = res.cloudID;
97-
//CloudCallFunction();// 传入CloudID调用
64+
CloudID = res.cloudID;
65+
CloudCallFunction();// 传入CloudID调用
9866
},
9967
fail = (res) =>
10068
{

Demo/API_V2/Assets/API/Share/ShareInfo/ShareInfoSO.asset

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareInfoSO
1414
m_EditorClassIdentifier:
15+
entryName: "\u83B7\u53D6\u7FA4\u804A\u4FE1\u606F"
16+
entryOrder: 0
1517
entryScriptTypeName: ShareInfo
16-
entryName: "\u83B7\u53D6\u5206\u4EAB\u4FE1\u606F"
17-
entryAPI: wx.getShareInfo
18+
entryAPI: GetGroupEnterInfo
1819
entryDescription: "\u83B7\u53D6\u8F6C\u53D1\u8BE6\u7EC6\u4FE1\u606F\uFF08\u4E3B\u8981\u662F\u83B7\u53D6\u7FA4ID\uFF09\u3002\n\u4ECE\u7FA4\u804A\u5185\u7684\u5C0F\u7A0B\u5E8F\u6D88\u606F\u5361\u7247\u6253\u5F00\u5C0F\u7A0B\u5E8F\u65F6\uFF0C\u8C03\u7528\u6B64\u63A5\u53E3\u624D\u6709\u6548\u3002\n\u4ECE\u57FA\u7840\u5E93
1920
v2.17.3 \u5F00\u59CB\uFF0C\u63A8\u8350\u7528 wx.getGroupEnterInfo \u66FF\u4EE3\u6B64\u63A5\u53E3\u3002"
2021
optionList: []
21-
initialButtonText: "\u83B7\u53D6\u5206\u4EAB\u8BE6\u60C5"
22+
initialButtonText: "\u83B7\u53D6\u7FA4\u804A\u4FE1\u606F"
2223
extraButtonList: []
2324
initialResultList: []

Demo/API_V2/Assets/API/Share/ShareMenu/ShareMenu.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public void showShareMenu()
2828
},
2929
fail = (res) =>
3030
{
31+
ShowToast("显示转发失败");
3132
Debug.Log("fail" + res.errMsg);
3233
},
3334
complete = (res) =>
@@ -50,6 +51,7 @@ public void showShareMenu()
5051
},
5152
fail = (res) =>
5253
{
54+
ShowToast("隐藏转发失败");
5355
Debug.Log("fail" + res.errMsg);
5456
},
5557
complete = (res) =>

Demo/API_V2/Assets/API/Share/ShareMenu/ShareMenuSO.asset

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareMenuSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: ShareMenu
1615
entryName: "\u663E\u793A\u8F6C\u53D1"
17-
entryAPI: 'wx.showShareMenu
16+
entryOrder: 0
17+
entryScriptTypeName: ShareMenu
18+
entryAPI: 'ShowShareMenu
1819
19-
wx.hideShareMenu'
20+
HideShareMenu'
2021
entryDescription: "\u8BBE\u7F6E\u53F3\u4E0A\u89D2\u70B9\u5F00\u7684\u8BE6\u60C5\u754C\u9762\u4E2D\u7684\u5206\u4EAB\u6309\u94AE\u662F\u5426\u53EF\u7528\n"
2122
optionList: []
2223
initialButtonText: "\u663E\u793A\u8F6C\u53D1\u6309\u94AE"

Demo/API_V2/Assets/API/Share/ShareTimeline/ShareTimeline.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private void DownloadFileImage()
4848
ShowLoading();
4949
WX.DownloadFile(new DownloadFileOption()
5050
{
51-
url = "https://picsum.photos/400/400?random=1",
51+
url = "https://mmgame.qpic.cn/image/b941692c4de1a46c180c84569cc24c20389bf176794048becdf2421e61483fd0/0",
5252
success = (res) =>
5353
{
5454
Debug.Log("WX.DownloadFile success");
@@ -82,6 +82,7 @@ private void InitializeTimelineCallback()
8282
string imageUrlId = GetOptionString(2, "");
8383
string imagePreviewUrl = GetOptionString(3, "");
8484
string imagePreviewUrlId = GetOptionString(4, "");
85+
string query = GetOptionString(5, "");
8586

8687
// 如果使用本地图片,替换为本地路径
8788
if (imageUrl == "本地图片文件路径")
@@ -98,10 +99,11 @@ private void InitializeTimelineCallback()
9899
imageUrl = imageUrl,
99100
imageUrlId = imageUrlId,
100101
imagePreviewUrl = imagePreviewUrl,
101-
imagePreviewUrlId = imagePreviewUrlId
102+
imagePreviewUrlId = imagePreviewUrlId,
103+
query = query
102104
}
103105
);
104-
Debug.Log($"朋友圈分享回调参数 - 标题: {title}, 图片URL: {imageUrl}, 图片ID: {imageUrlId}, 预览图URL: {imagePreviewUrl}, 预览图ID: {imagePreviewUrlId}");
106+
Debug.Log($"朋友圈分享回调参数 - 标题: {title}, 图片URL: {imageUrl}, 图片ID: {imageUrlId}, 预览图URL: {imagePreviewUrl}, 预览图ID: {imagePreviewUrlId}, Query: {query}");
105107
};
106108
}
107109

Demo/API_V2/Assets/API/Share/ShareTimeline/ShareTimelineSO.asset

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareTimelineSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: ShareTimeline
1615
entryName: "\u76D1\u542C\u5206\u4EAB\u5230\u670B\u53CB\u5708"
17-
entryAPI: wx.onShareTimeline | wx.offShareTimeline
16+
entryOrder: 0
17+
entryScriptTypeName: ShareTimeline
18+
entryAPI: OnShareTimeline | OffShareTimeline
1819
entryDescription: "\u8F6C\u53D1\u529F\u80FD\u53EF\u80FD\u9700\u8981\u76F8\u5173\u6743\u9650\n\u76D1\u542C\u7528\u6237\u70B9\u51FB\u53F3\u4E0A\u89D2\u83DC\u5355\u7684\u300C\u5206\u4EAB\u5230\u670B\u53CB\u5708\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\u3002\n\u672C\u63A5\u53E3\u4E3A
1920
Beta \u7248\u672C\uFF0C\u6682\u53EA\u5728 Android \u5E73\u53F0\u652F\u6301\u3002\n\u6CE8\u610F\uFF1A\u7A7A\u9009\u9879\u5219\u4F7F\u7528\u9ED8\u8BA4\u503C"
2021
optionList:
@@ -39,6 +40,9 @@ MonoBehaviour:
3940
availableOptions:
4041
- "\u670B\u53CB\u5708\u9884\u89C8\u56FE\u56FE\u7247\u7F16\u53F7"
4142
- CoH3v3JtRc2ajuDvZyhHXQ==
43+
- optionName: query
44+
availableOptions:
45+
- key1=val1
4246
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u5206\u4EAB\u5230\u670B\u53CB\u5708"
4347
extraButtonList: []
4448
initialResultList: []

Demo/API_V2/Assets/API/Share/linkHand/linkHandSO.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
entryName: "\u76D1\u542C\u590D\u5236\u94FE\u63A5"
1616
entryOrder: 0
1717
entryScriptTypeName: linkHand
18-
entryAPI: wx.onCopyUrl | wx.offCopyUrl
18+
entryAPI: OnCopyUrl | OffCopyUrl
1919
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u53F3\u4E0A\u89D2\u83DC\u5355\u7684\u300C\u590D\u5236\u94FE\u63A5\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\u3002\n\u672C\u63A5\u53E3\u4E3A
2020
Beta \u7248\u672C\uFF0C\u6682\u53EA\u5728 Android \u5E73\u53F0\u652F\u6301\u3002"
2121
optionList: []

Demo/API_V2/Assets/API/Share/onPcHand/onPcHandSO.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
entryName: "\u76D1\u542C\u5728\u7535\u8111\u4E0A\u6253\u5F00"
1616
entryOrder: 0
1717
entryScriptTypeName: onPcHand
18-
entryAPI: wx.onHandoff | wx.offHandoff |wx.setHandoffQuery
18+
entryAPI: OnHandoff | OffHandoff | SetHandoffQuery
1919
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u83DC\u5355\u300C\u5728\u7535\u8111\u4E0A\u6253\u5F00\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6"
2020
optionList: []
2121
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u5728\u7535\u8111\u4E0A\u6253\u5F00"

0 commit comments

Comments
 (0)