diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png new file mode 100644 index 0000000..0843785 Binary files /dev/null and b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png differ diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png.meta new file mode 100644 index 0000000..2a5ca80 --- /dev/null +++ b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bg.9.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a8d31fbeeee87204e88e6c444284262e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png new file mode 100644 index 0000000..632e110 Binary files /dev/null and b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png differ diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png.meta new file mode 100644 index 0000000..e2618f2 --- /dev/null +++ b/Assets/EFSDK/Android/res/drawable/_sdk_widget_big_pic_bx.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4886e0d9173712146b255852a9672dfe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png b/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png new file mode 100644 index 0000000..3c28c57 Binary files /dev/null and b/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png differ diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png.meta new file mode 100644 index 0000000..803fef8 --- /dev/null +++ b/Assets/EFSDK/Android/res/drawable/_sdk_widget_bx.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 213035b3454d9394598755a9d193e711 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png b/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png new file mode 100644 index 0000000..fbee552 Binary files /dev/null and b/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png differ diff --git a/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png.meta b/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png.meta new file mode 100644 index 0000000..8544ed5 --- /dev/null +++ b/Assets/EFSDK/Android/res/drawable/_sdk_widget_dollor.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: aacf2638ee9d7ef4d86faa3688b8ff67 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EFSDK/EFSdk.cs b/Assets/EFSDK/EFSdk.cs index 368030b..139c845 100755 --- a/Assets/EFSDK/EFSdk.cs +++ b/Assets/EFSDK/EFSdk.cs @@ -32,8 +32,8 @@ namespace EFSDK public EFSdk() { Debug.Log($"GetNewSDKClass():{GetNewSDKClass()}"); - Debug.Log($"initSDK():{ GenerateAndroidName("initSDK")}"); - + Debug.Log($"initSDK():{GenerateAndroidName("initSDK")}"); + // java interface class using (AndroidJavaClass jc = new AndroidJavaClass(GetNewSDKClass())) { @@ -46,7 +46,7 @@ namespace EFSDK private static string GetNewSDKClass() { - return GetSDKPackage() + GenerateAndroidName(oriSDK); + return GetSDKPackage() + GenerateAndroidName(oriSDK); } private static string GetSDKPackage() @@ -61,8 +61,9 @@ namespace EFSDK string newPName = ""; for (int i = 0; i < parts2.Length; i++) { - newPName+=parts2[i]+"."; + newPName += parts2[i] + "."; } + return newPName; } @@ -97,6 +98,7 @@ namespace EFSDK { sub = "a" + sub; } + return sub; } @@ -180,7 +182,7 @@ namespace EFSDK SDKCall("initSDK", mappingInfo); ActionCallback?.Invoke(ActionType.SDK_INIT_Succ, string.Empty); } - + /// /// 当游戏进程启动之后,可以接收响应的时候(一般在游戏内事件上报相关内容初始化完毕调用即可,参数传true),调用这个方法通知SDK, /// SDK收到通知后会开始将SDK侧的事件回传给游戏,作事件上报 @@ -447,5 +449,66 @@ namespace EFSDK } #endregion + + #region 小组件 + + public enum WidgetType + { + Widget3X2 = 1, + Widget5X1 = 2, + } + + /// + /// 获取指定类型的小组件是否已添加到桌面 + /// + /// + /// + public bool IsWidgetAdded(WidgetType type) + { + return SDKCall("isWidgetAdded", (int)type); + } + + public Action actionRequestAddWidgetResult = null; + + /// + /// 将指定类型的小组件添加到桌面(小组件采用默认样式) + /// + /// + /// 小组件添加结果回调 + /// + public void RequestAddWidget(WidgetType type, Action action) + { + actionRequestAddWidgetResult = action; + SDKCall("requestAddWidget", (int)type); + } + + /// + /// 请求将Widget3X2添加到桌面,并自定义文案 + /// + /// 标题1文案 + /// 标题2文案 + /// 进度条上的文案 + /// 按钮的文案 + /// 小组件添加结果回调 + public void RequestAddWidget3x2(string title1, string title2, string progressStr, string buttonStr, + Action action) + { + actionRequestAddWidgetResult = action; + SDKCall("requestAddWidget3x2", title1, title2, progressStr, buttonStr); + } + + /// + /// 请求将 Widget5X1 添加到桌面,并自定义文案 + /// + /// 内容文案 + /// 小组件添加结果回调 + /// 文案文字十六进制颜色值,如: #FFFFFF + public void RequestAddWidget5x1(string content, Action action, string contentTextColor = "#FFFFFF") + { + actionRequestAddWidgetResult = action; + SDKCall("requestAddWidget5x1", content, contentTextColor); + } + + #endregion } -} +} \ No newline at end of file diff --git a/Assets/EFSDK/EFSdkAndroid.cs b/Assets/EFSDK/EFSdkAndroid.cs index cc6d2c3..585fc43 100755 --- a/Assets/EFSDK/EFSdkAndroid.cs +++ b/Assets/EFSDK/EFSdkAndroid.cs @@ -9,6 +9,8 @@ namespace EFSDK private string H5_Load_Succ = "H5_Load_Succ"; private string On_Resume = "onResume"; private string Can_Goback = "canGoback"; + private string reqNotifyPermission = "reqNotifyPermission"; + private string REQUEST_ADD_WIDGET_RESULT = "requestAddWidgetResult"; public void OnReceiverAnd(string message) { @@ -31,11 +33,17 @@ namespace EFSDK EFSdk.get().ActionCallback?.Invoke(EFSdk.ActionType.H5_Load_Succ, parts[1]); } - if (message.StartsWith("reqNotifyPermission#")) + if (message.StartsWith(reqNotifyPermission)) { string[] flag = message.Split('#'); EFSdk.get().mReqNotifyPermissionAction?.Invoke(flag[1].Equals("1")); } + + if (message.StartsWith(REQUEST_ADD_WIDGET_RESULT)) + { + string[] flag = message.Split('#'); + EFSdk.get().actionRequestAddWidgetResult?.Invoke(flag[2].Equals("true")); + } if (message.StartsWith("Event#")) {