com.taptap.sdk.compliance 4.9.4 → 4.9.5

package/Mobile/Editor/NativeDependencies.xml

@@ -4,12 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-compliance:4.9.4" />
+    <androidPackage spec="com.taptap.sdk:tap-compliance:4.9.5" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Compliance" version="4.9.4" />
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Compliance" version="4.9.5" />
   </iosPods>
 </dependencies>

package/Standalone/Resources/Prefabs/Standalone/TapTapChinaIDInputPanel.prefab

@@ -32,9 +32,9 @@ RectTransform:
   m_Father: {fileID: 6246950521860096709}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -260, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 520, y: 144}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3954973391796633949
@@ -850,10 +850,10 @@ Canvas:
   m_RenderMode: 2
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
-  m_PixelPerfect: 0
+  m_PixelPerfect: 1
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
+  m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
@@ -1516,6 +1516,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6246950521860096709}
+  - component: {fileID: 5655668608917557192}
+  - component: {fileID: 1558665275775688038}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -1541,8 +1543,48 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 144}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &5655668608917557192
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8534607850543630585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 0
+    m_Top: 10
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1558665275775688038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8534607850543630585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &9122427629114257444
 GameObject:
   m_ObjectHideFlags: 0

package/Standalone/Resources/Prefabs/Standalone/TapTapChinaQuickVerifyTipPanel.prefab

@@ -379,10 +379,10 @@ RectTransform:
   m_Father: {fileID: 2909549687173251875}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 8.5, y: -11}
-  m_SizeDelta: {x: 479.11267, y: 168.0859}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 510, y: 168.0859}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3517167505041490502
 CanvasRenderer:
@@ -525,6 +525,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2909549687173251875}
+  - component: {fileID: 4948455782418100318}
+  - component: {fileID: 8338149693185132011}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -550,8 +552,48 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 330}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &4948455782418100318
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398107688352091037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &8338149693185132011
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398107688352091037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 0
+    m_Top: 10
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &4569300236109915906
 GameObject:
   m_ObjectHideFlags: 0
@@ -1357,7 +1399,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8476130096149045848}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
   m_Name: 

package/Standalone/Resources/Prefabs/Standalone/TapTapHealthPaymentPanel.prefab

@@ -32,9 +32,9 @@ RectTransform:
   m_Father: {fileID: 1376460305007362532}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -150}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1040, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3954973391796633949
@@ -876,6 +876,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1376460305007362532}
+  - component: {fileID: 7367184918637625018}
+  - component: {fileID: 6684828456690860380}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -901,5 +903,45 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &7367184918637625018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8510947007867534641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &6684828456690860380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8510947007867534641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

package/Standalone/Resources/Prefabs/Standalone/TapTapHealthReminderPanel.prefab

@@ -175,6 +175,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4806650311922228640}
+  - component: {fileID: 3031322335091851679}
+  - component: {fileID: 4081011805596831565}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -200,8 +202,48 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &3031322335091851679
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2525790795551395681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 10
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &4081011805596831565
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2525790795551395681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &2614750717462274026
 GameObject:
   m_ObjectHideFlags: 0
@@ -790,10 +832,10 @@ RectTransform:
   m_Father: {fileID: 4806650311922228640}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -200}
-  m_SizeDelta: {x: 1044, y: 400}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1020, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4070737897994074319
 CanvasRenderer:

package/Standalone/Runtime/Internal/UI/Controller/TapTapComplianceQuickVerifyTipController.cs

@@ -86,35 +86,11 @@ namespace TapSDK.Compliance.Internal {
                 titleText.text = config.Title;
                 mainIntroText.text = config.Content.Replace(" ","\u00A0");//.Substring(0, index + + splitter.Length);
                 TapLog.Log("set mainIntro text = " + config.Content);
-                int lineCount;
-                float lineHeight;
-                if (IsTextOverflowing(mainIntroText, out lineCount, out lineHeight)) {
-                    scrollRect.enabled = true;
-                    mainIntroText.rectTransform.sizeDelta = new Vector2(mainIntroText.rectTransform.sizeDelta.x,
-                        40 + (lineCount - 4) * lineHeight);
-                    
-                    var contentRect = scrollRect.transform.Find("Viewport/Content").GetComponent<RectTransform>();
-                    contentRect.sizeDelta = new Vector2(contentRect.sizeDelta.x,
-                        40 + (lineCount - 4) * lineHeight);
-                }
-                else {
-                    scrollRect.enabled = false;
-                }
                 confirmBtn1Text.text = config.PositiveButtonText;
                 confirmBtn2Text.text = config.PositiveButtonText;
                 denyBtnText.text = config.NegativeButtonText;
             }
         }
         
-        bool IsTextOverflowing(Text text, out int lineCount, out float lineHeight)
-        {
-            var textGenerator = text.cachedTextGenerator;
-            var settings = text.GetGenerationSettings(text.rectTransform.rect.size);
-            textGenerator.Populate(text.text, settings);
-            lineCount = textGenerator.lineCount;
-            lineHeight = 15 + (text.lineSpacing - 1) * 15;
-            return textGenerator.lineCount > 6;
-        }
-        
     }
 }

package/Standalone/Runtime/Internal/UI/Controller/TaptapComplianceHealthPaymentController.cs

@@ -39,18 +39,6 @@ namespace TapSDK.Compliance.Internal
         {
             titleText.text = payable.Title;
             contentText.text = ProcessContent(payable.Content);
-            if (IsTextOverflowing(contentText, out int lineCount, out float lineHeight)) {
-                scrollRect.enabled = true;
-                contentText.rectTransform.sizeDelta = new Vector2(contentText.rectTransform.sizeDelta.x,
-                    80 + lineCount * lineHeight);
-                    
-                var contentRect = scrollRect.transform.Find("Viewport/Content").GetComponent<RectTransform>();
-                contentRect.sizeDelta = new Vector2(contentRect.sizeDelta.x,
-                    80 + lineCount * lineHeight);
-            }
-            else {
-                scrollRect.enabled = false;
-            }
             // var buttonText = Config.GetHealthTip();
             // if (!string.IsNullOrEmpty(buttonText))
             //     this.buttonText.text = buttonText;
@@ -60,18 +48,6 @@ namespace TapSDK.Compliance.Internal
         {
             titleText.text = title;
             contentText.text = ProcessContent(content);
-            if (IsTextOverflowing(contentText, out int lineCount, out float lineHeight)) {
-                scrollRect.enabled = true;
-                contentText.rectTransform.sizeDelta = new Vector2(contentText.rectTransform.sizeDelta.x,
-                    80 + lineCount * lineHeight);
-                    
-                var contentRect = scrollRect.transform.Find("Viewport/Content").GetComponent<RectTransform>();
-                contentRect.sizeDelta = new Vector2(contentRect.sizeDelta.x,
-                    80 + lineCount * lineHeight);
-            }
-            else {
-                scrollRect.enabled = false;
-            }
             if (!string.IsNullOrEmpty(buttonText))
                 this.buttonText.text = buttonText;
             _onOk = onOk;
@@ -87,18 +63,5 @@ namespace TapSDK.Compliance.Internal
             Close();
             _onOk?.Invoke();
         }
-        
-        bool IsTextOverflowing(Text text, out int lineCount, out float lineHeight)
-        {
-            var textGenerator = text.cachedTextGenerator;
-            var settings = text.GetGenerationSettings(text.rectTransform.rect.size);
-            textGenerator.Populate(text.text, settings);
-            lineCount = textGenerator.lineCount;
-            if (TapTapComplianceManager.IsUseMobileUI()) {
-                lineCount += 3;
-            }
-            lineHeight = 25 + (text.lineSpacing - 1) * 25;
-            return lineCount > 4;
-        }
     }
 }

package/Standalone/Runtime/Internal/UI/Controller/TaptapComplianceHealthReminderController.cs

@@ -78,18 +78,6 @@ namespace TapSDK.Compliance.Internal {
             }
             content = content.Replace(" ","\u00A0");
             contentText.text = content.Replace(" ", "\u00A0");
-            if (IsTextOverflowing(contentText, out int lineCount, out float lineHeight)) {
-                scrollRect.enabled = true;
-                contentText.rectTransform.sizeDelta = new Vector2(contentText.rectTransform.sizeDelta.x,
-                    lineCount * lineHeight);
-                    
-                var contentRect = scrollRect.transform.Find("Viewport/Content").GetComponent<RectTransform>();
-                contentRect.sizeDelta = new Vector2(contentRect.sizeDelta.x,
-                    lineCount * lineHeight);
-            }
-            else {
-                scrollRect.enabled = false;
-            }
             switchAccountButton.gameObject.SetActive(onSwitchAccount != null);
 
             var buttonText = okButton.transform.Find("Text").GetComponent<Text>();
@@ -113,18 +101,5 @@ namespace TapSDK.Compliance.Internal {
             Close();
             OnSwitchAccount?.Invoke();
         }
-        
-        bool IsTextOverflowing(Text text, out int lineCount, out float lineHeight)
-        {
-            var textGenerator = text.cachedTextGenerator;
-            var settings = text.GetGenerationSettings(text.rectTransform.rect.size);
-            textGenerator.Populate(text.text, settings);
-            lineCount = textGenerator.lineCount;
-            if (TapTapComplianceManager.IsUseMobileUI()) {
-                lineCount += 3;
-            }
-            lineHeight = 25 + (text.lineSpacing - 1) * 25;
-            return lineCount > 5;
-        }
     }
 }

package/Standalone/Runtime/Internal/UI/Controller/TaptapComplianceIDInputController.cs

@@ -82,20 +82,6 @@ namespace TapSDK.Compliance.Internal
             {
                 titleText.text = config.Title;
                 descriptionText.text = config.Content.Replace(" ", "\u00A0");
-                if (IsTextOverflowing(descriptionText, out int lineCount, out float lineHeight))
-                {
-                    scrollRect.enabled = true;
-                    descriptionText.rectTransform.sizeDelta = new Vector2(descriptionText.rectTransform.sizeDelta.x,
-                        40 + (lineCount - 3) * lineHeight);
-
-                    var contentRect = scrollRect.transform.Find("Viewport/Content").GetComponent<RectTransform>();
-                    contentRect.sizeDelta = new Vector2(contentRect.sizeDelta.x,
-                        40 + (lineCount - 3) * lineHeight);
-                }
-                else
-                {
-                    scrollRect.enabled = false;
-                }
                 buttonText.text = config.PositiveButtonText;
             }
 
@@ -237,15 +223,5 @@ namespace TapSDK.Compliance.Internal
             //             return true;
         }
 
-        bool IsTextOverflowing(Text text, out int lineCount, out float lineHeight)
-        {
-            var textGenerator = text.cachedTextGenerator;
-            var settings = text.GetGenerationSettings(text.rectTransform.rect.size);
-            textGenerator.Populate(text.text, settings);
-            lineCount = textGenerator.lineCount + 3;
-            lineHeight = 15 + (text.lineSpacing - 1) * 15;
-            return lineCount > 3;
-        }
-
     }
 }

package/package.json

@@ -2,11 +2,11 @@
   "name": "com.taptap.sdk.compliance",
   "displayName": "TapTapSDK Compliance",
   "description": "TapTapSDK Compliance",
-  "version": "4.9.4",
-  "unity": "2020.3.0f1",
+  "version": "4.9.5",
+  "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.9.4",
-    "com.taptap.sdk.login": "4.9.4"
+    "com.taptap.sdk.core": "4.9.5",
+    "com.taptap.sdk.login": "4.9.5"
   }
 }