|
|
@ -22,6 +22,7 @@ import android.widget.RelativeLayout;
|
|
22
|
22
|
import android.widget.TextView;
|
|
23
|
23
|
import android.widget.Toast;
|
|
24
|
24
|
|
|
|
25
|
import com.electric.chargingpile.BuildConfig;
|
|
25
|
26
|
import com.electric.chargingpile.R;
|
|
26
|
27
|
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
|
|
27
|
28
|
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
|
|
|
@ -227,7 +228,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
227
|
228
|
|
|
228
|
229
|
@Subscribe
|
|
229
|
230
|
public void initCommentData(RankinglistRefreshEvent event) {
|
|
230
|
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
|
|
|
231
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
|
|
231
|
232
|
// String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
|
|
232
|
233
|
Log.e(TAG, "getCommentsData=" + url);
|
|
233
|
234
|
OkHttpUtils.get().url(url)
|
|
|
@ -255,15 +256,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
255
|
256
|
|
|
256
|
257
|
for (int j = 0; j < jsonArray.length(); j++) {
|
|
257
|
258
|
JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
|
|
258
|
|
String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play") ; //0 审核未通过 item隐藏，1 审核通过，item显示
|
|
259
|
|
String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
|
|
260
|
|
if (type.equals("23")){
|
|
261
|
|
if (is_play.equals("1")){
|
|
262
|
|
datas.add(jsonObject);
|
|
263
|
|
}
|
|
264
|
|
}else {
|
|
265
|
|
datas.add(jsonObject);
|
|
266
|
|
}
|
|
|
259
|
datas.add(jsonObject);
|
|
267
|
260
|
}
|
|
268
|
261
|
// Log.e(TAG, "dealData: size=" + datas.size());
|
|
269
|
262
|
if (datas.size() == 0) {
|
|
|
@ -295,7 +288,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
295
|
288
|
|
|
296
|
289
|
|
|
297
|
290
|
public void getCommentsData() {
|
|
298
|
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
|
|
|
291
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
|
|
299
|
292
|
OkHttpUtils.get().url(url)
|
|
300
|
293
|
.build().connTimeOut(6000).readTimeOut(6000)
|
|
301
|
294
|
.execute(new StringCallback() {
|
|
|
@ -314,16 +307,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
314
|
307
|
JSONArray jsonArray = new JSONArray(commentData);
|
|
315
|
308
|
for (int j = 0; j < jsonArray.length(); j++) {
|
|
316
|
309
|
JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
|
|
317
|
|
|
|
318
|
|
String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play") ; //0 审核未通过 item隐藏，1 审核通过，item显示
|
|
319
|
|
String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
|
|
320
|
|
if (type.equals("23")){
|
|
321
|
|
if (is_play.equals("1")){
|
|
322
|
|
datas.add(jsonObject);
|
|
323
|
|
}
|
|
324
|
|
}else{
|
|
325
|
|
datas.add(jsonObject);
|
|
326
|
|
}
|
|
|
310
|
datas.add(jsonObject);
|
|
327
|
311
|
}
|
|
328
|
312
|
if (datas.size() == 0) {
|
|
329
|
313
|
ll_tishi.setVisibility(View.VISIBLE);
|
|
|
@ -345,7 +329,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
345
|
329
|
}
|
|
346
|
330
|
|
|
347
|
331
|
private void getPullToRefreshData(final boolean isClear) {
|
|
348
|
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index;
|
|
|
332
|
String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index+"&version_code=" + BuildConfig.VERSION_NAME;
|
|
349
|
333
|
OkHttpUtils.get().url(url)
|
|
350
|
334
|
.build().connTimeOut(6000).readTimeOut(6000)
|
|
351
|
335
|
.execute(new StringCallback() {
|
|
|
@ -374,15 +358,7 @@ public class ZhanCommentFragment extends Fragment {
|
|
374
|
358
|
|
|
375
|
359
|
for (int j = 0; j < jsonArray.length(); j++) {
|
|
376
|
360
|
JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
|
|
377
|
|
String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play") ; //0 审核未通过 item隐藏，1 审核通过，item显示
|
|
378
|
|
String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
|
|
379
|
|
if (type.equals("23")){
|
|
380
|
|
if (is_play.equals("1")){
|
|
381
|
|
datas.add(jsonObject);
|
|
382
|
|
}
|
|
383
|
|
}else{
|
|
384
|
|
datas.add(jsonObject);
|
|
385
|
|
}
|
|
|
361
|
datas.add(jsonObject);
|
|
386
|
362
|
}
|
|
387
|
363
|
|
|
388
|
364
|
if (isClear == false) {
|