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

         preference = Preference.getInstance(getApplicationContext());
         preference.load();
         if(TextUtils.isEmpty(preference.getDeviceUuid())) {
-        if(TextUtils.isEmpty(preference.getDeviceUuid())) {
+            Log.e("Encontre","vacio el preferencie"+preference.getDeviceUuid());
+            String uuid = UniqueID.id(getApplicationContext());
-            String uuid = UniqueID.id(getApplicationContext());
+            preference.setDeviceUuid(uuid);
-            preference.setDeviceUuid(uuid);
+            Log.e("Pero ya setie","uno nuevo"+uuid);
             preference.save();
        // reloadNavHeader();
+        Log.e("Se ejecuta", "On resumen");
-        Log.e("Se ejecuta", "On resumen");
+        Log.e("El device uuid",""+preference.getDeviceUuid());
         if(TextUtils.isEmpty(preference.getUserUuid())) {
         } else {
+            if(preference.getFragmentIdxActive() == 0) {
-            if(preference.getFragmentIdxActive() == 0) {
+                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+                Log.e("El device uuid",""+preference.getDeviceUuid());
             } else {
                 invokeFragment(preference.getFragmentIdxActive());
                 invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
                 break;
             case R.id.action_topicos:
                 setTitleActionBar(getString(R.string.menu_topics));
                 invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+                break;
+            case R.id.nav_timeline:
+                setTitleActionBar(getString(R.string.menu_timeline));
+                invokeFragment(Constants.IDX_FRAGMENT_TIMELINE);
                 break;
             case R.id.nav_progress:
         mAppDatabase.getCapsuleDao().removeAll();
         mAppDatabase.getTopicDao().removeAll();
         mAppDatabase.getUserExtendedDao().removeAll();
+        mAppDatabase.getUserLogDao().removeAll();
+        mAppDatabase.getProgressDao().removeAll();
         mAppDatabase.getNotificationCenterDao().removeAllnotifications();
         preference.setUserUuid("");
         preference.setFirstName("");
         preference.setLastName("");
             case Constants.IDX_FRAGMENT_TIMELINE  :
             case Constants.IDX_FRAGMENT_CAPSULES :
                 if(preference.getOrigenNavigation().equals("welcome"))
+                {
                     preference.setOrigennavigation("");
+                    setTitleActionBar(getString(R.string.app_name));
                     invokeFragment(Constants.IDX_FRAGMENT_WELCOME);
+                }
         preference.setCompanyUuidActive(companyUuid);
         preference.save();
+    }
     @Override
-    public void changeSlideActive(String slideUuid, String type, boolean showGallery)
+    public synchronized void changeSlideActive(String slideUuid, String type, boolean showGallery)
+    {
         preference.save();
-        if(showGallery) {
-            invokeFragment(Constants.IDX_FRAGMENT_GALLERY);
-            Log.e("Aqui","Es donde cambio el capsule");
-            SlideRefreshUIViewData slideRefreshUIViewData = mSlideRefreshUIViewModel.getSlideRefreshUIViewData();
-            slideRefreshUIViewData.setCambioSlide(true);
-            mSlideRefreshUIViewModel.getSlideRefreshUIMutableLiveData().setValue(slideRefreshUIViewData);
+        if(showGallery) {
             invokeFragment(Constants.IDX_FRAGMENT_GALLERY);
             //DatabaseHelper.CambioSlide="SI";
+        }
         UserLogDao userLogDao = mAppDatabase.getUserLogDao();
         SyncDao syncDao = mAppDatabase.getSyncDao();
+        Sync sync;
-        Sync sync;
+        String userUuid = preference.getUserUuid();
         // Progreso y UserLog  del Slide
         ProgressDao progressDao = mAppDatabase.getProgressDao();
-        Progress progressSlide = progressDao.selectBySlideUuid(slide.getUuid());
+        Progress progressSlide = progressDao.selectBySlideUuidAndUserUuid(slide.getUuid(), userUuid);
-        Progress progressCapsule =  progressDao.selectByCapsuleUuid(slide.getCapsuleUuid());
+        Progress progressCapsule =  progressDao.selectByCapsuleUuidAndUserUuid(slide.getCapsuleUuid(),userUuid);
-        Progress progressTopic =  progressDao.selectByTopicUuid(slide.getTopicUuid());
+        Progress progressTopic =  progressDao.selectByTopicUuidAndUserUuid(slide.getTopicUuid(),userUuid);
         int totalSlides = 0;
         resultCount = slideDao.getCountByTopicUuid(slide.getTopicUuid());
         totalSlides = resultCount.getCount();
-        resultCount = progressDao.getCountSlidesCompletedByTopicUuid(slide.getTopicUuid());
+        resultCount = progressDao.getCountSlidesCompletedByTopicUuidAndUserUuid(slide.getTopicUuid(), userUuid);
         viewSlides =  resultCount.getCount();
         if(totalSlides == 0) {
         /*** INICIO PROCESO CAPSULA ***/
         resultCount = slideDao.getCountByCapsuleUuid(slide.getCapsuleUuid());
         totalSlides = resultCount.getCount();
-        resultCount = progressDao.getCountSlidesCompletedByCapsuleUuid(slide.getCapsuleUuid());
+        resultCount = progressDao.getCountSlidesCompletedByCapsuleUuidAndUserUuid(slide.getCapsuleUuid(), userUuid);
         viewSlides =  resultCount.getCount();
         if(totalSlides == 0) {
             percentaje = 0;
     @Override
     public void launchQuizViewer(String quizUuid)
+    {
         ProgressDao progressDao = mAppDatabase.getProgressDao();
-        Progress progress = progressDao.selectBySlideUuid(preference.getSlideUuidActive());
+        Progress progress = progressDao.selectBySlideUuidAndUserUuid(preference.getSlideUuidActive(), preference.getUserUuid());
         boolean launch = false;
                         userLogDao.insert(userLog);
+                    }
+                }
+            }
+            String uuid;
             Company company;
+            if(data.has("quizzes")) {
+                Quiz quiz;
+                Question question;
+                Answer answer;
             if(data.has("quizzes")) {
                 arrayQuizzes = data.getJSONArray("quizzes");
                 for (i = 0; i < arrayQuizzes.length(); i++) {
-                    objQuiz = arrayQuizzes.getJSONObject(i);
-                    Quiz quiz = new Quiz();
-                    quiz.setUuid(  objQuiz.getString("uuid"));
+                    objQuiz = arrayQuizzes.getJSONObject(i);
-                    quiz.setCompanyUuid(  objQuiz.getString("company_uuid"));
-                    quiz.setFailed(  objQuiz.getString("failed"));
-                    quiz.setName(  objQuiz.getString("name"));
-                    quiz.setText(  objQuiz.getString("text"));
-                    quiz.setPoints(  objQuiz.getInt("points"));
-                    quiz.setMinimumPointsRequired(objQuiz.getInt("minimum_points_required"));
-                    quiz.setMaxTime( objQuiz.getInt("max_time"));
+                    uuid = objQuiz.getString("company_uuid");
-                    Company company = companyDao.selectByUuid(quiz.getCompanyUuid());
+                    company = companyDao.selectByUuid(uuid);
                     if (company == null) {
                         company = new Company();
                         company.setUuid(objQuiz.getString("company_uuid"));
                         company.setName(objQuiz.getString("company_name"));
                         company.setImage(objQuiz.getString("company_image"));
+                        companyDao.insert(company);
+                    } else {
+                        company.setName(objQuiz.getString("company_name"));
+                        company.setImage(objQuiz.getString("company_image"));
+                        companyDao.update(company);
+                    }
+                    uuid =  objQuiz.getString("uuid");
+                    quiz = quizDao.selectByUuid(uuid);
+                    if(quiz == null) {
+                        quiz = new Quiz();
+                        quiz.setUuid(  objQuiz.getString("uuid"));
+                        quiz.setCompanyUuid(  company.getUuid() );
+                        quiz.setFailed(  objQuiz.getString("failed"));
+                        quiz.setName(  objQuiz.getString("name"));
+                        quiz.setText(  objQuiz.getString("text"));
-                        companyDao.insert(company);
+                        quiz.setPoints(  objQuiz.getInt("points"));
+                        quiz.setMinimumPointsRequired(objQuiz.getInt("minimum_points_required"));
+                        quiz.setMaxTime( objQuiz.getInt("max_time"));
+                        quizDao.insert(quiz);
+                    } else {
+                        quiz.setCompanyUuid(  company.getUuid() );
+                        quiz.setFailed(  objQuiz.getString("failed"));
+                        quiz.setName(  objQuiz.getString("name"));
+                        quiz.setText(  objQuiz.getString("text"));
+                        quiz.setPoints(  objQuiz.getInt("points"));
+                        quiz.setMinimumPointsRequired(objQuiz.getInt("minimum_points_required"));
                         quiz.setMaxTime( objQuiz.getInt("max_time"));
                         quizDao.update(quiz);
                     quizDao.insert(quiz);
-                    arrayQuestions = objQuiz.getJSONArray("questions");
-                    for (j = 0; j < arrayQuestions.length(); j++) {
-                        objQuestion = arrayQuestions.getJSONObject(j);
-                        Question question = new Question();
-                        question.setQuizUuid( quiz.getUuid());
-                        question.setUuid( objQuestion.getString("uuid"));
+                    arrayQuestions = objQuiz.getJSONArray("questions");
+                    for (j = 0; j < arrayQuestions.length(); j++) {
+                        objQuestion = arrayQuestions.getJSONObject(j);
+                        uuid = objQuestion.getString("uuid");
+                        question = questionDao.selectByUuid(uuid);
+                        if(question == null) {
+                            question = new Question();
+                            question.setQuizUuid( quiz.getUuid());
+                            question.setUuid(uuid) ;
-                        question.setText( objQuestion.getString("text"));
+                            question.setText( objQuestion.getString("text"));
+                            question.setType( objQuestion.getString("type"));
+                            question.setPoints( objQuestion.getInt("points"));
+                            question.setMaxlength( objQuestion.getInt("maxlength"));
+                            questionDao.insert(question);
+                        } else {
+                            question.setQuizUuid( quiz.getUuid());
+                            question.setText( objQuestion.getString("text"));
+                            question.setType( objQuestion.getString("type"));
+                            question.setPoints( objQuestion.getInt("points"));
+                            question.setMaxlength( objQuestion.getInt("maxlength"));
-                        question.setType( objQuestion.getString("type"));
+                            questionDao.update(question);
                         question.setPoints( objQuestion.getInt("points"));
                         question.setMaxlength( objQuestion.getInt("maxlength"));
-                        questionDao.insert(question);
-                        arrayAnswers = objQuestion.getJSONArray("answers");
-                        for (x = 0; x < arrayAnswers.length(); x++) {
-                            objAnswer = arrayAnswers.getJSONObject(x);
-                            Answer answer = new Answer();
-                            answer.setQuestionUuid(question.getUuid());
+                        arrayAnswers = objQuestion.getJSONArray("answers");
+                        for (x = 0; x < arrayAnswers.length(); x++) {
+                            objAnswer = arrayAnswers.getJSONObject(x);
+                            uuid = objAnswer.getString("uuid");
+                            answer = answerDao.selectByUuid(uuid);
+                            if(answer == null) {
+                                answer = new Answer();
+                                answer.setQuestionUuid(question.getUuid());
+                                answer.setUuid(uuid);
+                                answer.setText(objAnswer.getString("text"));
+                                answer.setPoints(objAnswer.getInt("points"));
+                                answer.setCorrect(objAnswer.getString("correct"));
-                            answer.setUuid(objAnswer.getString("uuid"));
+                                answerDao.insert(answer);
-                            answer.setText(objAnswer.getString("text"));
+                            } else {
-                            answer.setPoints( objAnswer.getInt("points"));
+                                answer.setQuestionUuid(question.getUuid());
-                            answer.setCorrect(objAnswer.getString("correct"));
+                                answer.setText(objAnswer.getString("text"));
+                                answer.setPoints(objAnswer.getInt("points"));
+                                answer.setCorrect(objAnswer.getString("correct"));
+                                answerDao.update(answer);
+                            }
                             answerDao.insert(answer);
+                    }
-                    }
-                }
-            }
+                }
+            }
             if(data.has("topics")) {
                 JSONArray arrayTopics = data.getJSONArray("topics");
-                for (i = 0; i < arrayTopics.length(); i++) {
+            if(data.has("topics")) {
+                Topic topic;
+                Capsule capsule;
+                Slide slide;
+                JSONArray arrayTopics = data.getJSONArray("topics");
+                for (i = 0; i < arrayTopics.length(); i++) {
+                    objTopic = arrayTopics.getJSONObject(i);
+                    uuid = objTopic.getString("company_uuid");
+                    company = companyDao.selectByUuid(uuid);
+                    if (company == null) {
+                        company = new Company();
+                        company.setUuid(objTopic.getString("company_uuid"));
+                        company.setName(objTopic.getString("company_name"));
+                        company.setImage(objTopic.getString("company_image"));
+                        companyDao.insert(company);
+                    } else {
+                        company.setName(objTopic.getString("company_name"));
+                        company.setImage(objTopic.getString("company_image"));
+                        companyDao.update(company);
+                    }
+                    uuid = objTopic.getString("uuid");
+                    topic = topicDao.selectByUuid(uuid);
                     objTopic = arrayTopics.getJSONObject(i);
-                    Topic topic = new Topic();
+                    if (topic == null) {
+                        topic = new Topic();
+                        topic.setUuid(uuid);
-                    topic.setUuid(objTopic.getString("uuid"));
+                        topic.setCompanyUuid(company.getUuid());
-                    topic.setCompanyUuid(objTopic.getString("company_uuid"));
+                        topic.setName(objTopic.getString("name"));
-                    topic.setName(objTopic.getString("name"));
+                        topic.setDescription(objTopic.getString("description"));
+                        topic.setImage(objTopic.getString("image"));
+                        topic.setPosition(objTopic.getInt("position"));
+                        topicDao.insert(topic);
-                    topic.setDescription(objTopic.getString("description"));
+                    } else {
-                    topic.setImage(objTopic.getString("image"));
+                        topic.setCompanyUuid(company.getUuid());
+                        topic.setName(objTopic.getString("name"));
-                    topic.setPosition(objTopic.getInt("position"));
+                        topic.setDescription(objTopic.getString("description"));
+                        topic.setImage(objTopic.getString("image"));
+                        topic.setPosition(objTopic.getInt("position"));
+                        topicDao.update(topic);
+                    }
-                    Company company = companyDao.selectByUuid(topic.getCompanyUuid());
-                    if (company == null) {
+                    arrayCapsules = objTopic.getJSONArray("capsules");
-                        company = new Company();
+                    for (j = 0; j < arrayCapsules.length(); j++) {
-                        company.setUuid(objTopic.getString("company_uuid"));
+                        objCapsule = arrayCapsules.getJSONObject(j);
+                        uuid = objCapsule.getString("uuid");
+                        capsule = capsuleDao.selectByUuid(uuid);
+                        if(capsule == null) {
+                            capsule = new Capsule();
-                        company.setName(objTopic.getString("company_name"));
+                            capsule.setTopicUuid(topic.getUuid());
-                        company.setImage(objTopic.getString("company_image"));
+                            capsule.setUuid(uuid);
                             capsule.setName(objCapsule.getString("name"));
-                        companyDao.insert(company);
-                    }
-                    topicDao.insert(topic);
-                    arrayCapsules = objTopic.getJSONArray("capsules");
-                    for (j = 0; j < arrayCapsules.length(); j++) {
-                        objCapsule = arrayCapsules.getJSONObject(j);
-                        Capsule capsule = new Capsule();
-                        capsule.setTopicUuid(topic.getUuid());
-                        capsule.setUuid(objCapsule.getString("uuid"));
+                            capsule.setDescription(objCapsule.getString("description"));
+                            capsule.setImage(objCapsule.getString("image"));
+                            capsule.setPosition(objCapsule.getInt("position"));
+                            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"));
+                            capsuleDao.update(capsule);
+                        }
+                        arraySlides = objCapsule.getJSONArray("slides");
-                        capsule.setName(objCapsule.getString("name"));
+                        for (x = 0; x < arraySlides.length(); x++) {
+                            objSlide = arraySlides.getJSONObject(x);
+                            uuid = objSlide.getString("uuid");
+                            slide = slideDao.selectByUuid(uuid);
+                            if(slide == null) {
+                                slide = new Slide();
+                                slide.setUuid(uuid);
+                                slide.setTopicUuid(capsule.getTopicUuid());
+                                slide.setCapsuleUuid(capsule.getUuid());
+                                slide.setQuizUuid(objSlide.getString("quiz_uuid"));
-                        capsule.setDescription(objCapsule.getString("description"));
+                                slide.setName(objSlide.getString("name"));
-                        capsule.setImage(objCapsule.getString("image"));
+                                slide.setDescription(objSlide.getString("description"));
-                        capsule.setPosition(objCapsule.getInt("position"));
+                                slide.setPosition(objSlide.getInt("position"));
-                        capsuleDao.insert(capsule);
+                                slide.setType(objSlide.getString("type"));
+                                slide.setFile(objSlide.getString("file"));
+                                slide.setBackground(objSlide.getString("background"));
+                                slideDao.insert(slide);
+                            } else {
+                                slide.setTopicUuid(capsule.getTopicUuid());
+                                slide.setCapsuleUuid(capsule.getUuid());
+                                slide.setQuizUuid(objSlide.getString("quiz_uuid"));
+                                slide.setName(objSlide.getString("name"));
+                                slide.setDescription(objSlide.getString("description"));
+                                slide.setPosition(objSlide.getInt("position"));
+                                slide.setType(objSlide.getString("type"));
+                                slide.setFile(objSlide.getString("file"));
+                                slide.setBackground(objSlide.getString("background"));
+                                slideDao.update(slide);
+                            }
+                        }
+                    }
+                }
+            }
+            if(data.has( "extended")) {
+                JSONObject objExtended;
+                JSONObject objItem;
+                JSONArray objItems;
+                UserExtended userExtended;
+                JSONArray extendedCompanies = data.getJSONArray("extended");
+                for(i = 0 ; i < extendedCompanies.length(); i++)
+                {
+                    objExtended = extendedCompanies.getJSONObject(i);
+                    if(objExtended.has("details")) {
+                        uuid = objExtended.getString("company_uuid");
+                        company = companyDao.selectByUuid(uuid);
+                        if (company == null) {
+                            company = new Company();
+                            company.setUuid(objExtended.getString("company_uuid"));
+                            company.setName(objExtended.getString("company_name"));
+                            company.setImage(objExtended.getString("company_image"));
+                            companyDao.insert(company);
+                        } else {
+                            company.setName(objExtended.getString("company_name"));
+                            company.setImage(objExtended.getString("company_image"));
+                            companyDao.update(company);
+                        }
+                        objItems = objExtended.getJSONArray("details");
+                        for(j = 0 ; j < objItems.length(); j++) {
+                            objItem = objItems.getJSONObject(j);
+                            uuid =  objItem.getString("uuid");
-                        arraySlides = objCapsule.getJSONArray("slides");
+                            userExtended = userExtendedDao.selectByUuid(uuid);
-                        for (x = 0; x < arraySlides.length(); x++) {
+                            if(userExtended == null) {
-                            objSlide = arraySlides.getJSONObject(x);
+                                userExtended = new UserExtended();
                     preference.setCompanyUuidActive(companies.get(0).getUuid());
                 } else {
+                    boolean companyExist = false;
-                    boolean companyExist = false;
+                    for(i = 0; i < companies.size(); i++) {
                     for (Company company : companies) {
+                        if (companies.get(i).getUuid().equals(preference.getCompanyUuidActive())) {
-                        if (company.getUuid().equals(preference.getCompanyUuidActive())) {
+                            companyExist = true;
-                            companyExist = true;
+                            break;
                         }
+                    }
-                    if(!companyExist) {
+                    if(!companyExist && companies.size() > 0) {
                         preference.setCompanyUuidActive(companies.get(0).getUuid());
+                    }
+                }
-            } else {
-                preference.setCompanyUuidActive("");
-            }
-            if(data.has( "extended")) {
-                JSONObject objExtended;
-                JSONObject objItem;
-                JSONArray objItems;
-                String company_uuid;
-                UserExtended userExtended;
-                JSONArray extendedCompanies = data.getJSONArray("extended");
-                for(i = 0 ; i < extendedCompanies.length(); i++)
-                {
-                    objExtended = extendedCompanies.getJSONObject(i);
-                    if(objExtended.has("details")) {
-                        company_uuid = objExtended.getString("company_uuid");
-                        objItems = objExtended.getJSONArray("details");
-                        for(j = 0 ; j < objItems.length(); j++) {
-                            objItem = objItems.getJSONObject(j);
-                            userExtended = new UserExtended();
-                            userExtended.setCompanyUuid(company_uuid);
-                            userExtended.setUuid(objItem.getString("uuid"));
-                            userExtended.setLabel(objItem.getString("label"));
-                            userExtended.setValue(objItem.getString("value"));
-                            userExtendedDao.insert(userExtended);
             } else {
                 preference.setCompanyUuidActive("");
+    }
      */

Proyectos de Subversion Android Microlearning - Nuevo Interface

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