WebSVN – SmartDukaan – Diff – /trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/SplashScreen.java

 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.telephony.TelephonyManager;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ProgressBar;
+import android.widget.Toast;
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 import com.saholic.profittill.Constants.ProfitTillConstants;
+import com.saholic.profittill.Utils.UtilityFunctions;
 import com.saholic.profittill.main.GoogleAnalyticsTracker;
 import com.saholic.profittill.main.LoginActivity;
 import com.saholic.profittill.main.MainActivity;
 import com.saholic.profittill.main.MobileNumber;
 import com.saholic.profittill.main.ReferrerActivity;
 public class SplashScreen extends ActionBarActivity {
     SharedPreferences apiData, userData,apkData;
     SharedPreferences.Editor apiEditor,userEditor,apkDataEditor;
+    UtilityFunctions utilityFunctions;
     AlertDialog dialog1;
     AlertDialog.Builder b;
     ProgressBar pd;
     ArrayList<NameValuePair> apkDataListValue;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         TestinAgent.init(this);
         super.onCreate(savedInstanceState);
+        Log.d("On Create","On Create");
         setContentView(R.layout.activity_splash_screen);
         getSupportActionBar().hide();
         userData = getApplicationContext().getSharedPreferences("User_Data", MODE_PRIVATE);
         apkData = getApplicationContext().getSharedPreferences("APK_Data", MODE_PRIVATE);
         apiData = getApplicationContext().getSharedPreferences("API_Data", MODE_PRIVATE);
             String apkVersionName = apkData.getString("versionName","");
             if(userData.getString("id","").isEmpty()) {
             }else {
                 if (apkVersionCode.isEmpty()) {
-                    PackageManager manager = this.getPackageManager();
+                    /*PackageManager manager = this.getPackageManager();
                     PackageInfo info = manager.getPackageInfo(this.getPackageName(), 0);
                     TelephonyManager telephonyManager = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
                     apkDataListValue = new ArrayList<>();
                     apkDataListValue.add(new BasicNameValuePair("user_id",userData.getString("id","")));
                     apkDataListValue.add(new BasicNameValuePair("versioncode",info.versionCode+""));
                     apkDataListValue.add(new BasicNameValuePair("model",Build.MODEL));
                     apkDataListValue.add(new BasicNameValuePair("brand",Build.BRAND));
                     apkDataEditor.putString("versionCode", info.versionCode + "");
                     apkDataEditor.putString("versionName", info.versionName);
                     apkDataEditor.putString("osVersion",android.os.Build.VERSION.SDK_INT+"");
-                    apkDataEditor.putString("imeiNumber",telephonyManager.getDeviceId());
+                    apkDataEditor.putString("imeiNumber",telephonyManager.getDeviceId());*/
+                    utilityFunctions=new UtilityFunctions();
+                    apkDataListValue = utilityFunctions.getDeviceInformation(this);
                     if(isInternetOn()) {
                         new pushApkData().execute();
+                    }
                 } else if (!(apkData.getString("checkId","blank").equalsIgnoreCase(userData.getString("id","blank")))) {
-                    PackageManager manager = this.getPackageManager();
-                    PackageInfo info = manager.getPackageInfo(this.getPackageName(), 0);
-                    TelephonyManager telephonyManager = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-                    apkDataListValue = new ArrayList<>();
+                    utilityFunctions=new UtilityFunctions();
-                    apkDataListValue.add(new BasicNameValuePair("user_id",userData.getString("id","")));
-                    apkDataListValue.add(new BasicNameValuePair("versioncode",info.versionCode+""));
-                    apkDataListValue.add(new BasicNameValuePair("versionname",info.versionName+""));
-                    apkDataListValue.add(new BasicNameValuePair("osversion",android.os.Build.VERSION.SDK_INT+""));
-                    apkDataListValue.add(new BasicNameValuePair("imeinumber",telephonyManager.getDeviceId()));
-                    apkDataListValue.add(new BasicNameValuePair("manufacturer",Build.MANUFACTURER));
-                    apkDataListValue.add(new BasicNameValuePair("model",Build.MODEL));
-                    apkDataListValue.add(new BasicNameValuePair("brand",Build.BRAND));
-                    apkDataEditor.putString("versionCode",info.versionCode+"");
-                    apkDataEditor.putString("versionName",info.versionName);
+                    apkDataListValue = utilityFunctions.getDeviceInformation(this);
-                    apkDataEditor.putString("osVersion",android.os.Build.VERSION.SDK_INT+"");
-                    apkDataEditor.putString("imeiNumber",telephonyManager.getDeviceId());
                     if(isInternetOn()) {
                         new pushApkData().execute();
+                    }
                 } else if (Integer.parseInt(apkVersionCode) == getPackageManager().getPackageInfo(getPackageName(), 0).versionCode) {
                 }  else {
-                    PackageManager manager = this.getPackageManager();
-                    PackageInfo info = manager.getPackageInfo(this.getPackageName(), 0);
-                    TelephonyManager telephonyManager = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-                    apkDataListValue = new ArrayList<>();
+                    utilityFunctions=new UtilityFunctions();
-                    apkDataListValue.add(new BasicNameValuePair("user_id",userData.getString("id","")));
-                    apkDataListValue.add(new BasicNameValuePair("versioncode",info.versionCode+""));
-                    apkDataListValue.add(new BasicNameValuePair("versionname",info.versionName+""));
-                    apkDataListValue.add(new BasicNameValuePair("osversion",android.os.Build.VERSION.SDK_INT+""));
-                    apkDataListValue.add(new BasicNameValuePair("imeinumber",telephonyManager.getDeviceId()));
-                    apkDataListValue.add(new BasicNameValuePair("manufacturer",Build.MANUFACTURER));
-                    apkDataListValue.add(new BasicNameValuePair("model",Build.MODEL));
-                    apkDataListValue.add(new BasicNameValuePair("brand",Build.BRAND));
-                    apkDataEditor.putString("versionCode",info.versionCode+"");
-                    apkDataEditor.putString("versionName",info.versionName);
+                    apkDataListValue = utilityFunctions.getDeviceInformation(this);
-                    apkDataEditor.putString("osVersion",android.os.Build.VERSION.SDK_INT+"");
-                    apkDataEditor.putString("imeiNumber",telephonyManager.getDeviceId());
                     if(isInternetOn()) {
                         new pushApkData().execute();
+                    }
+                }
+            }
     class fetchAPISettings extends AsyncTask<String, Integer, JSONObject> {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            /*final Dialog dialog = new Dialog(getApplicationContext(), android.R.style.Theme_Translucent);
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-            //here we set layout of progress dialog
-            dialog.setContentView(R.layout.activity_splash_internet_not_working);*/
-            //bar.setVisibility(View.VISIBLE);
-            //showProgressDialog();
+        }
         @Override
         protected JSONObject doInBackground(String... arg0) {
             try {
     class pushApkData extends AsyncTask<String, Integer, String> {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            // showProgressDialog();
+        }
         @Override
         protected String doInBackground(String... arg0) {
             try {
     public final boolean isInternetOn() {
         ConnectivityManager connection =
                 (ConnectivityManager)getSystemService(this.getBaseContext().CONNECTIVITY_SERVICE);
-        if (  connection.getNetworkInfo(0).getState() == android.net.NetworkInfo.State.CONNECTING ||
-                connection.getNetworkInfo(1).getState() == android.net.NetworkInfo.State.CONNECTING ||
-                connection.getNetworkInfo(0).getState() == android.net.NetworkInfo.State.CONNECTED ||
+        if (    connection.getNetworkInfo(0).getState() == android.net.NetworkInfo.State.CONNECTED ||
                 connection.getNetworkInfo(1).getState() == android.net.NetworkInfo.State.CONNECTED ) {
             /*Toast.makeText(this, " Connected ", Toast.LENGTH_LONG).show();*/
             return true;
         } else if (
+                connection.getNetworkInfo(0).getState() == android.net.NetworkInfo.State.CONNECTING ||
+                        connection.getNetworkInfo(1).getState() == android.net.NetworkInfo.State.CONNECTING ||
                 connection.getNetworkInfo(0).getState() == android.net.NetworkInfo.State.DISCONNECTED ||
                         connection.getNetworkInfo(1).getState() == android.net.NetworkInfo.State.DISCONNECTED  ) {
- /*           Toast.makeText(this, " Not Connected ", Toast.LENGTH_LONG).show();*/
+/*            Toast.makeText(this, " Not Connected ", Toast.LENGTH_LONG).show();*/
             return false;
+        }
         return false;
+    }
     private void showProgressDialog()
+    {
-       // bar = (ProgressBar) this.findViewById(R.id.progressBar);
-       /* pDlg =  new ProgressDialog(new ContextThemeWrapper(SplashScreen.this, android.R.style.Theme_Holo_Light_Dialog));
-        pDlg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        pDlg.setIndeterminate(true);
-        pDlg.setCancelable(false);
-        pDlg.setProgressDrawable(getResources().getDrawable(R.drawable.greenprogressdialog));
-        pDlg.show();*/
-       // pDlg.setContentView(R.layout.activity_splash_internet_not_working);
         pDlg =  new ProgressDialog(getApplicationContext());
         pDlg.setIndeterminate(true);
         pDlg.setCancelable(false);
         pDlg.show();
+    }
     ProgressDialog pDlg;
+/*
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        Log.d("On Restore Instance","On Restore Instance");
+        super.onRestoreInstanceState(savedInstanceState);
+    }
+    @Override
+    protected void onRestart() {
+        Log.d("On Restart","On Restart");
-    //ProgressBar bar;
+        super.onRestart();
+        try {
+            String apkVersionCode = apkData.getString("versionCode","");
+            String apkVersionName = apkData.getString("versionName","");
+            if(userData.getString("id","").isEmpty()) {
+            }else {
+                if (apkVersionCode.isEmpty()) {
+                    apkDataListValue = getDeviceInformation();
+                    if(isInternetOn()) {
+                        new pushApkData().execute();
+                    }
+                } else if (!(apkData.getString("checkId","blank").equalsIgnoreCase(userData.getString("id","blank")))) {
+                    apkDataListValue = getDeviceInformation();
+                    if(isInternetOn()) {
+                        new pushApkData().execute();
+                    }
+                } else if (Integer.parseInt(apkVersionCode) == getPackageManager().getPackageInfo(getPackageName(), 0).versionCode) {
+                }  else {
+                    apkDataListValue = getDeviceInformation();
+                    if(isInternetOn()) {
+                        new pushApkData().execute();
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(isInternetOn()){
+            new fetchAPISettings().execute();
+        }
+        else{
+            b= new AlertDialog.Builder(this);
+            b.setMessage("No internet connection. Please try again.");
+            b.setCancelable(false);
+            b.setPositiveButton("Retry", new DialogInterface.OnClickListener()
+            {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if(isInternetOn()){
+                        new fetchAPISettings().execute();
+                        dialog1.dismiss();
+                    }
+                    else{
+                        dialog1 = b.create();
+                        dialog1.show();
+                    }
+                }
+            });
+            b.setNegativeButton("No", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                }
+            });
+            dialog1 = b.create();
+            dialog1.show();
+        }
+    }
+    public ArrayList<NameValuePair> getDeviceInformation(){
+        ArrayList<NameValuePair> deviceDataList=null;
+        try {
+            PackageManager manager = this.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(this.getPackageName(), 0);
+            TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            deviceDataList = new ArrayList<>();
+            deviceDataList.add(new BasicNameValuePair("user_id", userData.getString("id", "")));
+            deviceDataList.add(new BasicNameValuePair("versioncode", info.versionCode + ""));
+            deviceDataList.add(new BasicNameValuePair("versionname", info.versionName + ""));
+            deviceDataList.add(new BasicNameValuePair("osversion", android.os.Build.VERSION.SDK_INT + ""));
+            deviceDataList.add(new BasicNameValuePair("imeinumber", telephonyManager.getDeviceId()));
+            deviceDataList.add(new BasicNameValuePair("manufacturer", Build.MANUFACTURER));
+            deviceDataList.add(new BasicNameValuePair("model", Build.MODEL));
+            deviceDataList.add(new BasicNameValuePair("brand", Build.BRAND));
+            apkDataEditor.putString("versionCode", info.versionCode + "");
+            apkDataEditor.putString("versionName", info.versionName);
+            apkDataEditor.putString("osVersion", android.os.Build.VERSION.SDK_INT + "");
+            apkDataEditor.putString("imeiNumber", telephonyManager.getDeviceId());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return deviceDataList;
+    }
+*/
+    /*@Override
+    protected void onPause() {
+        Log.d("On Pause","On Pause");
+        super.onPause();
+    }*/
+}

Subversion Repositories SmartDukaan

(root)/trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/SplashScreen.java – Rev 14792 → 14991