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

 import java.util.Random;
 import java.util.TimeZone;
 //import de.hdodenhof.circleimageview.CircleImageView;
+import okhttp3.Call;
-import okhttp3.Call;
+import okhttp3.Callback;
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
         if (getIntent().getExtras() != null) {
             for (String key : getIntent().getExtras().keySet()) {
                 Object value = getIntent().getExtras().get(key);
-                if(value.toString().equals("content-refresh"))
+                if(value.toString().equals("content-refresh") && !preference.isRefreshContentRequired())
                     {
                         //Vengo de notificacion, pero el app estaba cerrada, asi que muestro el cartel de content-refresh
-                        preference.setRefreshContentRequired(true);
+                       // preference.setRefreshContentRequired(true);
                         saveNotificationCenterNew("Nuevo contenido para descargar","","Tienes nuevas capsulas de aprendizaje para descargar");
         preference = Preference.getInstance(getApplicationContext());
         preference.load();
         if(preference.isRefreshContentRequired())
+        {
+            //Hubo una notificacion de actualización de contenido antes
-        {
+            // pero no se pudo procesar por alguna interrupcion
-            Cartelrefreshcontent();
+            CartelRefreshContent();
+        }
+            }
         } else {
-            if(preference.getFragmentIdxActive() == 0) {
-                invokeFragment(Constants.IDX_FRAGMENT_TOPICS);
+            if(preference.getFragmentIdxActive() == 0) {
-              //  Log.e("El device uuid",""+preference.getDeviceUuid());
+                invokeFragment(Constants.IDX_FRAGMENT_WELCOME); //La pantalla principal ahora es Welcome, no Topic
             } else {
-                invokeFragment(preference.getFragmentIdxActive());
+                    invokeFragment(preference.getFragmentIdxActive());
+            }
             showMessageSnackBarWithClose(body);
             saveNotificationCenterNew("Nuevo contenido","",body);
-        }
+        }
-        /*
+    if(content_refresh)
+    {
-        if(content_refresh) {
+        if(!preference.isRefreshContentRequired())
             //Levanto el cartel desde FMC Show
+            CartelRefreshContent();
-            Cartelrefreshcontent();
+        }
+    }
 */
             signout();
+        }
         if (command.equals("content-refresh")){
-            saveNotificationCenterNew("Nuevo contenido para descargar","","Tienes nuevas capsulas de aprendizaje para descargar");
+            if (!preference.isRefreshContentRequired()) {
+                saveNotificationCenterNew("Nuevo contenido para descargar", "", "Tienes nuevas capsulas de aprendizaje para descargar");
-            preference.setRefreshContentRequired(true);
+               // preference.setRefreshContentRequired(true);
+                CartelRefreshContent();
             Cartelrefreshcontent();
+        }
+    }
     public void CartelRefreshContent (){
         preference.setRefreshContentRequired(true);
-    public void Cartelrefreshcontent (){
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(MainActivity.this);
-        alertDialogBuilder.setMessage("Tienes nuevas capsulas para descargar");
-        alertDialogBuilder.setPositiveButton("Si, actualizar ahora",
+        alertDialogBuilder.setMessage("Tienes nuevas capsulas para descargar");
-                new DialogInterface.OnClickListener() {
+        alertDialogBuilder.setPositiveButton("Si, actualizar ahora",
-                    @Override
+                new DialogInterface.OnClickListener() {
         alertDialog.getButton(alertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.teal_700, null));
+    }
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        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()) {
+                      //  preference.setRefreshContentRequired(true);
+                        saveNotificationCenterNew("Nuevo contenido para descargar", "", "Tienes nuevas capsulas de aprendizaje para descargar");
+                        CartelRefreshContent();
+                    }
+                }
+            }
+        }
+    }
     @Override
     public void setConnectedInternet(Boolean isConnected)
+    {
         connected = isConnected;
     @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());
+        }
+    }
     public void requestCheckChanges()
+    {
+            }
         });
+    }
      */
+    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();
+                    } 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 48 → 49