dxh 5 anni fa
parent
commit
613b063b9b

+ 5 - 1
app/src/main/java/com/electric/chargingpile/activity/ZoomingPhotoTextActivity.java

@ -60,7 +60,7 @@ public class ZoomingPhotoTextActivity extends FragmentActivity implements PhotoV
60 60
61 61
    public ArrayList<String> photoArrayList = new ArrayList<>();
62 62
63
    private String targetId, targetType;
63
    private String targetId, targetType, targetUserId;
64 64
65 65
    @Override
66 66
    protected void onCreate(Bundle savedInstanceState) {
@ -85,6 +85,7 @@ public class ZoomingPhotoTextActivity extends FragmentActivity implements PhotoV
85 85
86 86
        targetId = getIntent().getStringExtra("targetId");
87 87
        targetType = getIntent().getStringExtra("targetType");
88
        targetUserId = getIntent().getStringExtra("targetUserId");
88 89
        requestServer();
89 90
    }
90 91
@ -94,6 +95,9 @@ public class ZoomingPhotoTextActivity extends FragmentActivity implements PhotoV
94 95
        map.put("targetId", targetId);
95 96
        map.put("targetType", targetType);
96 97
        map.put("limit", "3");
98
        if(!TextUtils.isEmpty(targetUserId)){
99
            map.put("targetUserId", targetUserId);
100
        }
97 101
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
98 102
            @Override
99 103
            public void onError(Call call, Exception e) {

+ 4 - 4
app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java

@ -52,15 +52,15 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
52 52
53 53
    public void setData(ArrayList<TalkRecommendBean> datas) {
54 54
        talkRecommendBeans = datas;
55
        notifyItemRangeChanged(1,talkRecommendBeans.size());
56
//        notifyDataSetChanged();
55
//        notifyItemRangeChanged(1,talkRecommendBeans.size());
56
        notifyDataSetChanged();
57 57
    }
58 58
59 59
    public void addData(ArrayList<TalkRecommendBean> datas) {
60 60
        int size = talkRecommendBeans.size();
61 61
        talkRecommendBeans.addAll(datas);
62
        notifyItemRangeInserted(size,talkRecommendBeans.size());
63
//        notifyDataSetChanged();
62
//        notifyItemRangeInserted(size,talkRecommendBeans.size());
63
        notifyDataSetChanged();
64 64
    }
65 65
66 66
    public ArrayList<TalkRecommendBean> getCurrentData() {

+ 5 - 4
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -74,9 +74,10 @@ public class MainApplication extends MultiDexApplication {
74 74
    public static Boolean firstSsyd;
75 75
    public static String password = "";
76 76
    //	public static String url = "http://123.57.6.131";
77
    public static String url = "http://59.110.68.162";
78
//    public static String url = "http://cdz.evcharge.cc";
79
    public static String urlNew = "http://123.56.67.7:83/api/0200";
77
//    public static String url = "http://59.110.68.162";//测试环境
78
    public static String url = "http://cdz.evcharge.cc";//正式环境
79
//    public static String urlNew = "http://123.56.67.7:83/api/0200";//测试环境
80
    public static String urlNew = "https://api.touchev.com:83/api/0200";//正式环境
80 81
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
81 82
    //	public static String url = "https://cdz.d1ev.com";
82 83
    public static String build_flag = "0";
@ -118,7 +119,7 @@ public class MainApplication extends MultiDexApplication {
118 119
    public static boolean isIgnore = true;
119 120
    public static Double search_jing = 0.0, search_wei = 0.0;
120 121
    public static Context context;
121
    public static String current_code = "3.1.1";
122
    public static String current_code = "3.3";
122 123
    public static String storePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "cdz_android";
123 124
    public static String q_content = "";
124 125
    public static Map<String, String> q_map = new HashMap<>();