From f1f982b90cecbff57bf1e01ff7378dbc2b36d7b0 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 9 Sep 2021 15:44:28 +0800 Subject: [PATCH] =?UTF-8?q?iosbug=EF=BC=9Bandroid=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=AF=BC=E5=87=BA=E9=A1=B9=E7=9B=AE=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=9B=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/Android/ImageSelector-release.aar | Bin 0 -> 16695 bytes ...ar.meta => ImageSelector-release.aar.meta} | 2 +- Assets/Plugins/Android/ImageSelector.jar | Bin 3557 -> 0 bytes Assets/Plugins/Android/mainTemplate.gradle | 1 + Assets/Plugins/Android/res/xml.meta | 8 - Assets/Plugins/Android/res/xml/file_paths.xml | 21 --- .../Android/res/xml/file_paths.xml.meta | 7 - Assets/Plugins/iOS/IOSCameraController.h | 4 +- Assets/Plugins/iOS/IOSCameraController.m | 8 +- Assets/Plugins/iOS/WechatNativeBridge.m | 9 +- Assets/Resources/Images/Mobile/shadow.png | Bin 0 -> 10595 bytes .../Resources/Images/Mobile/shadow.png.meta | 128 ++++++++++++++ .../Prefab/Panel/Mobile/EditUserPanel.prefab | 16 +- .../Prefab/Panel/Mobile/MapListPanel.prefab | 2 +- .../Panel/Mobile/RaceDetailModal.prefab | 77 ++++++++- .../Prefab/Panel/Mobile/RaceHomePanel.prefab | 56 +++--- .../Prefab/Panel/Mobile/RaceListPanel.prefab | 20 ++- .../Race/Banner/BannerItem-Mobile.prefab | 163 +++++++++++++++++- Assets/Scripts/App.cs | 2 +- .../Scripts/Mobile/ImageSelectorController.cs | 10 +- .../Mobile/Interface.meta} | 2 +- .../Interface/INativeOnMobileImageSelect.cs | 13 ++ .../INativeOnMobileImageSelect.cs.meta | 11 ++ .../Scripts/UI/Prefab/FeedbackController.cs | 5 +- .../UI/Prefab/Panel/EditUserController.cs | 16 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 2 +- .../Scripts/UI/Prefab/Race/RaceHomeScript.cs | 10 +- ProjectSettings/GraphicsSettings.asset | 1 - 28 files changed, 500 insertions(+), 94 deletions(-) create mode 100644 Assets/Plugins/Android/ImageSelector-release.aar rename Assets/Plugins/Android/{ImageSelector.jar.meta => ImageSelector-release.aar.meta} (93%) delete mode 100644 Assets/Plugins/Android/ImageSelector.jar delete mode 100644 Assets/Plugins/Android/res/xml.meta delete mode 100644 Assets/Plugins/Android/res/xml/file_paths.xml delete mode 100644 Assets/Plugins/Android/res/xml/file_paths.xml.meta create mode 100644 Assets/Resources/Images/Mobile/shadow.png create mode 100644 Assets/Resources/Images/Mobile/shadow.png.meta rename Assets/{Plugins/Android/res.meta => Scripts/Mobile/Interface.meta} (77%) create mode 100644 Assets/Scripts/Mobile/Interface/INativeOnMobileImageSelect.cs create mode 100644 Assets/Scripts/Mobile/Interface/INativeOnMobileImageSelect.cs.meta diff --git a/Assets/Plugins/Android/ImageSelector-release.aar b/Assets/Plugins/Android/ImageSelector-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..0e0597a3cf409d3b8ad123feb4378eacac911f3c GIT binary patch literal 16695 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 OznE7pB&zBD-2DsX>0Q$R diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 5145f7d3..522bbb4d 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -12,6 +12,7 @@ dependencies { implementation(name: 'libcore-release', ext:'aar') implementation(name: 'libtelemetry-full-release', ext:'aar') implementation(name: 'UnityCallWechatShare-release', ext:'aar') + implementation files ('libs/ImageSelector-release.aar') } android { diff --git a/Assets/Plugins/Android/res/xml.meta b/Assets/Plugins/Android/res/xml.meta deleted file mode 100644 index a5b880de..00000000 --- a/Assets/Plugins/Android/res/xml.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dee994506c10782468904a12cea55d7e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Android/res/xml/file_paths.xml b/Assets/Plugins/Android/res/xml/file_paths.xml deleted file mode 100644 index ed69e3e0..00000000 --- a/Assets/Plugins/Android/res/xml/file_paths.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Assets/Plugins/Android/res/xml/file_paths.xml.meta b/Assets/Plugins/Android/res/xml/file_paths.xml.meta deleted file mode 100644 index ef1e3369..00000000 --- a/Assets/Plugins/Android/res/xml/file_paths.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 62c5e709a0ec9c341b10410af98decb5 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS/IOSCameraController.h b/Assets/Plugins/iOS/IOSCameraController.h index 7d85cb52..bd8c8cdd 100644 --- a/Assets/Plugins/iOS/IOSCameraController.h +++ b/Assets/Plugins/iOS/IOSCameraController.h @@ -1,5 +1,7 @@ //import 引用头文件 相当于Using #import //声明一个IOSCameraController类 继承自UIViewController <>里面是是协议/代理的调用声明 可以理解为c#的接口 -@interface IOSCameraController : UIViewController +@interface IOSCameraController : UIViewController{ + @public NSString * pageName; +} @end \ No newline at end of file diff --git a/Assets/Plugins/iOS/IOSCameraController.m b/Assets/Plugins/iOS/IOSCameraController.m index c2a2f89c..cba045fa 100644 --- a/Assets/Plugins/iOS/IOSCameraController.m +++ b/Assets/Plugins/iOS/IOSCameraController.m @@ -76,7 +76,7 @@ [data writeToFile:path atomically:YES]; //保存之后通知unity 执行对应的回调 //UnitySendMessage 是用来给unity发消息的 有三个参数 1.挂载对应回调脚本的物体名 2.回调函数的名称 3.对应回调上的参数 - UnitySendMessage("FeedbackModal(Clone)", "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String); + UnitySendMessage(pageName.UTF8String, "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String); } #pragma mark 图片处理方法 //图片旋转处理 @@ -156,14 +156,16 @@ extern "C" { #endif //导出接口供unity使用 - void IOS_OpenCamera(){ + void IOS_OpenCamera(const char * pageName){ IOSCameraController *app = [[IOSCameraController alloc]init]; + app->pageName = [NSString stringWithUTF8String:pageName]; UIViewController *vc = UnityGetGLViewController(); [vc.view addSubview:app.view]; [app OpenTarget:UIImagePickerControllerSourceTypeCamera]; } - void IOS_OpenAlbum(){ + void IOS_OpenAlbum(const char * pageName){ IOSCameraController *app = [[IOSCameraController alloc]init]; + app->pageName = [NSString stringWithUTF8String:pageName]; UIViewController *vc = UnityGetGLViewController(); [vc.view addSubview:app.view]; [app OpenTarget:UIImagePickerControllerSourceTypePhotoLibrary]; diff --git a/Assets/Plugins/iOS/WechatNativeBridge.m b/Assets/Plugins/iOS/WechatNativeBridge.m index cfdca83f..b02f41b7 100644 --- a/Assets/Plugins/iOS/WechatNativeBridge.m +++ b/Assets/Plugins/iOS/WechatNativeBridge.m @@ -88,16 +88,17 @@ void OpenWXApp() [WXApi openWXApp]; } -bool checkAPPIsExist(NSString* URLScheme) +bool checkAPPIsExist(const char * URLScheme) { NSURL* url; - if ([URLScheme containsString:@"://"]) + NSString * urls = [NSString stringWithUTF8String:URLScheme]; + if ([urls containsString:@"://"]) { - url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",URLScheme]]; + url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",urls]]; } else { - url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",URLScheme]]; + url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",urls]]; } if([[UIApplication sharedApplication] canOpenURL:url]) { diff --git a/Assets/Resources/Images/Mobile/shadow.png b/Assets/Resources/Images/Mobile/shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..92c75c4f4a69478cefcd00cc76e2cc811f41eeca GIT binary patch literal 10595 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 diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs index b0562512..c4a335ef 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs @@ -1,6 +1,7 @@ using Assets.Scripts; using Assets.Scripts.Apis; using Assets.Scripts.Apis.Models; +using Assets.Scripts.Mobile.Interface; using Assets.Scripts.UI.Control; using Assets.Scripts.UI.UIEffect; using DG.Tweening; @@ -17,7 +18,7 @@ using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using UnityEngine.UI; -public class EditUserController : PFUIPanel +public class EditUserController : PFUIPanel, INativeOnMobileImageSelect { private Button mSaveButton; private PFUIDropdown mSexDropdown; @@ -104,6 +105,7 @@ public class EditUserController : PFUIPanel UIManager.AddEvent(mBackButton.gameObject, EventTriggerType.PointerClick, Cancel); UIManager.AddEvent(mChangeAvatar.gameObject, EventTriggerType.PointerClick, (e) => { +#if !(UNITY_ANDROID || UNITY_IOS) OpenFileName ofn = new OpenFileName(); ofn.structSize = Marshal.SizeOf(ofn); @@ -131,6 +133,9 @@ public class EditUserController : PFUIPanel { ChangeAvatar(ofn.file); } +#else + App.imageSelectorController.Select("EditUserPanel(Clone)"); +#endif }); linkContainer = transform.Find("LinkContainer"); @@ -425,4 +430,13 @@ public class EditUserController : PFUIPanel // UIManager.ShowPrePanel(); //} } + + public void OnMobileImageSelect(string res) + { + if (res.IndexOf("true,") == 0) + { + var path = res.Replace("true,", ""); + ChangeAvatar(path); + } + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index bf7f5840..2b10e60e 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -138,7 +138,7 @@ public class HomeController : PFUIPanel } else { - UIManager.ShowConfirm("未检测到应用", "是否前往官网下载?", () => + UIManager.ShowConfirm("Workouts not installed", "Go to the official website to download?", () => { UIManager.CloseConfirm(); Application.OpenURL("http://www.powerfun.com/Download"); diff --git a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs index 17d1ef7e..1c653c84 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs @@ -165,11 +165,17 @@ public class RaceHomeScript : RaceScript //{ // banner.GetComponent().color = Utils.HexToColorHtml("#0000ff"); //} - - UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => +#if !(UNITY_ANDROID || UNITY_IOS) + UIManager.AddEvent(banner, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => { OnBannerClick(activity); }); +#else + UIManager.AddEvent(banner.transform.Find("BtnEnter").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + OnBannerClick(activity); + }); +#endif banner.transform.SetParent(scroll.content); dot.GetComponent().color = i == 0 ? Utils.HexToColorHtml("#f93086") : Utils.HexToColorHtml("#ffffff"); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ 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}