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

 import com.cesams.twogetskills.entity.UserLog;
 import com.cesams.twogetskills.preference.Preference;
 import com.cesams.twogetskills.receiver.ConnectivityReceiver;
 import com.cesams.twogetskills.receiver.InternalReceiver;
 import com.cesams.twogetskills.room.ResultCount;
+import com.cesams.twogetskills.skeleton.IReloadData;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.material.snackbar.Snackbar;
     private boolean isSyncDevice = false;
     private boolean isSyncToken = false;
     private boolean isSyncBatch = false;
     private boolean isForeground = false;
     private boolean isSmartLockLoginRun = false;
+    private boolean isShowingCartelRefresh = false;
     private final static String PREFIX_FRAG = "FRAG";
     private final static String TAG = "C2GS - MainActivity";
         if (getIntent().getExtras() != null) {
             for (String key : getIntent().getExtras().keySet()) {
                 Object value = getIntent().getExtras().get(key);
+                if(value.toString().equals("content-refresh") && !isShowingCartelRefresh)
+                    {
-                if(value.toString().equals("content-refresh") && !preference.isRefreshContentRequired())
+                        Log.e("OnCreate","intent cartel");
                         //Vengo de notificacion, pero el app estaba cerrada, asi que muestro el cartel de content-refresh
-                       // preference.setRefreshContentRequired(true);
-                        saveNotificationCenterNew("Nuevo contenido para descargar","","Tienes nuevas capsulas de aprendizaje para descargar");
+                       // preference.setRefreshContentRequired(true);
                         saveNotificationCenterNew("Nuevo contenido para descargar","","Tienes nuevas capsulas de aprendizaje para descargar");
                         CartelRefreshContent();
         isForeground = true;
         preference = Preference.getInstance(getApplicationContext());
         preference.load();
-        if(preference.isRefreshContentRequired())
+        if(preference.isRefreshContentRequired() && !isShowingCartelRefresh)
+        {
             //Hubo una notificacion de actualización de contenido antes
             // pero no se pudo procesar por alguna interrupcion
                     : "Hay " + new_capsules + " cápsulas disponible";
             showMessageSnackBarWithClose(message);
-            saveNotificationCenterNew("Nuevo cápsula","",message);
+            saveNotificationCenterNew("Nueva cápsula","",message);
         } else {
             showMessageSnackBarWithClose(body);
-            saveNotificationCenterNew("Nuevo contenido","",body);
+            saveNotificationCenterNew(title,"",body);
+        }
+    if(content_refresh)
+    {
         if(!isShowingCartelRefresh)
     if(content_refresh)
+        }
+    }
+    @Override
+    public void saveNotificationCenter(String title, String url, String mensaje) {
+        saveNotificationCenterNew(title,url,mensaje);
+    }
     @Override
     public void signout()
+    {
         mAppDatabase.getAnswerDao().removeAll();
         if (command.equals("signout")) {
             signout();
+        }
+        if (command.equals("content-refresh")){
-        if (command.equals("content-refresh")){
+            if (!isShowingCartelRefresh) {
-            if (!preference.isRefreshContentRequired()) {
+                Log.e("On Execute fcm command","intent cartel");
                 saveNotificationCenterNew("Nuevo contenido para descargar", "", "Tienes nuevas capsulas de aprendizaje para descargar");
+               // preference.setRefreshContentRequired(true);
-               // preference.setRefreshContentRequired(true);
+                CartelRefreshContent();
+            }
                 CartelRefreshContent();
+    }
     public void CartelRefreshContent (){
+        isShowingCartelRefresh= true;
-    public void CartelRefreshContent (){
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MainActivity.this);
+        alertDialogBuilder.setMessage("Tienes nuevas capsulas para descargar");
+        alertDialogBuilder.setPositiveButton("Si, actualizar ahora",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface arg0, int arg1) {
+                        preference.setRefreshContentRequired(true);
+                        if(preference.getFragmentIdxActive() == Constants.IDX_FRAGMENT_TOPICS) {
-        preference.setRefreshContentRequired(true);
+                            String fragmentKeyActual = PREFIX_FRAG + preference.getFragmentIdxActive();
+                            if (fragmentHashMap.containsKey(fragmentKeyActual)) {
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MainActivity.this);
+                                Fragment fragment = fragmentHashMap.get(fragmentKeyActual);
-        alertDialogBuilder.setMessage("Tienes nuevas capsulas para descargar");
+                                if (fragment instanceof IReloadData) {
-        alertDialogBuilder.setPositiveButton("Si, actualizar ahora",
+                                    ((IReloadData) fragment).onReloadData();
                 new DialogInterface.OnClickListener() {
                     @Override
+                        }
+                        else{
+                            invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+                        }
+                    }
-                    public void onClick(DialogInterface arg0, int arg1) {
+                });
                         //Toast.makeText(MainActivity.this,"Actualizando tu contenido...",Toast.LENGTH_LONG).show();
         if(intent.getExtras() != null) {
             for (String key : intent.getExtras().keySet()) {
                 Object value = intent.getExtras().get(key);
                 if (value.toString().equals("content-refresh")) {
-                    if (!preference.isRefreshContentRequired()) {
+                    if (!isShowingCartelRefresh) {
                       //  preference.setRefreshContentRequired(true);
+                        saveNotificationCenterNew("Nuevo contenido para descargar", "", "Tienes nuevas capsulas de aprendizaje para descargar");
                         saveNotificationCenterNew("Nuevo contenido para descargar", "", "Tienes nuevas capsulas de aprendizaje para descargar");
                         Log.e("On new","intent cartel");
                         CartelRefreshContent();
+                    }
+                }
     @Override
     public Preference getPreference() {
         return preference;
+    }
-    /*
-    public void refreshContent(){
-        try {
-            TimeZone timeZone = TimeZone.getTimeZone("UTC");
-            Calendar calendar = Calendar.getInstance(timeZone);
-            TimeZone tz = calendar.getTimeZone();
-            int created = (int) (calendar.getTimeInMillis() / 1000);
-            Random random = new Random(created);
-            int rand = 1000 + random.nextInt(8999);
-            Log.d(TAG, "token = " + preference.getDeviceUuid());
-            Log.d(TAG, "created = " + created);
-            Log.d(TAG, "rand = " + rand);
-            Log.d(TAG, "calc = " + preference.getPassword() + ':' + created + ':' + rand);
-            String secret = MD5.generar(preference.getPassword() + ':' + created + ':' + rand);
-            Log.d(TAG, "secret = " + secret);
-            Log.d(TAG, "URL = " + Configuration.URL_REFRESH);
-            Request request = new Request.Builder()
-                    .url(Configuration.URL_REFRESH)
-                    .build();
-            Http http = new Http(getCacheDir(), preference.getDeviceUuid(), secret, created, rand);
-            OkHttpClient client = http.getHttpClient(false);
-            Call call = client.newCall(request);
-            call.enqueue(new Callback() {
-                public void onResponse(Call call, Response response)
-                        throws IOException {
-                    processResponseServer(response.body().string());
-                }
-                public void onFailure(Call call, IOException e) {
-                    Log.d(TAG, "Error :  " + e.getMessage());
-                }
-            });
-        } catch (Exception e) {
            showMessageSnackBar(e.getMessage());
 */
+            }
         });
+    }
      */
-    /*
-    private void processResponseServer(String dataString) {
-        Log.d(TAG, "processResponseServer = " + dataString);
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    JSONObject objJSON = new JSONObject(dataString);
-                    boolean success = objJSON.has("success") ? objJSON.getBoolean("success") : false;
-                    String message = "";
-                    if (objJSON.has("data")) {
-                        Object item = objJSON.get("data");
-                        if (item instanceof String) {
-                            message = item.toString();
-                        }
-                    }
-                    if (success) {
-                        getDatabase().getAnswerDao().removeAll();
-                        getDatabase().getQuestionDao().removeAll();
-                        getDatabase().getQuizDao().removeAll();
-                        getDatabase().getSlideDao().removeAll();
-                        getDatabase().getCapsuleDao().removeAll();
-                        getDatabase().getTopicDao().removeAll();
-                        getDatabase().getUserExtendedDao().removeAll();
-                        getDatabase().getUserLogDao().removeAllUserUuidNotEqual(preference.getUserUuid());
-                        getDatabase().getProgressDao().removeAllUserUuidNotEqual(preference.getUserUuid());
-                        JSONObject data = objJSON.getJSONObject("data");
-                        syncFromServer(data);
-                        preference.setRefreshContentRequired(false);
-                        Toast.makeText(getApplicationContext(), "¡Contenido actualizado con exito!", Toast.LENGTH_SHORT).show();
-                        invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
-                    } else {
-                       showMessageSnackBar(message);
-                    }
-                } catch (JSONException e) {
-                    Log.d(TAG, e.getMessage());
-                }
-            }
-        });

Proyectos de Subversion Android Microlearning - Nuevo Interface

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