diff --git a/Assets/Plugins/Android/UnityCallWechatShare-release.aar b/Assets/Plugins/Android/UnityCallWechatShare-release.aar index 1094755a..7fbed2fd 100644 Binary files a/Assets/Plugins/Android/UnityCallWechatShare-release.aar and b/Assets/Plugins/Android/UnityCallWechatShare-release.aar differ diff --git a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab index 40899077..7a528ce3 100644 --- a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab @@ -574,6 +574,77 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &1031507702417298358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3498779329465273042} + - component: {fileID: 4876364747175189510} + - component: {fileID: 462953419039700935} + m_Layer: 5 + m_Name: ShareContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3498779329465273042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031507702417298358} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5813129645164555224} + m_Father: {fileID: 4516012623829342350} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -27} + m_SizeDelta: {x: 40, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4876364747175189510 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031507702417298358} + m_CullTransparentMesh: 0 +--- !u!114 &462953419039700935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031507702417298358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &3956325779266006875 GameObject: m_ObjectHideFlags: 0 @@ -1036,7 +1107,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 0, y: 34} + m_SizeDelta: {x: -40, y: 34} m_Pivot: {x: 0, y: 1} --- !u!222 &4516012621968954542 CanvasRenderer: @@ -1267,6 +1338,7 @@ RectTransform: - {fileID: 4085630362103246101} - {fileID: 331225472001556011} - {fileID: 331225470839700686} + - {fileID: 3498779329465273042} m_Father: {fileID: 4085630360693585359} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1582,6 +1654,80 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &5614155410591243744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5813129645164555224} + - component: {fileID: 7771189167173914649} + - component: {fileID: 921265397514328597} + m_Layer: 5 + m_Name: Wx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5813129645164555224 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5614155410591243744} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3498779329465273042} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7771189167173914649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5614155410591243744} + m_CullTransparentMesh: 0 +--- !u!114 &921265397514328597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5614155410591243744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 47efb322b7994f243bd73eec064d44d5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7194638139558042746 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Mobile/WeChatController.cs b/Assets/Scripts/Mobile/WeChatController.cs index 5ecb9d7d..b1c24e9d 100644 --- a/Assets/Scripts/Mobile/WeChatController.cs +++ b/Assets/Scripts/Mobile/WeChatController.cs @@ -107,9 +107,9 @@ public class WeChatController /// 网页链接 /// 标题 /// 描述 - public void ShareWebpageToWX(int scene, string url, string title, string description) + public void ShareWebpageToWX(int scene, string url, string title, string description,byte[] image) { - mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description); + mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description,image); } /// diff --git a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs index 0e770316..6128ed78 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs @@ -178,6 +178,11 @@ public class RouteItem : MonoBehaviour //btnDelete.gameObject.SetActive(false); //btnDelete.GetComponent