Changeset 17673

Timestamp:

04/08/14 13:43:46 (11 years ago)

Author:

toanqngu

Message:

Update the URL source path for online mode

Location:

issm/mobile/android/ISSM_APP

Files:

• project.properties (modified) (1 diff)
• src/gov/nasa/jpl/issm/ISSMWebActivity.java (modified) (3 diffs)

issm/mobile/android/ISSM_APP/project.properties

@@ -12 +12 @@
 
 # Project target.
-target=android-18
+target=android-19

issm/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMWebActivity.java

@@ -22 +22 @@
 
         // URL of the index page of the ISSM web application
-        // private String srcPath =
-        // "http://issm.jpl.nasa.gov/externalicelab/index.html";
+        private String srcPath = "http://issm.jpl.nasa.gov/externalicelab/html/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/~lannguyen/ISSM_WEB/html/index.html";
+        // private String srcPath =
+        // "http://www.csupomona.edu/~lannguyen/ISSM_WEB/html/index.html";
         private WebView myWebView;
 
@@ -36 +36 @@
                 requestWindowFeature(Window.FEATURE_NO_TITLE);
                 setContentView(R.layout.activity_issmweb_online);
-                // 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());
-                // }
-                //
-                // });
-
-                // final ProgressDialog loading = new ProgressDialog(this);
-                // loading.setMessage("Loading page...");
-                // loading.setCancelable(false);
-                // loading.show();
 
                 myWebView = (WebView) findViewById(R.id.issmWeb);
@@ -79 +46 @@
                                         if (url.startsWith("http")
                                                         && !url.contains("http://thwaites.jpl.nasa.gov/fastcgi/visl-solve.py?callbacks")) {
-                                                // myWebView.setVisibility(View.INVISIBLE);
                                                 myWebView.stopLoading();
                                                 new AlertDialog.Builder(ISSMWebActivity.this)