Update Modeling3dDemoManager.cs

* Success condition fixed for tasklist.
* TaskID logic changed.
* Syntax fixed.

Author: alihan98ersoy

Assets/Huawei/Demos/Modeling3D/Modeling3dDemoManager.cs

@@ -10,7 +10,6 @@
 using UnityEngine.Android;
 using UnityEngine.UI;
 
-
 public class Modeling3dDemoManager : MonoBehaviour
 {
     ///It is necessary to add permissions in the Android manifest. Assets\Huawei\Plugins\Android\HMSUnityModelingKit.plugin\AndroidManifest.xml
@@ -24,7 +23,6 @@ public class Modeling3dDemoManager : MonoBehaviour
     };
 
     //Getting apikey in agconnect json file.
-    private const string YOUR_API_KEY = "";
     private const string TASK_LIST_PREFS_KEY = "3dTaskList";
     private const string TAG = "[HMS] Modeling3dDemoManager ";
 
@@ -38,7 +36,7 @@ public class Modeling3dDemoManager : MonoBehaviour
     [SerializeField] private GameObject taskList;
     [SerializeField] private GameObject taskItemPrefab;
     #endregion
-    /// TODO: This singleton can be written as a generic class to extend MonoBehavior. It saves code repetition and is available in every demo manager.r.
+    /// TODO: This singleton can be written as a generic class to extend MonoBehavior. It saves code repetition and is available in every demo manager.
     #region Singleton
 
     public static Modeling3dDemoManager Instance { get; private set; }
@@ -74,10 +72,7 @@ void Start()
         HMSModeling3dKitManager.Instance.OnResultDownload = OnResultDownload;
         //HMSModeling3dKitManager.Instance.OnResultPreview = OnResultPreview;
 
-        Debug.Log(TAG + "LogIn By API key");
-
-        HMSModeling3dKitManager.Instance.AuthWithApiKey(YOUR_API_KEY);
-
+        HMSModeling3dKitManager.Instance.AuthWithApiKey(HMSModelingKitSettings.ModelingKeyAPI);
     }
     public void OnUploadProgress(string taskId, double progress, AndroidJavaObject obj) {
         progressBar.current = Mathf.RoundToInt((float)progress);
@@ -93,7 +88,6 @@ public void OnUploadProgress(string taskId, double progress, AndroidJavaObject o
             modeling3dTaskEntity.Update(data);
             PlayerPrefs.SetString("currentTaskId", taskId);
         });
-
     }
     public void OnResultUpload(string taskId, Modeling3dReconstructUploadResult result, AndroidJavaObject obj)
     {
@@ -111,9 +105,9 @@ public void OnResultUpload(string taskId, Modeling3dReconstructUploadResult resu
                 data.Type = 1;
                 modeling3dTaskEntity.Update(data);
                 PlayerPrefs.SetString("currentTaskId", taskId);
+                PlayerPrefs.Save();
                 AndroidToast.MakeText("Upload Complated. Open Task List and Check It.").Show();
                 progressBar.gameObject.SetActive(false);
-
             });
         }
         else
@@ -131,7 +125,7 @@ public void OnDownloadProgress(string taskId, double progress, AndroidJavaObject
         HMSDispatcher.Invoke(() =>
         {
             var data = new Modeling3dDTO();
-            var currentTaskId = PlayerPrefs.GetString("currentTaskId");
+            var currentTaskId = PlayerPrefs.GetString("currentTaskId","null");
             data = modeling3dTaskEntity.Find(currentTaskId);
             data.TaskId = taskId;
             data.Status = $"DownloadProgress";
@@ -158,7 +152,6 @@ public void OnResultDownload(string taskId, Modeling3dReconstructDownloadResult
                 PlayerPrefs.SetString("currentTaskId", taskId);
                 AndroidToast.MakeText($"Download Complated.\n Download Path: {currentDownloadFilePath}").Show();
                 progressBar.gameObject.SetActive(false);
-
             });
         }
         else
@@ -168,7 +161,6 @@ public void OnResultDownload(string taskId, Modeling3dReconstructDownloadResult
                 AndroidToast.MakeText("Download Not Complated").Show();
             });
         }
-
     }
     public void OnResultPreview(string taskId, AndroidJavaObject obj)
     {
@@ -185,7 +177,6 @@ public void OnResultPreview(string taskId, AndroidJavaObject obj)
             modeling3dTaskEntity.Update(data);
             PlayerPrefs.SetString("currentTaskId", taskId);
             AndroidToast.MakeText("Preview Complated").Show();
-
         });
     }
     private bool ArePermissionsGranted(string[] permissions)
@@ -201,9 +192,9 @@ private bool ArePermissionsGranted(string[] permissions)
     }
     public void UploadFile()
     {
+        AndroidToast.MakeText("Number of Input Images:20 to 200 (at least 50 recommended.)").Show();
         AndroidFolderPicker.mOnSuccessListener = OnUploadSuccessFolderPicker;
         AndroidFolderPicker.OpenFolderPicker();
-
     }
     public void OnUploadSuccessFolderPicker(AndroidIntent androidIntent)
     {
@@ -215,7 +206,6 @@ public void OnUploadSuccessFolderPicker(AndroidIntent androidIntent)
         progressBar.current = 0;
         HMSModeling3dKitManager.Instance.UploadFile(settings, currentUploadFilePath);
         AndroidToast.MakeText("Start Uploading...").Show();
-
     }
     public void DownloadFile(string TaskId, string ModelFormat = null, int? TextureMode = null)
     {
@@ -237,7 +227,6 @@ public void OnDownloadSuccessFolderPicker(AndroidIntent androidIntent)
         progressBar.current = 0;
         HMSModeling3dKitManager.Instance.DownloadFile(config, PlayerPrefs.GetString("currentTaskId"), currentDownloadFilePath);
         AndroidToast.MakeText("Start Downloading...\n Please Back to Main Menu.").Show();
-
     }
     public void PreviewFile(string TaskId, int? TextureMode = null)
     {
@@ -250,16 +239,14 @@ public void PreviewFile(string TaskId, int? TextureMode = null)
 
         HMSModeling3dKitManager.Instance.PreviewFile(config, TaskId);
         AndroidToast.MakeText("Start Previewing...").Show();
-
-
     }
     public Modeling3dReconstructQueryResult QueryTask(string taskId = null)
     {
         if (taskId == null)
         {
             taskId = PlayerPrefs.GetString("currentTaskId");
         }
-        Debug.Log($"Current TaskId {taskId}");
+        Debug.Log($"{TAG} Current TaskId {taskId}");
         return HMSModeling3dKitManager.Instance.QueryTask(taskId);
     }
     public void Create3DCaptureImage()
@@ -296,7 +283,6 @@ public void Cancel3dModelReconstruct()
                 Invoke("CancelOperationWait", 5);
             });
         }
-
     }
     private void CancelOperationWait()
     {
@@ -326,7 +312,6 @@ public void TaskList()
 
         DestoryChildrenByType(taskListItemParentObj, typeof(TaskListDisplay));
         CreateTaskListItem(taskListData, taskListItem, taskListItemParentObj);
-
     }
     private void CreateTaskListItem(List<Modeling3dDTO> taskListData, TaskListDisplay taskListItem, GameObject taskListItemParentObj){
         foreach (var task in taskListData)
@@ -342,7 +327,7 @@ private void CreateTaskListItem(List<Modeling3dDTO> taskListData, TaskListDispla
                 taskListItem.RawImage.texture = texture;
             }
             taskListItem.HasDownloaded.gameObject.SetActive(!string.IsNullOrWhiteSpace(task.DownloadFilePath));
-            var successCondition = task.Status.Contains("3") && task.Status.Contains("success");
+            var successCondition = task.Status.Contains("3") && task.Status.Contains("Success");
             taskListItem.PreviewButton.gameObject.SetActive(successCondition);
             taskListItem.DownloadButton.gameObject.SetActive(successCondition);
 
@@ -357,7 +342,6 @@ private void CreateTaskListItem(List<Modeling3dDTO> taskListData, TaskListDispla
                 obj.transform.SetSiblingIndex(lastChild.GetSiblingIndex() + 1);
                 obj.transform.SetPositionAndRotation(new Vector3(lastChild.position.x, lastChild.position.y - 150, lastChild.position.z), lastChild.rotation);
             }
-            
         }
     }
     private void DestoryChildrenByType(GameObject parent, Type type)
@@ -378,7 +362,7 @@ public void DeleteTask(string taskId = null)
         {
             taskId = PlayerPrefs.GetString("currentTaskId");
         }
-        Debug.Log($"Current TaskId {taskId}");
+        Debug.Log($"{TAG} Current TaskId {taskId}");
         HMSModeling3dKitManager.Instance.DeleteTask(taskId);
     }