Index: /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java =================================================================== --- /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (revision 17657) +++ /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (revision 17658) @@ -4,22 +4,20 @@ import java.nio.ByteOrder; import java.nio.DoubleBuffer; - -import android.app.ProgressDialog; -import android.content.Intent; import android.opengl.GLSurfaceView; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; +import android.app.Activity; +import android.app.ProgressDialog; import android.util.DisplayMetrics; import android.view.GestureDetector; -import android.view.GestureDetector.OnDoubleTapListener; -import android.view.GestureDetector.OnGestureListener; import android.view.Gravity; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; -import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.GestureDetector.OnDoubleTapListener; +import android.view.GestureDetector.OnGestureListener; +import android.view.MotionEvent; import android.view.animation.AccelerateInterpolator; import android.view.animation.Animation; @@ -35,10 +33,7 @@ import android.widget.Spinner; import android.widget.ViewFlipper; -// private static final int INVISIBLE = 0; -// Loading the ISSM library locally -// private IssmJni issmNative; -// ,sealevel; - -public class ISSM extends BaseActivity implements OnClickListener, +import android.os.Build; + +public class ISSM extends Activity implements OnClickListener, OnGestureListener, OnDoubleTapListener { // private static final int INVISIBLE = 0; @@ -46,6 +41,5 @@ private int screenHeight; private DoubleBuffer buff; - // Loading the ISSM library locally - // private IssmJni issmNative; + private IssmJni issmNative; private String mapName; private String issmFolder; @@ -66,5 +60,4 @@ private Spinner spinner; private boolean onSimulationScreen = false; - private String url = "http://blackhawk2.jpl.nasa.gov/issm/solve?callback=?"; // ------------------------------------------------------------------------------------------------ @@ -73,5 +66,4 @@ super.onCreate(savedInstanceState); setContentView(R.layout.main_issm); - transition(); // Set up a listener for double tap. @@ -90,64 +82,4 @@ } } - Button homeTab = (Button) findViewById(R.id.play_tab); - homeTab.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - Intent i = new Intent(ISSM.this, MenuPage.class); - startActivity(i); - finish(); - } - }); - - Button galleryTab = (Button) findViewById(R.id.gallery_tab); - galleryTab.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - Intent i = new Intent(ISSM.this, GalleryImage.class); - startActivity(i); - finish(); - } - }); - Button videoTab = (Button) findViewById(R.id.video_tab); - videoTab.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - // String url = "http://www.youtube.com/watch?v=KlDO0C8r_ws"; - // Intent i = new Intent(Intent.ACTION_VIEW); - // i.setData(Uri.parse(url)); - Intent i = new Intent(ISSM.this, VideoActivity.class); - startActivity(i); - finish(); - } - }); - Button aboutTab = (Button) findViewById(R.id.about_tab); - aboutTab.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - Intent i = new Intent(ISSM.this, AboutActivity.class); - startActivity(i); - finish(); - } - }); - Button teamTab = (Button) findViewById(R.id.team_tab); - teamTab.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - // String url = "http://issm.jpl.nasa.gov/"; - // Intent i = new Intent(Intent.ACTION_VIEW); - // i.setData(Uri.parse(url)); - // startActivity(i); - - Intent i = new Intent(ISSM.this, TeamActivity.class); - startActivity(i); - finish(); - } - }); - friction = MINIMUM + OFFSET; // temperature = MINIMUM + OFFSET; @@ -169,8 +101,8 @@ defaultMap = (ImageView) findViewById(R.id.defaultMap); dialog = new ProgressDialog(this); - colorBar = (ColorBar) findViewById(R.id.colorbar); + // colorBar = (ColorBar) findViewById(R.id.colorbar); // load up the ISSM library and create double buffer in java // which later on will be pass for native for allocation. - // issmNative = new IssmJni(); + issmNative = new IssmJni(); velocity = new Velocity(); @@ -188,5 +120,5 @@ colorMap.setColor(color); colorBar.setColorMap(colorMap); - // drawFigure(); + drawFigure(); } } @@ -213,5 +145,5 @@ } - // size = issmNative.createISSMModel(solution_type,issmFolder,file); + size = issmNative.createISSMModel(solution_type, issmFolder, file); buff = ByteBuffer.allocateDirect(size * 12 * 8) .order(ByteOrder.nativeOrder()).asDoubleBuffer(); @@ -307,7 +239,7 @@ defaultMap.setImageResource(R.drawable.greenland_button); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - defaultMap.setScaleX(1.12f); - defaultMap.setScaleY(0.92f); - defaultMap.setAlpha(1.0f); + // defaultMap.setScaleX(1.12f); + // defaultMap.setScaleY(0.92f); + // defaultMap.setAlpha(1.0f); } else { defaultMap.setAlpha(1); @@ -327,5 +259,5 @@ defaultMap.setImageResource(R.drawable.antarctica_button); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - defaultMap.setAlpha(1.0f); + // defaultMap.setAlpha(1.0f); } else { defaultMap.setAlpha(1); @@ -367,5 +299,5 @@ popupWindow.dismiss(); System.out.println("Friction = " + friction); - // new CalculationTask().execute(friction,temperature); + new CalculationTask().execute(friction, temperature); } }); @@ -403,5 +335,5 @@ }; thread.start(); - // issmNative.solveISSMModel(target[0],buff); + issmNative.solveISSMModel(target[0], buff); // System.out.println("temperature = " + target[1]); // issmNative.solveISSMModel(target[0],target[1],buff); @@ -445,13 +377,4 @@ } - // ------------------------------------------------------------------------------------- - - @Override - public void onBackPressed() { - Intent i = new Intent(ISSM.this, MenuPage.class); - startActivity(i); - finish(); - } - // ----------------------------------------------------------------------------------- private void fadeImage() { Index: /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMWebActivity.java =================================================================== --- /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMWebActivity.java (revision 17657) +++ /issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMWebActivity.java (revision 17658) @@ -14,4 +14,5 @@ import android.view.View; import android.view.View.OnClickListener; +import android.view.Window; import android.webkit.WebResourceResponse; import android.webkit.WebView; @@ -21,11 +22,11 @@ // URL of the index page of the ISSM web application - private String srcPath = "++"; + // private String srcPath = + // "http://issm.jpl.nasa.gov/externalicelab/index.html"; private String offPath = "file:///android_asset/externalicelab/index.html"; private final String KEY = "mode"; private String issmFolder = ""; private int MODE; - // private String srcPath = - // "http://www.csupomona.edu/~tqnguyen/CIS311/Project3/index.html"; + private String srcPath = "http://www.csupomona.edu/~lannguyen/ISSM_WEB/html/index.html"; private WebView myWebView; @@ -33,34 +34,35 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.activity_issmweb_online); - getActionBar().setCustomView(R.layout.actionbar_top_web); - getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); + // getActionBar().setCustomView(R.layout.actionbar_top_web); + // getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); MODE = getIntent().getExtras().getInt(KEY); - Button webHome = (Button) findViewById(R.id.web_home); - webHome.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - if (MODE == 0) { - myWebView.loadUrl(srcPath); - } else { - myWebView.loadUrl(offPath); - } - } - - }); - - Button webRefresh = (Button) findViewById(R.id.web_refresh); - webRefresh.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - myWebView.loadUrl(myWebView.getOriginalUrl()); - // Log.i("srcUrl: ", srcPath); - // Log.i("newUrl: ", myWebView.getOriginalUrl()); - } - - }); + // Button webHome = (Button) findViewById(R.id.web_home); + // webHome.setOnClickListener(new OnClickListener() { + // + // @Override + // public void onClick(View v) { + // if (MODE == 0) { + // myWebView.loadUrl(srcPath); + // } else { + // myWebView.loadUrl(offPath); + // } + // } + // + // }); + // + // Button webRefresh = (Button) findViewById(R.id.web_refresh); + // webRefresh.setOnClickListener(new OnClickListener() { + // + // @Override + // public void onClick(View v) { + // myWebView.loadUrl(myWebView.getOriginalUrl()); + // // Log.i("srcUrl: ", srcPath); + // // Log.i("newUrl: ", myWebView.getOriginalUrl()); + // } + // + // }); // final ProgressDialog loading = new ProgressDialog(this); @@ -77,9 +79,10 @@ if (url.startsWith("http") && !url.contains("http://thwaites.jpl.nasa.gov/fastcgi/visl-solve.py?callbacks")) { - myWebView.setVisibility(View.INVISIBLE); + // myWebView.setVisibility(View.INVISIBLE); + myWebView.stopLoading(); new AlertDialog.Builder(ISSMWebActivity.this) .setTitle("Error!") .setMessage( - "Option requires online mode. Please exit and enable connection to access the option.") + "Option requires online mode. Exit and enable connection to access the option.") .setCancelable(false) .setPositiveButton("Okay", @@ -88,18 +91,8 @@ DialogInterface dialog, int id) { - myWebView.loadUrl(offPath); - new Handler().postDelayed( - new Runnable() { - @Override - public void run() { - // This method - // will be - // executed once - // the timer is - // over - myWebView - .setVisibility(View.VISIBLE); - } - }, 700); + if (!myWebView.getOriginalUrl() + .equals(offPath)) { + myWebView.loadUrl(offPath); + } } }).show(); @@ -131,48 +124,4 @@ return null; - // URI uri = URI.create(url); - // String scheme = uri.getScheme(); - // // If scheme not http(s), let the default webview manage it - // if (!"http".equals(scheme) && !"https".equals(scheme)) { - // return null; - // } - - // URL url = uri.toURL(); - // - // if(doCancelRequest(url)) { - // // Empty response - // Log.d(TAG, "URL filtered: " + url); - // return new WebResourceResponse("text/plain", "UTF-8", new - // EmptyInputStream()); - // - // } else { - // Log.d(TAG, "URL: " + url); - // - // HttpURLConnection conn = (HttpURLConnection) - // url.openConnection(); - // conn.setRequestProperty("User-Agent", - // mSettings.getUserAgentString()); - // - // // Configure connections - // configureConnection(conn); - // - // String mimeType = conn.getContentType(); - // String encoding = conn.getContentEncoding(); - // - // if(mimeType != null && mimeType.contains(CONTENT_TYPE_SPLIT)) - // { - // String[] split = mimeType.split(CONTENT_TYPE_SPLIT); - // mimeType = split[0]; - // - // Matcher matcher = CONTENT_TYPE_PATTERN.matcher(split[1]); - // if(matcher.find()) { - // encoding = matcher.group(1); - // } - // } - // - // InputStream is = conn.getInputStream(); - // return new WebResourceResponse(mimeType, encoding, is); - // return null; - // } } }); @@ -180,5 +129,4 @@ myWebView.getSettings().setLoadWithOverviewMode(true); myWebView.getSettings().setUseWideViewPort(true); - // myWebView.getSettings().setBuiltInZoomControls(true); if (MODE == 0) { myWebView.loadUrl(srcPath);