Download as
Browse Code »

Commit c06a78c147fdd67f9042e49cb45e5100acb16ecc

Authored by thiago.filipe
1 parent 4d334013
Exists in IosBuild

Refactoring

Showing 3 changed files with 56 additions and 59 deletions   Show diff stats
Assets/Scenes/Main.unity
  Diff comments   View file @c06a78c
@@ -3592,53 +3592,53 @@ Animation: @@ -3592,53 +3592,53 @@ Animation:
3592 m_GameObject: {fileID: 535548070} 3592 m_GameObject: {fileID: 535548070}
3593 m_Enabled: 1 3593 m_Enabled: 1
3594 serializedVersion: 3 3594 serializedVersion: 3
3595 - m_Animation: {fileID: 7400000, guid: 365e5f41595503c48915848d883fabfe, type: 2} 3595 + m_Animation: {fileID: 7400000, guid: f30af7c2c0e25834596c036ffc483e8d, type: 2}
3596 m_Animations: 3596 m_Animations:
3597 - - {fileID: 7400000, guid: f1f36f20657e5244e9c1e21117d9a452, type: 2}  
3598 - - {fileID: 7400000, guid: 55bec2c04d14e74488ef127ee380a080, type: 2}  
3599 - - {fileID: 7400000, guid: b368bfe0efa37c04bb9c661058ccedb9, type: 2}  
3600 - - {fileID: 7400000, guid: 365e5f41595503c48915848d883fabfe, type: 2}  
3601 - - {fileID: 7400000, guid: fa9ef8a15fe08a143bc89dc00289fc17, type: 2}  
3602 - - {fileID: 7400000, guid: 939bebf16bb2dba44894c5745c5dc1f8, type: 2}  
3603 - - {fileID: 7400000, guid: aecdf652be04b444f84644ba7c403960, type: 2}  
3604 - - {fileID: 7400000, guid: 53ed20623f5573345a4fb057db454b05, type: 2}  
3605 - - {fileID: 7400000, guid: b0bafda258c57414ebfbc4cf89719795, type: 2}  
3606 - - {fileID: 7400000, guid: 67caa6e2d05387848a9448b57fffcb0f, type: 2}  
3607 - - {fileID: 7400000, guid: a79227e28dd60fa4c9812a51ab9d455e, type: 2}  
3608 - - {fileID: 7400000, guid: 8b1d930398178064795f5d23af67dce4, type: 2}  
3609 - - {fileID: 7400000, guid: af8192a32a30ab746be40ff1dcb8bc0a, type: 2}  
3610 - - {fileID: 7400000, guid: e282c734045b47241988e2b9fdf0dc7e, type: 2}  
3611 - - {fileID: 7400000, guid: 698d03f46785361449a10cc0003862eb, type: 2}  
3612 - - {fileID: 7400000, guid: e193836512c744c4299651990fc3ca10, type: 2}  
3613 - - {fileID: 7400000, guid: c4d452a56e2f4ee4a83e5679f969a354, type: 2}  
3614 - - {fileID: 7400000, guid: 220a675640cc72d4f9c8d364c9a377b4, type: 2}  
3615 - - {fileID: 7400000, guid: 9a1e34a6954967f4fb3982394bf61eef, type: 2}  
3616 - - {fileID: 7400000, guid: 039911b68664f7b40b97e2665893a1e5, type: 2}  
3617 - - {fileID: 7400000, guid: b4a4a507b5b85404f9ca30cf2855b359, type: 2}  
3618 - - {fileID: 7400000, guid: 3b67cb87e08f4e34badc00f7b49d2591, type: 2}  
3619 - - {fileID: 7400000, guid: dc854de773a9e3f488c7a1b42d6a460b, type: 2}  
3620 - - {fileID: 7400000, guid: 21b376087ddd4ec46a1da0c3ba1181d9, type: 2}  
3621 - - {fileID: 7400000, guid: db84b318b67dbc54fa1fab6d31dfeb6e, type: 2}  
3622 - - {fileID: 7400000, guid: 47e5da18eda740844ba111cfab49d0eb, type: 2}  
3623 - - {fileID: 7400000, guid: ba9dc32834cf193429f27449b1d9d701, type: 2}  
3624 - - {fileID: 7400000, guid: 22f7b3c892f0e5e41b120798d7953026, type: 2}  
3625 - - {fileID: 7400000, guid: 9396f2d833a082446b36b0cda61ba87c, type: 2}  
3626 - - {fileID: 7400000, guid: 289449396bffd4045b8657269df378f2, type: 2}  
3627 - - {fileID: 7400000, guid: 99bb7e6adbe6d5f4984c51d5d5e92045, type: 2}  
3628 - - {fileID: 7400000, guid: b6faf58a03a0dc24cb9777c70fda828b, type: 2}  
3629 - - {fileID: 7400000, guid: b2b18bfa970783a4ab32945b1c4bc54b, type: 2}  
3630 - - {fileID: 7400000, guid: a8b0488b23a43b3499d2b1d8b81f0707, type: 2}  
3631 - - {fileID: 7400000, guid: ccdf6bab5e56c0447abfc0a8f745b62c, type: 2}  
3632 - - {fileID: 7400000, guid: 8d2c7cdb67fea144e9660db7edd82239, type: 2}  
3633 - - {fileID: 7400000, guid: 6191f3fb2e8027b48ac60aa48c11065d, type: 2}  
3634 - - {fileID: 7400000, guid: dbf77a3c567182846bad50598584109d, type: 2}  
3635 - - {fileID: 7400000, guid: d2f41e4d1ce31a4458ccdab2cd91faae, type: 2}  
3636 - - {fileID: 7400000, guid: fc72e7fd88de0b94fb9b050fc1368547, type: 2}  
3637 - - {fileID: 7400000, guid: 5b7bf0ae891107f4aaa366ba42eac9ee, type: 2}  
3638 - - {fileID: 7400000, guid: d9c72b1fb167df045ae7ac711d1dee6c, type: 2}  
3639 - - {fileID: 7400000, guid: d927185f3fb021844834f7086d346e3a, type: 2}  
3640 - - {fileID: 7400000, guid: e62d77cfc7d0d104b84d8beb5ef72c33, type: 2}  
3641 - - {fileID: 7400000, guid: 1dd400df2179f94469eb2480a313a8cf, type: 2} 3597 + - {fileID: 7400000, guid: 024715f83bda3a24e845e4380e74b282, type: 2}
  3598 + - {fileID: 7400000, guid: 0b1faa650ee11974bb7b2688b8f77d9e, type: 2}
  3599 + - {fileID: 7400000, guid: 192e5450bc9b51249a4695055efa808e, type: 2}
  3600 + - {fileID: 7400000, guid: 1962fa434eeeb6f4289ee601a7d750e9, type: 2}
  3601 + - {fileID: 7400000, guid: 1e76a7ed8eda9e3418938f9f4bade52a, type: 2}
  3602 + - {fileID: 7400000, guid: 307a3165c8fa5ec4e9e1dbd14c938201, type: 2}
  3603 + - {fileID: 7400000, guid: 3ae51d5645a3e844aa539b198f435fb7, type: 2}
  3604 + - {fileID: 7400000, guid: 3bcf756871574ae4f8098ecde067d0c5, type: 2}
  3605 + - {fileID: 7400000, guid: 3bf1eb146bbc3df488121950abe1b8cf, type: 2}
  3606 + - {fileID: 7400000, guid: 43e3f3c6f22a59f4b9a9fe7c7eaa2e60, type: 2}
  3607 + - {fileID: 7400000, guid: 47abf9561f7dc544fbd158a753c48030, type: 2}
  3608 + - {fileID: 7400000, guid: 4f5d38ce9a4791a45a65a6d5cf651942, type: 2}
  3609 + - {fileID: 7400000, guid: 6157701b991b24d46903d222e5733a65, type: 2}
  3610 + - {fileID: 7400000, guid: 6738b13e2a5c77b419d466a9b07b93da, type: 2}
  3611 + - {fileID: 7400000, guid: 6c071acda0226cc4682dd95a24ba34c7, type: 2}
  3612 + - {fileID: 7400000, guid: 70717780c0ae91c4fa79d0230c07e877, type: 2}
  3613 + - {fileID: 7400000, guid: 71670a3ee1d3fd84d881cdcbe35aac33, type: 2}
  3614 + - {fileID: 7400000, guid: 75124670012910744b6b20baa43f6773, type: 2}
  3615 + - {fileID: 7400000, guid: 78643954b61e2af40855b1d7edb59e68, type: 2}
  3616 + - {fileID: 7400000, guid: 8105d762612034947a4e8aa08e6e743a, type: 2}
  3617 + - {fileID: 7400000, guid: 83b94fb00e13b6441b62d3c50f8fc057, type: 2}
  3618 + - {fileID: 7400000, guid: 8486f353c66ec3747ac807d5254ab572, type: 2}
  3619 + - {fileID: 7400000, guid: 865af1e6ffb998e4391c1f5a4fa963f4, type: 2}
  3620 + - {fileID: 7400000, guid: 89844a05f01e2884db62dfc23e3bb020, type: 2}
  3621 + - {fileID: 7400000, guid: 8d329b13dcec31a43a5a846e2e002e08, type: 2}
  3622 + - {fileID: 7400000, guid: 9c285cd93505250428536521f358b998, type: 2}
  3623 + - {fileID: 7400000, guid: a70ed1e393ddc29418dd2055d0fa69ea, type: 2}
  3624 + - {fileID: 7400000, guid: b3c940c8bb0a40d4197bab5861c5f147, type: 2}
  3625 + - {fileID: 7400000, guid: b557ac09196b9c245b4bf0aa00511bcf, type: 2}
  3626 + - {fileID: 7400000, guid: b55e4eebb1540b24f9dee194b2621df3, type: 2}
  3627 + - {fileID: 7400000, guid: b8ec32612eba3c94c8b9e075a2b84cd5, type: 2}
  3628 + - {fileID: 7400000, guid: bb38a59cd20338341ae0bc9c73cd88b6, type: 2}
  3629 + - {fileID: 7400000, guid: c67e687da6409ef48b294fb4b0a48d5c, type: 2}
  3630 + - {fileID: 7400000, guid: cce493d72e67b4c49859605a34148c59, type: 2}
  3631 + - {fileID: 7400000, guid: d2fd3606f0e661044aee19011e22f191, type: 2}
  3632 + - {fileID: 7400000, guid: d50be78006beb2945a10f60a10832a15, type: 2}
  3633 + - {fileID: 7400000, guid: d5a9e2c65d62b07478c2a9c546209722, type: 2}
  3634 + - {fileID: 7400000, guid: d9d8762439eb57e43b4fd6cc957fd2bb, type: 2}
  3635 + - {fileID: 7400000, guid: e559c6348bb5e304aa4eccc562e061bb, type: 2}
  3636 + - {fileID: 7400000, guid: ea652f2c75fa62844afdcd1b896aa400, type: 2}
  3637 + - {fileID: 7400000, guid: ed250cdb586bb4b46b964189a7ce2788, type: 2}
  3638 + - {fileID: 7400000, guid: f30af7c2c0e25834596c036ffc483e8d, type: 2}
  3639 + - {fileID: 7400000, guid: f674d89e422b07a4384b425e639d0901, type: 2}
  3640 + - {fileID: 7400000, guid: f7f9e787f918e0f4a975903fc0866f68, type: 2}
  3641 + - {fileID: 7400000, guid: f9e186c4e38b30b458eb71901806aa4f, type: 2}
3642 m_WrapMode: 0 3642 m_WrapMode: 0
3643 m_PlayAutomatically: 1 3643 m_PlayAutomatically: 1
3644 m_AnimatePhysics: 0 3644 m_AnimatePhysics: 0
Assets/Scripts/Export Video/ExportVideo.cs
  Diff comments   View file @c06a78c
@@ -38,7 +38,7 @@ public class ExportVideo : MonoBehaviour { @@ -38,7 +38,7 @@ public class ExportVideo : MonoBehaviour {
38 public MediaShareIOS MediaShareIOS; 38 public MediaShareIOS MediaShareIOS;
39 39
40 private MediaShareIOS share = new MediaShareIOS(); 40 private MediaShareIOS share = new MediaShareIOS();
41 - private const string SERVER_URL = "http://150.165.205.84:80/video"; 41 + private const string SERVER_URL = "http://traducao.vlibras.gov.br/video";
42 42
43 43
44 44
@@ -91,9 +91,7 @@ public class ExportVideo : MonoBehaviour { @@ -91,9 +91,7 @@ public class ExportVideo : MonoBehaviour {
91 91
92 private void export() 92 private void export()
93 { 93 {
94 - if (true)  
95 - {  
96 - int fiveTimesCount; 94 + int fiveTimesCount;
97 95
98 /* Making the app shows the dialog for the user every five times.*/ 96 /* Making the app shows the dialog for the user every five times.*/
99 97
@@ -139,12 +137,7 @@ public class ExportVideo : MonoBehaviour { @@ -139,12 +137,7 @@ public class ExportVideo : MonoBehaviour {
139 startExport(); 137 startExport();
140 } 138 }
141 139
142 - }  
143 - else  
144 - {  
145 - screenManager.showPermissionDialog("Para salvar e compartilhar as animações, permita que o Vlibras acesse mídia e arquivos de seu aparelho.", "Exportar Vìdeo");  
146 -  
147 - } 140 +
148 141
149 142
150 } 143 }
Assets/Scripts/Export Video/MediaShareIOS.cs
  Diff comments   View file @c06a78c
@@ -52,7 +52,9 @@ public class MediaShareIOS : MonoBehaviour { @@ -52,7 +52,9 @@ public class MediaShareIOS : MonoBehaviour {
52 { 52 {
53 SourceStream.Write(videoContent, 0, bytes); 53 SourceStream.Write(videoContent, 0, bytes);
54 SourceStream.Close(); 54 SourceStream.Close();
  55 +#if UNITY_IOS
55 ShareIOS.CallSendToGallery(Path.Combine(path,FilePath)); 56 ShareIOS.CallSendToGallery(Path.Combine(path,FilePath));
  57 +#endif
56 yield return new WaitForSeconds(1.0f); 58 yield return new WaitForSeconds(1.0f);
57 59
58 finishWriting(); 60 finishWriting();
@@ -73,7 +75,9 @@ public class MediaShareIOS : MonoBehaviour { @@ -73,7 +75,9 @@ public class MediaShareIOS : MonoBehaviour {
73 } 75 }
74 76
75 public void showAlert(string title,string message){ 77 public void showAlert(string title,string message){
76 - ShareIOS.CallSocialShare (title, message); 78 +#if UNITY_IOS
  79 + ShareIOS.CallSocialShare (title, message);
  80 +#endif
77 81
78 } 82 }
79 83
@@ -81,7 +85,7 @@ public class MediaShareIOS : MonoBehaviour { @@ -81,7 +85,7 @@ public class MediaShareIOS : MonoBehaviour {
81 85
82 public IEnumerator ShareIntent(Action errorAction) { 86 public IEnumerator ShareIntent(Action errorAction) {
83 87
84 - #if UNITY_IOS 88 +#if UNITY_IOS
85 if(File.Exists(Path.Combine(path,FilePath))){ 89 if(File.Exists(Path.Combine(path,FilePath))){
86 ShareIOS share = new ShareIOS(); 90 ShareIOS share = new ShareIOS();
87 PlayerLogger.Log("MediaShareIOS","ShareIntent","Trying to share video."); 91 PlayerLogger.Log("MediaShareIOS","ShareIntent","Trying to share video.");
@@ -100,7 +104,7 @@ public class MediaShareIOS : MonoBehaviour { @@ -100,7 +104,7 @@ public class MediaShareIOS : MonoBehaviour {
100 104
101 105
102 //GeneralSharingiOSBridge.ShareTextWithImage (Path.Combine(path, FilePath), "Vlibras video"); 106 //GeneralSharingiOSBridge.ShareTextWithImage (Path.Combine(path, FilePath), "Vlibras video");
103 - #endif 107 +#endif
104 108
105 yield break; 109 yield break;
106 } 110 }