WebSVN – Android Microlearning - Inconcert – Diff – /app/src/main/java/com/cesams/twogetskills/inconcert/activity/MainActivity.java

 import com.cesams.twogetskills.inconcert.fragment.ProgressFragment;
 import com.cesams.twogetskills.inconcert.fragment.SlideFragment;
 import com.cesams.twogetskills.inconcert.fragment.TimelineFragment;
 import com.cesams.twogetskills.inconcert.fragment.TopicFragment;
 import com.cesams.twogetskills.inconcert.fragment.UserProfileFragment;
-import com.cesams.twogetskills.inconcert.fragment.WelcomeFragment;
+import com.cesams.twogetskills.inconcert.fragment.MyCapsulesFragment;
 import com.cesams.twogetskills.inconcert.library.Http;
 import com.cesams.twogetskills.inconcert.library.MD5;
 import com.cesams.twogetskills.inconcert.library.UniqueID;
 import com.cesams.twogetskills.inconcert.entity.Answer;
 import com.cesams.twogetskills.inconcert.entity.Capsule;
                     hideKeyboard(mNavigationView);
                   if(item.getItemId()==R.id.action_home){
                       setTitleActionBar(getString(R.string.app_name));
-                      invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
+                      invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES);
                       mNavigationView.getMenu().getItem(0).setChecked(true);
-                  }
                     if(item.getItemId()==R.id.action_topicos){
+            }
-        } else {
-            if(preference.getFragmentIdxActive() == 0) {
-                if(preference.getBiometricLogin())
-                {
-                    hideNavigationAndtoolbar();
-                    invokeFragment(Constants.IDX_FRAGMENT_BIOMETRIC);
-                }
+        } else {
-                else{
-                invokeFragment(Constants.IDX_FRAGMENT_WELCOME); //La pantalla principal ahora es Welcome, no Topic
             if(preference.getFragmentIdxActive() == 0) {
+                invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES); //La pantalla principal ahora es Welcome, no Topic
-            } else {
-                if(preference.getBiometricLogin())
-                {
-                    hideNavigationAndtoolbar();
-                    invokeFragment(Constants.IDX_FRAGMENT_BIOMETRIC);
+            } else {
+                switch (preference.getFragmentIdxActive())
+                {
+                    case Constants.IDX_FRAGMENT_GALLERY:
+                    case Constants.IDX_FRAGMENT_SLIDES:
-                }else
+                        if (preference.getCapsuleUuidActive().isEmpty() || preference.getSlideUuidActive().isEmpty()) {
+                            invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES);
+                        } else {
+                            invokeFragment(preference.getFragmentIdxActive());
+                        }
+                        break;
-                {
+                    case Constants.IDX_FRAGMENT_CAPSULES:
+                        if (preference.getTopicUuidActive().isEmpty()) {
+                            invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES);
-                    if(preference.getFragmentIdxActive()==Constants.IDX_FRAGMENT_BIOMETRIC){
+                        } else {
+                            invokeFragment(preference.getFragmentIdxActive());
+                        }
-                        invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
+                        break;
-                    else{
+                    default :
                         invokeFragment(preference.getFragmentIdxActive());
+                        break;
+                }
+            }
+        }
         if(!registrada)
+        {
             notificacionDao.insert(notificacionueva);
-            // region - Datos de prueba
-            /*
-            notificacionueva.setTitle("Otra cosa");
-            notificacionueva.setDate("2022-07-19");
-            notificacionueva.setDescription("Esto es prueba");
-            notificacionDao.insert(notificacionueva);
-            notificacionueva.setTitle("Alguna cosa");
-            notificacionueva.setDate("2022-07-05");
-            notificacionueva.setDescription("Otro nitificacion");
-            notificacionDao.insert(notificacionueva);
-            notificacionueva.setTitle("Alguna cosa");
-            notificacionueva.setDate("2022-07-05");
-            notificacionueva.setDescription("Otro de ese dia");
-            notificacionDao.insert(notificacionueva);
-*/
-            // endregion
             Log.e("No existe", "agregando.. "+ notificacionueva.getDescription());
+        }
                break;
             case Constants.IDX_FRAGMENT_COMPANIES:
             case Constants.IDX_FRAGMENT_TIMELINE  :
-                break;
-            case Constants.IDX_FRAGMENT_CAPSULES :
-                if(preference.getOrigenNavigation().equals(""))
-                {
-                    preference.setOrigennavigation("");
-                    setTitleActionBar(getString(R.string.app_name));
-                    invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                }
-                else {
-                    invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
+                break;
             case Constants.IDX_FRAGMENT_CAPSULES :
+                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
                 break;
                 break;
             case Constants.IDX_FRAGMENT_FINISH_TOPIC :
                 preference.setTopicUuidActive("");
-               // preference.setCapsuleUuidActive("");
+                preference.setTopicUuidActive("");
+                preference.setCapsuleUuidActive("");
+                preference.setSlideUuidActive("");
+                preference.save();
-                setNoCapsuleActive();
+                if(preference.getSourceNavigation() == Constants.SOURCE_NAVIGATION_MY_CAPSULES) {
+                    setTitleActionBar(getString(R.string.app_name));
-                preference.setSlideUuidActive("");
+                    invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES);
-                preference.save();
+                } else {
+                    invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                return;
+                }
-            case Constants.IDX_FRAGMENT_SLIDES :
+                return;
+            case Constants.IDX_FRAGMENT_SLIDES :
-                if(preference.getOrigenNavigation().equals("welcome"))
                 preference.setSlideUuidActive("");
-                    preference.setOrigennavigation("");
+                preference.save();
-                    setTitleActionBar(getString(R.string.app_name));
-                    invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
-                }
-                else {
-                    invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
-                }
-                return;
-            case Constants.IDX_FRAGMENT_GALLERY :
-                if(preference.getOrigenNavigation().equals("welcome"))
-                {
-                    preference.setOrigennavigation("");
+                if(preference.getSourceNavigation() == Constants.SOURCE_NAVIGATION_MY_CAPSULES) {
-                    setTitleActionBar(getString(R.string.app_name));
-                    invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
                     setTitleActionBar(getString(R.string.app_name));
                     invokeFragment(Constants.IDX_FRAGMENT_MY_CAPSULES);
+                } else {
+                    invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
+                }
-                else {
+                return;
-                    invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+            case Constants.IDX_FRAGMENT_FINISH_CAPSULE :
+                preference.setSlideUuidActive("");
+                preference.save();
                 if(preference.getSourceNavigation() == Constants.SOURCE_NAVIGATION_MY_CAPSULES) {
-                return;
+                    setTitleActionBar(getString(R.string.app_name));
                     add = true;
                     fragment = new UserProfileFragment();
+                }
                 break;
-            case Constants.IDX_FRAGMENT_WELCOME:
+            case Constants.IDX_FRAGMENT_MY_CAPSULES:
                // badgenotification.setVisibility(View.VISIBLE);
                 // getSupportActionBar().show();
                 //  mDrawerToggle.setDrawerIndicatorEnabled(true);
                 if(fragmentHashMap.containsKey(fragmentKeyNuevo)) {
                     fragment = fragmentHashMap.get(fragmentKeyNuevo);
                 } else {
                     add = true;
-                    fragment = new WelcomeFragment();
+                    fragment = new MyCapsulesFragment();
                   //  Log.e("Vete"," a welcome");
+                }
                 break;
+    }
     @Override
     public void changeTopicActive(String topicUuid)
     {
-        Log.d(TAG, "changeTopicActive : " + topicUuid);
-       // Log.e("Guardo", "Topico en Main");
         preference.setSourceNavigation(Constants.SOURCE_NAVIGATION_MY_CAPSULES);
-        preference.setTopicUuidActive(topicUuid);
-       // preference.setCapsuleUuidActive("");
-        setNoCapsuleActive();
+        preference.setTopicUuidActive(topicUuid);
         preference.setSlideUuidActive("");
         preference.save();
         invokeFragment(Constants.IDX_FRAGMENT_CAPSULES);
     }
+    @Override
-    @Override
+    public void changeCapsuleActiveSourceNavigationMyCapsules(String topicUuid, String capsuleUuid)
+    {
+        preference.setTopicUuidActive(topicUuid);
+        preference.setCapsuleUuidActive(capsuleUuid);
+        preference.setSlideUuidActive("");
+        preference.setSourceNavigation(Constants.SOURCE_NAVIGATION_MY_CAPSULES);
+        preference.save();
+        invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+        ProgressDao progressDao = getDatabase().getProgressDao();
-    public void changeCapsuleActive(String capsuleUuid)
+        Progress progress = progressDao.selectByCapsuleUuid(capsuleUuid);
+        if (progress != null && progress.getCompleted() == 1) {
+            invokeFragment(Constants.IDX_FRAGMENT_DETAIL_CAPSULE);
+        } else {
+            invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+        }
+    }
-    {
+    @Override
-        Log.d(TAG, "changeCapsuleActive : " + capsuleUuid);
+    public void changeCapsuleActiveSourceNavigationTopics(String capsuleUuid)
+    {
         Log.d(TAG, "changeCapsuleActiveSourceNavigationTopics capsuleUuid : " + capsuleUuid );
-     //   preference.setCapsuleUuidActive(capsuleUuid);
+        preference.setCapsuleUuidActive(capsuleUuid);
-        setCapsulaActiva(capsuleUuid);
         preference.setSlideUuidActive("");
-        preference.save();
+        preference.setSourceNavigation(Constants.SOURCE_NAVIGATION_TOPICS);
+        preference.save();
-        Progress progress; ProgressDao progressDao = getDatabase().getProgressDao();
-        progress = progressDao.selectByCapsuleUuid(capsuleUuid);
         ProgressDao progressDao = getDatabase().getProgressDao();
+        Progress progress = progressDao.selectByCapsuleUuid(capsuleUuid);
-        if(progress != null) {
+        if (progress != null && progress.getCompleted() == 1) {
+            invokeFragment(Constants.IDX_FRAGMENT_DETAIL_CAPSULE);
-            if (progress.getProgress() >= 100 && progress.getCompleted() == 1) {
+        } else {
+            invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+        }
+    }
+    @Override
+    public void changeCapsuleActive(String capsuleUuid)
+    {
+        Log.d(TAG, "changeCapsuleActive capsuleUuid : " + capsuleUuid );
+        preference.setCapsuleUuidActive(capsuleUuid);
+        preference.setSlideUuidActive("");
+        preference.save();
                 invokeFragment(Constants.IDX_FRAGMENT_DETAIL_CAPSULE);
-            } else {
+        ProgressDao progressDao = getDatabase().getProgressDao();
-                invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+        Progress progress = progressDao.selectByCapsuleUuid(capsuleUuid);
         if (progress != null && progress.getCompleted() == 1) {
             invokeFragment(Constants.IDX_FRAGMENT_DETAIL_CAPSULE);
-        else
+        } else {
-        {
+            invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
-            invokeFragment(Constants.IDX_FRAGMENT_SLIDES);
+        }
+    }
     /*
     public void setCapsulaActiva(String capsuleUuid) {
+        ConfigDao configuracion =  mAppDatabase.getConfigDao();
-        ConfigDao configuracion =  mAppDatabase.getConfigDao();
+        Config actual = configuracion.selectConfigByTitle("act_capsule");
         com.cesams.twogetskills.entity.Config confignueva;
         Config actual = configuracion.selectConfigByTitle("act_capsule");
+        }
+    }
+    @Override
+    public int getSourceNavigation() {
+        return preference.getSourceNavigation();
+    }
+    @Override
+    public
+    void setSourceNavigation(int sourceNavigation) {
+        preference.setSourceNavigation(sourceNavigation);
+    }
+    @Override
+    public void setTopicUuidActive(String topicUuid) {
+        preference.setTopicUuidActive(topicUuid);
+    }
+    @Override
+    public void setCapsuleUuidActive(String capsuleUuid) {
+        preference.setCapsuleUuidActive(capsuleUuid);
+    }
+    @Override
+    public void setSlideUuidActive(String slideUuid) {
+        preference.setSlideUuidActive(slideUuid);
+    }
     @Override
     public String getTopicUuidActive()
+    {
         return preference.getTopicUuidActive();
+    }
     @Override
-    public String getCapsuleUuidActive()
-    {
-       // return preference.getCapsuleUuidActive();
-        ConfigDao configuracion =  mAppDatabase.getConfigDao();
-        Config config = configuracion.selectConfigByTitle("act_capsule");
+    public String getCapsuleUuidActive()
         Log.e("algo","aqui"+config.getNow());
-        return config.getNow();
+        return preference.getCapsuleUuidActive();
+    }
         } else {
             newRecord = false;
             progressCapsule.setViewSlides(viewSlides);
             progressCapsule.setTotalSlides(totalSlides);
             progressCapsule.setProgress(percentaje);
+            progressCapsule.setUpdatedOn(dateOn);
             Log.d(TAG, "Progress Capsule : getLastCapsuleActive : " + preference.getLastCapsuleUuidActive());
-            Log.d(TAG, "Progress Capsule : CapsuleActive : " + preference.getCapsuleUuidActive());
+           // Log.d(TAG, "Progress Capsule : CapsuleActive : " + preference.getCapsuleUuidActive());
             if (!preference.getLastCapsuleUuidActive().equals(getCapsuleUuidActive())) {
                 //Log.d("requestCheckChanges", "secret = " + secret);
+                FormBody.Builder formBodyCheckChangeBuilder = new FormBody.Builder();
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_APPLICATION_ID, String.valueOf(Configuration.APPLICATION_ID));
-                FormBody.Builder formBodyCheckChangeBuilder = new FormBody.Builder();
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_VARIANT_ID, String.valueOf(Configuration.VARIANT_ID));
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_DEVICE_UUID, preference.getDeviceUuid());
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_DEVICE_UUID, preference.getDeviceUuid());
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_DATE_CHANGES, preference.getMaxDateChanges());
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_MAX_DATE_CHANGES, preference.getMaxDateChanges());
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_IS_FOREGROUND, String.valueOf(isForeground ? 1 : 0));
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_IS_FOREGROUND, String.valueOf(isForeground ? 1 : 0));
                 Http http = new Http(this.getCacheDir(), preference.getDeviceUuid(), secret, created, rand);
                 OkHttpClient client = http.getHttpClient(false);
-                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_IDS, String.valueOf(capsules.size()));
+                formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_FIELD_MAX_IDS, String.valueOf(capsules.size()));
                 //formBodyCheckChangeBuilder.add(Constants.POST_MICROLEARNING_CHECK_CHANGES_MAX_IDS, String.valueOf(0));
                         .url(Configuration.URL_CHECK_CHANGES)
                         .post(formBody)
                         .build();
                 Call call = client.newCall(request);
-                call.enqueue(new Callback() {
+                call.enqueue(new okhttp3.Callback() {
                     public void onResponse(Call call, Response response)
                     arrayCapsules = objTopic.getJSONArray("capsules");
                   //  Log.e("Objeto:",""+objTopic.getJSONArray("capsules"));
                     for (j = 0; j < arrayCapsules.length(); j++) {
+                        objCapsule = arrayCapsules.getJSONObject(j);
-                        objCapsule = arrayCapsules.getJSONObject(j);
+                        Log.e("Capsula:",""+objCapsule.toString());
                         uuid = objCapsule.getString("uuid");
                         capsule = capsuleDao.selectByUuid(uuid);
                         if(capsule == null) {
                             capsule = new Capsule();
                             capsule.setDescription(objCapsule.getString("description"));
                             capsule.setImage(objCapsule.getString("image"));
                             capsule.setPosition(objCapsule.getInt("position"));
                             capsule.setAddedOn(objCapsule.getString("added_on"));
                             capsule.setUpdatedOn(objCapsule.getString("updated_on"));
-                            capsule.setLink_comments(objCapsule.getString("link_comments"));
+                            capsule.setLinkComments(objCapsule.getString("link_comments"));
-                            capsule.setLink_comment_add(objCapsule.getString("link_comment_add"));
+                            capsule.setLinkCommentAdd(objCapsule.getString("link_comment_add"));
-                            capsule.setTotal_comments(objCapsule.getInt("total_comments"));
+                            capsule.setTotalComments(objCapsule.getInt("total_comments"));
-                            capsule.setTotal_rating(objCapsule.getInt("total_rating"));
+                            capsule.setTotalRating(objCapsule.getInt("total_rating"));
-                            Log.e("link1",""+objCapsule.getString("link_comments"));
-                            Log.e("link2",""+objCapsule.getString("link_comment_add"));
-                            Log.e("totalcom",""+objCapsule.getInt("total_comments"));
-                            Log.e("totalta",""+objCapsule.getInt("total_rating"));
                             // Log.e("Capsula ","added on"+objCapsule.getString("added_on"));
+                            capsuleDao.insert(capsule);
                             capsuleDao.insert(capsule);
                         } else {
                             capsule = new Capsule();
                             capsule.setTopicUuid(topic.getUuid());
                             capsule.setName(objCapsule.getString("name"));
                             capsule.setDescription(objCapsule.getString("description"));
                             capsule.setImage(objCapsule.getString("image"));
                             capsule.setPosition(objCapsule.getInt("position"));
                             capsule.setAddedOn(objCapsule.getString("added_on"));
                             capsule.setUpdatedOn(objCapsule.getString("updated_on"));
-                            capsule.setLink_comments(objCapsule.getString("link_comments"));
+                            capsule.setLinkComments(objCapsule.getString("link_comments"));
-                            capsule.setLink_comment_add(objCapsule.getString("link_comment_add"));
+                            capsule.setLinkCommentAdd(objCapsule.getString("link_comment_add"));
-                            capsule.setTotal_comments(objCapsule.getInt("total_comments"));
+                            capsule.setTotalComments(objCapsule.getInt("total_comments"));
-                            capsule.setTotal_rating(objCapsule.getInt("total_rating"));
+                            capsule.setTotalRating(objCapsule.getInt("total_rating"));
                            // Log.e("Capsula ","added on"+objCapsule.getString("added_on"));
                             capsuleDao.update(capsule);
                     RequestBody formBody = new FormBody.Builder()
                             .add(Constants.POST_DEVICE_FIELD_APPLICATION_ID,  String.valueOf(Configuration.APPLICATION_ID))
                             .add(Constants.POST_DEVICE_FIELD_DEVICE_UUID, preference.getDeviceUuid())
                             .add(Constants.POST_DEVICE_FIELD_MANUFACTURER, Build.MANUFACTURER)
                             .add(Constants.POST_DEVICE_FIELD_BRAND, Build.BRAND)
-                            .add(Constants.POST_DEVICE_FIELD_VERSION, Build.VERSION.RELEASE  + " " + Build.VERSION_CODES.class.getFields()[Build.VERSION.SDK_INT].getName())
+                            .add(Constants.POST_DEVICE_FIELD_VERSION, Build.VERSION.RELEASE  + " " + Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName())
                             .add(Constants.POST_DEVICE_FIELD_MODEL, Build.MODEL)
                             .add(Constants.POST_DEVICE_FIELD_PLATFORM, "android")
                             .add(Constants.POST_DEVICE_FIELD_SYNC_ID, String.valueOf(record.getId()))
                             .build();
                             .build();
                     isSyncDevice = true;
                     Call call = client.newCall(request);
-                    call.enqueue(new Callback() {
+                    call.enqueue(new okhttp3.Callback() {
                         public void onResponse(Call call, Response response)
                                 throws IOException {
                 try {
                     Http http = new Http(this.getCacheDir());
                     OkHttpClient client = http.getHttpClient(false);
+                    RequestBody formBody = new FormBody.Builder()
+                            .add(Constants.POST_FCM_FIELD_APPLICATION_ID,String.valueOf(Configuration.APPLICATION_ID))
-                    RequestBody formBody = new FormBody.Builder()
+                            .add(Constants.POST_FCM_FIELD_VARIANT_ID,String.valueOf(Configuration.VARIANT_ID))
                             .add(Constants.POST_FCM_FIELD_DEVICE_UUID,preference.getDeviceUuid())
                             .add(Constants.POST_FCM_FIELD_TOKEN, record.getData())
                             .add(Constants.POST_FCM_FIELD_SYNC_ID, String.valueOf(record.getId()))
                             .url(Configuration.URL_FCM)
                             .post(formBody)
                             .build();
                     Call call = client.newCall(request);
-                    call.enqueue(new Callback() {
+                    call.enqueue(new okhttp3.Callback() {
                         public void onResponse(Call call, Response response)
                                 throws IOException {
                             isSyncToken = false;
                             Log.e("Se envio", "Procesando respuesta");
             try {
                 Http http = new Http(this.getCacheDir());
+                OkHttpClient client = http.getHttpClient(false);
-                OkHttpClient client = http.getHttpClient(false);
+                formBodyBatchBuilder.add(Constants.POST_SYNC_BATCH_FIELD_APPLICATION_ID, String.valueOf(Configuration.APPLICATION_ID));
                 formBodyBatchBuilder.add(Constants.POST_SYNC_BATCH_FIELD_VARIANT_ID, String.valueOf(Configuration.VARIANT_ID));
                 formBodyBatchBuilder.add(Constants.POST_SYNC_BATCH_FIELD_MAX_RECORDS, String.valueOf(maxRecordsSyncBatch));
                 RequestBody formBody = formBodyBatchBuilder.build();
                 Log.d(TAG, "URL = " + Configuration.URL_SYNC_BATCH);
                 Request request = new Request.Builder()
                     .url(Configuration.URL_SYNC_BATCH)
                     .post(formBody)
                     .build();
                 Call call = client.newCall(request);
-                call.enqueue(new Callback() {
+                call.enqueue(new okhttp3.Callback() {

Proyectos de Subversion Android Microlearning - Inconcert

(root)/app/src/main/java/com/cesams/twogetskills/inconcert/activity/MainActivity.java – Rev 14 → 18