diff --git a/Assets/Plugins/Android/UnityCallWechatShare-release.aar b/Assets/Plugins/Android/UnityCallWechatShare-release.aar index f5cda6bf..4d21130b 100644 Binary files a/Assets/Plugins/Android/UnityCallWechatShare-release.aar and b/Assets/Plugins/Android/UnityCallWechatShare-release.aar differ diff --git a/Assets/Resources/Images/pf.jpg b/Assets/Resources/Images/pf.jpg new file mode 100644 index 00000000..7cfdf9aa Binary files /dev/null and b/Assets/Resources/Images/pf.jpg differ diff --git a/Assets/Resources/Images/pf.jpg.meta b/Assets/Resources/Images/pf.jpg.meta new file mode 100644 index 00000000..26c2bad1 --- /dev/null +++ b/Assets/Resources/Images/pf.jpg.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 7cbb4d5d72593dc4e99909d2d9ec7d3b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab b/Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab index 5e2e1437..2bbf0443 100644 --- a/Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab +++ b/Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab @@ -111,7 +111,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 41} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6816596473864697549 CanvasRenderer: diff --git a/Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab index 6121fd01..4bd49177 100644 --- a/Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab @@ -65,10 +65,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Left: 7 + m_Right: 7 + m_Top: 7 + m_Bottom: 7 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -372,6 +372,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 74fe80f225b0aff448f240dde817f640, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &5632244676142748335 GameObject: m_ObjectHideFlags: 0 @@ -486,7 +487,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40.000008, y: -40} + m_SizeDelta: {x: -26, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5632244676682049327 CanvasRenderer: @@ -743,7 +744,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 315, y: 0} + m_AnchoredPosition: {x: 322, y: 0} m_SizeDelta: {x: 630, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8458141832532476108 diff --git a/Assets/Scripts/Apis/MapInterruptRecordApi.cs b/Assets/Scripts/Apis/MapInterruptRecordApi.cs index 8379af34..9fa6b28e 100644 --- a/Assets/Scripts/Apis/MapInterruptRecordApi.cs +++ b/Assets/Scripts/Apis/MapInterruptRecordApi.cs @@ -38,5 +38,10 @@ namespace Assets.Scripts.Apis { return Get>($"MapRecord/GetAntManufacturerById?id={id}"); } + + public async Task> GetRecordSnapShot(int id) + { + return await GetAsync>($"Share/GetRecordSnapShot?id={id}"); + } } } diff --git a/Assets/Scripts/Mobile/WeChatController.cs b/Assets/Scripts/Mobile/WeChatController.cs index 40b01a1f..f3d9f9ed 100644 --- a/Assets/Scripts/Mobile/WeChatController.cs +++ b/Assets/Scripts/Mobile/WeChatController.cs @@ -164,7 +164,16 @@ public class WeChatController public void ShareImageToWX(int scene, byte[] image) { #if UNITY_ANDROID - mainActivityClass.CallStatic("ShareImageToWX", scene, image); + mainActivityClass.CallStatic("ShareImageToWX", scene, image,null); +#elif UNITY_IOS + ShareImgToWX(scene,image,image.Length); +#endif + } + + public void ShareImageToWX(int scene, byte[] image,byte[] thumb) + { +#if UNITY_ANDROID + mainActivityClass.CallStatic("ShareImageToWX", scene, image, thumb); #elif UNITY_IOS ShareImgToWX(scene,image,image.Length); #endif diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 39a7c33d..80af75b2 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -9,6 +9,10 @@ using DG.Tweening; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using Facebook.Unity; +using System.Web; +using UnityEngine.Networking; +using System.Collections; +using System.Threading.Tasks; namespace Assets.Scenes.Ride.Scripts { @@ -104,11 +108,13 @@ namespace Assets.Scenes.Ride.Scripts photoURL: new Uri(cyclingController.mapRoute.CoverImage)); } - private void shareToWx(BaseEventData b) - { + private async void shareToWx(BaseEventData b) + { + UIManager.Instance.StartCoroutine(ShowLoading()); + var res = await ConfigHelper.mapInterruptRecordApi.GetRecordSnapShot(cyclingController.RankingId); if (App.weChatController.IsWeChatAppInstalled()) { - App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.Name, "By " + App.CurrentUser.Nickname,null); + App.weChatController.ShareImageToWX(0, res.data, Resources.Load("Images/pf").texture.EncodeToJPG()); } else { @@ -116,11 +122,18 @@ namespace Assets.Scenes.Ride.Scripts } } - private void shareToWxGp(BaseEventData b) + private IEnumerator ShowLoading() { + Utils.showToast(null, "首次分享图片会消耗一些时间，请耐心等待", type: 1); + yield return null; + } + private async void shareToWxGp(BaseEventData b) + { + UIManager.Instance.StartCoroutine(ShowLoading()); + var res = await ConfigHelper.mapInterruptRecordApi.GetRecordSnapShot(cyclingController.RankingId); if (App.weChatController.IsWeChatAppInstalled()) { - App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.Name, "By " + App.CurrentUser.Nickname,null); + App.weChatController.ShareImageToWX(1, res.data,Resources.Load("Images/pf").texture.EncodeToJPG()); } else { diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index c5d4ffc1..adedd983 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -140,7 +140,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, SetActive4Button(false); - var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal; + var isRecent = myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal; + //var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal; transform.Find("BtnContinue").gameObject.SetActive(isRecent); transform.Find("BtnReride").gameObject.SetActive(isRecent); transform.Find("MapHBImg").gameObject.SetActive(!isRecent); diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index f7fa3022..dabda7f8 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -840,5 +840,18 @@ namespace Assets.Scripts return time.ToString("yyyy-MM-dd"); } } + + public static IEnumerator ShareImageToWx(int scene, byte[] image) + { + if (App.weChatController.IsWeChatAppInstalled()) + { + App.weChatController.ShareImageToWX(scene, image); + } + else + { + Utils.showToast(null, "未安装微信"); + } + yield return null; + } } } diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index b7cdca94..c2cee6dc 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5b8a1b5..999e430b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login.unity - guid: 6dce3e17997730b4492f91dd8fede429 + path: Assets/Scenes/Login-Mobile.unity + guid: 4be878da00cf764499988cf403faf94d - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 669f8140..c4963e8f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 3 + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 1 + Android: 0 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0