s-num lines-num-old"> 113 96 
import java.util.Set;
@ -644,7 +627,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
644 627 
                        map.put("file"+(i+1)+"Url", value);
645 628 
                    }
646 629 
                }
647 
                if (mInsterType == 1 && mInsterType == -1){
630 
                if (mInsterType == 1 || mInsterType == -1){
648 631 
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
649 632 
                    map.put("thumUrl",fileUrlList.get(0));
650 633 
                }else if (mInsterType == 2) {
@ -816,7 +799,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
816 799 
        dialog.show();
817 800
818 801 
//        String url = MainApplication.urlNew + "/get-sign-rest";
819 
        String url = MainApplication.d1evTestUrl + "/api/topic/get-sign-rest2cdz";
802 
        String url = MainApplication.d1evUrl + "/api/topic/get-sign-rest2cdz";
820 803 
        if (TextUtils.isEmpty(filePath)) {
821 804 
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
822 805 
            return;

+ 15 - 6
app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java
View File 

@ -167,14 +167,21 @@ public class NewPingLunAdapter extends BaseAdapter {
167 167 
                file2Url=file2Url==null?"":file2Url;
168 168 
                file3Url=file3Url==null?"":file3Url;
169 169 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
170 
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
171
170 172 
                if (type.equals("23")){
171 
                    holder.imgVideo.setVisibility(View.VISIBLE);
172 
                    holder.imgStart.setVisibility(View.VISIBLE);
173 
                    holder.imgLayout.setVisibility(View.VISIBLE);
174 173
175 
                    holder.iv_commentPic.setVisibility(View.GONE);
176 
                    holder.imgTwo.setVisibility(View.GONE);
177 
                    holder.imgThree.setVisibility(View.GONE);
174 
                    if (is_play.equals("0")){
175 
                        holder.imgLayout.setVisibility(View.GONE);
176 
                    }else{
177 
                        holder.imgVideo.setVisibility(View.VISIBLE);
178 
                        holder.imgStart.setVisibility(View.VISIBLE);
179 
                        holder.imgLayout.setVisibility(View.VISIBLE);
180
181 
                        holder.iv_commentPic.setVisibility(View.GONE);
182 
                        holder.imgTwo.setVisibility(View.GONE);
183 
                        holder.imgThree.setVisibility(View.GONE);
184 
                    }
178 185
179 186 
                    String thumUrl = datas.get(position).getString("thumUrl");
180 187 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
 
@ -189,6 +196,8 @@ public class NewPingLunAdapter extends BaseAdapter {
189 196 
                                e.printStackTrace();
190 197 
                            }
191 198 
                        });
199 
                    }else{
200 
                        holder.imgLayout.setVisibility(View.GONE);
192 201 
                    }
193 202 
                }else {
194 203

+ 13 - 7
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
View File 

@ -434,6 +434,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
434 434 
                });
435 435
436 436 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
437 
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
437 438
438 439
439 440 
                //父级评论图片
 
@ -444,14 +445,17 @@ public class ZhanCommentsAapter extends BaseAdapter {
444 445 
                file2Url= file2Url == null?"":file2Url;
445 446 
                file3Url= file3Url == null?"":file3Url;
446 447 
                if (type.equals("23")){
447 
                    holder.imgVideo.setVisibility(View.VISIBLE);
448 
                    holder.imgStart.setVisibility(View.VISIBLE);
449 
                    holder.imgLayout.setVisibility(View.VISIBLE);
450
451 
                    holder.iv_commentPic.setVisibility(View.GONE);
452 
                    holder.imgTwo.setVisibility(View.GONE);
453 
                    holder.imgThree.setVisibility(View.GONE);
448 
                    if (is_play.equals("0")){
449 
                        holder.imgLayout.setVisibility(View.GONE);
450 
                    }else{
451 
                        holder.imgVideo.setVisibility(View.VISIBLE);
452 
                        holder.imgStart.setVisibility(View.VISIBLE);
453 
                        holder.imgLayout.setVisibility(View.VISIBLE);
454 454
455 
                        holder.iv_commentPic.setVisibility(View.GONE);
456 
                        holder.imgTwo.setVisibility(View.GONE);
457 
                        holder.imgThree.setVisibility(View.GONE);
458 
                    }
455 459 
                    String thumUrl = datas.get(position).getString("thumUrl");
456 460 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
457 461 
                        Glide.with(MainApplication.context)
 
@ -466,6 +470,8 @@ public class ZhanCommentsAapter extends BaseAdapter {
466 470 
                            }
467 471
468 472 
                        });
473 
                    }else{
474 
                        holder.imgLayout.setVisibility(View.GONE);
469 475 
                    }
470 476
471 477 
                }else {

+ 2 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
View File 

@ -101,8 +101,8 @@ public class MainApplication extends MultiDexApplication {
101 101 
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
102 102
103 103 
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
104 
        public static String d1evTestUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
105 
        public static String CDN = "https://cdn-fs.d1ev.com";
104 
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
105 
    public static String CDN = "https://cdn-fs.d1ev.com";
106 106 
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
107 107
108 108

+ 18 - 19
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
View File 

@ -36,6 +36,7 @@ import com.amap.api.maps.AMapUtils;
36 36 
import com.amap.api.maps.model.LatLng;
37 37 
import com.blankj.utilcode.util.LogUtils;
38 38 
import com.bumptech.glide.Glide;
39 
import com.electric.chargingpile.BuildConfig;
39 40 
import com.electric.chargingpile.R;
40 41 
import com.electric.chargingpile.activity.AlterOneActivity;
41 42 
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
 
@ -1242,7 +1243,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1242 1243
1243 1244 
    @Subscribe
1244 1245 
    public void eteCityTime(RankinglistRefreshEvent rankinglistRefreshEvent) {
1245 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
1246 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_CODE;
1246 1247 
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
1247 1248 
            @Override
1248 1249 
            public void onError(Call call, Exception e) {
 
@ -1260,15 +1261,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1260 1261 
                        ArrayList<JSONObject> datasJson = new ArrayList<JSONObject>();
1261 1262 
                        for (int j = 0; j < jsonArray.length(); j++) {
1262 1263 
                            JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
1263 
                            String is_play = TextUtils.isEmpty(jsonObject.getString("is_play")) ? "" : jsonObject.getString("is_play"); //0 审核未通过 item隐藏，1 审核通过，item显示
1264 
                            String type = TextUtils.isEmpty(jsonObject.getString("type")) ? "" : jsonObject.getString("type"); //23 视频，24 图片
1265 
                            if (type.equals("23")) {
1266 
                                if (is_play.equals("1")) {
1267 
                                    datasJson.add(jsonObject);
1268 
                                }
1269 
                            } else {
1270 
                                datasJson.add(jsonObject);
1271 
                            }
1264 
                            datasJson.add(jsonObject);
1272 1265 
                        }
1273 1266 
                        if(datasJson.size()>0){
1274 1267 
                            rl_new_comment.setVisibility(View.VISIBLE);
 
@ -1384,21 +1377,27 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1384 1377 
                                tv_pzan.setText(agree_num);
1385 1378 
                            }
1386 1379
1387 
                            String type = TextUtils.isEmpty(jsonObject.optString("type"))?"":jsonObject.optString("type"); //23 视频，24 图片
1388
1389
1390 1380 
                            //父级评论图片
1391 1381 
                            String fileUrl = jsonObject.optString("fileUrl");
1392 1382 
                            String file2Url = jsonObject.optString("file2Url");
1393 1383 
                            String file3Url = jsonObject.optString("file3Url");
1384 
                            String is_play =jsonObject.optString("is_play"); //0 审核未通过 item隐藏，1 审核通过，item显示
1385 
                            String type = jsonObject.optString("type"); //23 视频，24 图片
1386
1394 1387 
                            if (type.equals("23")){
1395 
                                imgVideo.setVisibility(View.VISIBLE);
1396 
                                imgStart.setVisibility(View.VISIBLE);
1397 
                                imgLayout.setVisibility(View.VISIBLE);
1398 1388
1399 
                                iv_commentPic.setVisibility(View.GONE);
1400 
                                imgTwo.setVisibility(View.GONE);
1401 
                                imgThree.setVisibility(View.GONE);
1389 
                                if (is_play.equals("0")) {
1390 
                                    imgLayout.setVisibility(View.GONE);
1391 
                                }else{
1392 
                                    imgVideo.setVisibility(View.VISIBLE);
1393 
                                    imgStart.setVisibility(View.VISIBLE);
1394 
                                    imgLayout.setVisibility(View.VISIBLE);
1395 
                                    iv_commentPic.setVisibility(View.GONE);
1396 
                                    imgTwo.setVisibility(View.GONE);
1397 
                                    imgThree.setVisibility(View.GONE);
1398 
                                    imgLayout.setVisibility(View.VISIBLE);
1399 
                                }
1400
1402 1401
1403 1402 
                                String thumUrl = jsonObject.optString("thumUrl");
1404 1403 
                                if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){

+ 5 - 1
app/src/main/java/com/electric/chargingpile/fragment/NewMyMessageFragment.java
View File 

@ -17,6 +17,7 @@ import android.widget.ListView;
17 17 
import android.widget.TextView;
18 18 
import android.widget.Toast;
19 19
20 
import com.electric.chargingpile.BuildConfig;
20 21 
import com.electric.chargingpile.R;
21 22 
import com.electric.chargingpile.activity.LoginActivity;
22 23 
import com.electric.chargingpile.activity.MainMapActivity;
 
@ -112,7 +113,10 @@ public class NewMyMessageFragment extends Fragment {
112 113 
            e.printStackTrace();
113 114 
        }
114 115 
        String replace = URLEncoder.encode(encode_token);
115 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid=" + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword);
116 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid="
117 
                + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone
118 
                + "&password=" + URLEncoder.encode(MainApplication.userPassword)
119 
                + "&version_code=" + BuildConfig.VERSION_NAME;
116 120 
        Log.e("url====", url);
117 121 
        OkHttpUtils.get()
118 122 
                .url(url)

+ 7 - 31
app/src/main/java/com/electric/chargingpile/fragment/ZhanCommentFragment.java
View File 

@ -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) {

Arnulfo Arredondo - Gogs: Go Git Service
Startseite Erkunden Hilfe
Registrieren Anmelden
hacking-services9506 (Arnulfo Arredondo)

Folgende