|
|
@@ -12,6 +12,7 @@ import android.os.Handler;
|
|
|
import android.os.Message;
|
|
|
import android.telephony.TelephonyManager;
|
|
|
import android.text.Editable;
|
|
|
+import android.text.TextUtils;
|
|
|
import android.text.TextWatcher;
|
|
|
import android.util.Base64;
|
|
|
import android.util.Log;
|
|
|
@@ -208,6 +209,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
private String tvSS_brdport;
|
|
|
private BeanSop urlBean;
|
|
|
|
|
|
+ private String keystep ;
|
|
|
+
|
|
|
@Override
|
|
|
protected void onDestroy() {
|
|
|
// SharedPreUtil.removeAll(getApplicationContext());
|
|
|
@@ -920,9 +923,13 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
JSONObject data = (JSONObject) index;
|
|
|
urlBean = new BeanSop(data.getString("PATH")
|
|
|
,data.getString("FILENAME"));
|
|
|
+ if (!TextUtils.isEmpty(data.getString("keystep"))) {
|
|
|
+ urlBean.setKeystep(data.getString("keystep"));
|
|
|
+ }
|
|
|
urlBeantwoList.add(urlBean);
|
|
|
}
|
|
|
list = new ArrayList<>();
|
|
|
+ keystep = "";
|
|
|
for (int i=0;i<urlBeantwoList.size();i++){
|
|
|
BeanSop urlBean = urlBeantwoList.get(i);
|
|
|
String filename = urlBean.getFilename().replace(".jpg","");
|
|
|
@@ -935,6 +942,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
|
|
|
Log.e("str2==",str2);
|
|
|
list.add(str2);
|
|
|
+ keystep = urlBean.getKeystep();
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -959,6 +967,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
|| filenametcp.contains(".png") || filenametcp.contains(".jpg") || filenametcp.contains(".WEBP") || filenametcp.contains(".JPEG")) {
|
|
|
Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
|
|
|
intent.putStringArrayListExtra("lists", list);
|
|
|
+ intent.putExtra("keystep", keystep);
|
|
|
startActivity(intent);
|
|
|
} else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")){
|
|
|
Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
|
|
|
@@ -967,7 +976,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
|
|
|
}else {
|
|
|
CommonUtil.toastNoRepeat(IndexActivity.this, "此文件无法打开");
|
|
|
}
|
|
|
-
|
|
|
+ handlernew.removeCallbacks(runnableCountdown);
|
|
|
}
|
|
|
// setdataDisplay(o.toString());
|
|
|
}
|