huyuguo преди 5 години
родител
ревизия
2c29f24729

BIN
app/.DS_Store


+ 1 - 0
app/src/main/java/com/electric/chargingpile/activity/ChatContentListActivity.java

@ -670,6 +670,7 @@ public class ChatContentListActivity extends AppCompatActivity {
670 670
        }
671 671
672 672
        private void showPhotos() {
673
673 674
        }
674 675
675 676
        private void setVideoAllCallBack() {

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

@ -30,4 +30,8 @@ public class ChatPhotoFragmentPagerAdapter extends FragmentPagerAdapter {
30 30
        return fragments.size();
31 31
    }
32 32
33
    @Override
34
    public boolean isViewFromObject(View view, Object object) {
35
        return view == ((ChatPhotoFragment)object).getView();
36
    }
33 37
}

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

@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
73 73
    public static String firstPoint = "";
74 74
    public static Boolean firstSsyd;
75 75
    public static String password = "";
76
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80 80
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
81 81
    //	public static String url = "https://cdz.d1ev.com";
82 82
    public static String build_flag = "0";

+ 3 - 30
app/src/main/java/com/electric/chargingpile/fragment/ChatPhotoFragment.java

@ -40,8 +40,8 @@ public class ChatPhotoFragment extends Fragment {
40 40
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
41 41
        url = getArguments().getString(ARG_URL);
42 42
        if (rootView != null) {
43
            ViewGroup parent = (ViewGroup)rootView.getParent();
44
            if (parent!=null) {
43
            ViewGroup parent = (ViewGroup) rootView.getParent();
44
            if (parent != null) {
45 45
                parent.removeView(rootView);
46 46
            }
47 47
            return rootView;
@ -65,33 +65,6 @@ public class ChatPhotoFragment extends Fragment {
65 65
    private void initView(View rootView, String url) {
66 66
        photoView = rootView.findViewById(R.id.photoView);
67 67
//        ImageDisplayUtils.dispalyImg(getContext(), url, photoView);
68
69
70
        Picasso.with(getContext())
71
                .load(url)
72
                .placeholder(R.drawable.photo_loading_icon)
73
                .error(R.drawable.photo_loading_icon)
74
                .into(photoView);
75
//        photoView.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
76
//            @Override
77
//            public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
78
//                return false;
79
//            }
80
//
81
//            @Override
82
//            public boolean onDoubleTap(MotionEvent motionEvent) {
83
//                if (photoView.getScaleType() == ImageView.ScaleType.FIT_CENTER) {
84
//                    photoView.setScaleType(ImageView.ScaleType.FIT_START);
85
//                }
86
//                Log.d(TAG, "onDoubleTap: " + photoView.getScaleType());
87
//                return false;
88
//            }
89
//
90
//            @Override
91
//            public boolean onDoubleTapEvent(MotionEvent motionEvent) {
92
//
93
//                return false;
94
//            }
95
//        });
68
        Picasso.with(getContext()).load(url).placeholder(R.drawable.photo_loading_icon).error(R.drawable.photo_loading_icon).into(photoView);
96 69
    }
97 70
}

+ 38 - 0
app/src/main/java/com/electric/chargingpile/iview/ChatPhotoViewPager.java

@ -0,0 +1,38 @@
1
package com.electric.chargingpile.iview;
2
3
import android.content.Context;
4
import android.support.annotation.NonNull;
5
import android.support.annotation.Nullable;
6
import android.support.v4.view.ViewPager;
7
import android.util.AttributeSet;
8
import android.view.MotionEvent;
9
10
public class ChatPhotoViewPager extends ViewPager {
11
    public ChatPhotoViewPager(@NonNull Context context) {
12
        super(context);
13
    }
14
15
    public ChatPhotoViewPager(@NonNull Context context, @Nullable AttributeSet attrs) {
16
        super(context, attrs);
17
    }
18
19
    @Override
20
    public boolean onTouchEvent(MotionEvent ev) {
21
        try {
22
            return super.onTouchEvent(ev);
23
        } catch (IllegalArgumentException ex) {
24
            ex.printStackTrace();
25
        }
26
        return false;
27
    }
28
29
    @Override
30
    public boolean onInterceptTouchEvent(MotionEvent ev) {
31
        try {
32
            return super.onInterceptTouchEvent(ev);
33
        } catch (IllegalArgumentException ex) {
34
            ex.printStackTrace();
35
        }
36
        return false;
37
    }
38
}

+ 13 - 3
app/src/main/java/com/electric/chargingpile/iview/ChatVerticalViewPager.java

@ -20,7 +20,12 @@ public class ChatVerticalViewPager extends VerticalViewPager {
20 20
    @Override
21 21
    public boolean onTouchEvent(MotionEvent ev) {
22 22
        if (isScroll) {
23
            return super.onTouchEvent(ev);
23
            try {
24
                return super.onTouchEvent(ev);
25
            }catch (IllegalArgumentException ex) {
26
                ex.printStackTrace();
27
            }
28
            return false;
24 29
        } else {
25 30
            return false;
26 31
        }
@ -29,11 +34,16 @@ public class ChatVerticalViewPager extends VerticalViewPager {
29 34
    @Override
30 35
    public boolean onInterceptTouchEvent(MotionEvent ev) {
31 36
        if (isScroll) {
32
            return super.onInterceptTouchEvent(ev);
37
            try {
38
                return super.onInterceptTouchEvent(ev);
39
            } catch (IllegalArgumentException ex){
40
                ex.printStackTrace();
41
            }
42
            return false;
43
33 44
        } else {
34 45
            return false;
35 46
        }
36
37 47
    }
38 48
39 49
    public void setScroll(boolean scroll) {

+ 4 - 0
app/src/main/res/layout/activity_chat_content.xml

@ -107,6 +107,8 @@
107 107
                    android:layout_marginStart="5dp"
108 108
                    android:textColor="#888888"
109 109
                    android:textSize="14sp"
110
                    android:maxLines="1"
111
                    android:ellipsize="end"
110 112
                    app:layout_constraintBottom_toBottomOf="parent"
111 113
                    app:layout_constraintLeft_toRightOf="@+id/headImage"
112 114
                    app:layout_constraintTop_toTopOf="parent"
@ -114,9 +116,11 @@
114 116
            </android.support.constraint.ConstraintLayout>
115 117
116 118
            <android.support.constraint.ConstraintLayout
119
                android:paddingLeft="5dp"
117 120
                android:id="@+id/likeInfo"
118 121
                android:layout_width="wrap_content"
119 122
                android:layout_height="0dp"
123
                android:background="#ffffff"
120 124
                app:layout_constraintBottom_toBottomOf="parent"
121 125
                app:layout_constraintRight_toRightOf="parent"
122 126
                app:layout_constraintTop_toTopOf="parent">

+ 2 - 2
app/src/main/res/layout/fragment_chat_content_pictures.xml

@ -6,7 +6,7 @@
6 6
    android:layout_height="match_parent"
7 7
    android:background="#424242">
8 8
9
    <android.support.v4.view.ViewPager
9
    <com.electric.chargingpile.iview.ChatPhotoViewPager
10 10
        android:id="@+id/photoPager"
11 11
        android:layout_width="match_parent"
12 12
        android:layout_height="0dp"
@ -14,7 +14,7 @@
14 14
        app:layout_constraintLeft_toLeftOf="parent"
15 15
        app:layout_constraintRight_toRightOf="parent"
16 16
        app:layout_constraintTop_toBottomOf="@+id/navBar"
17
        tools:background="#66bd00"></android.support.v4.view.ViewPager>
17
        tools:background="#66bd00"></com.electric.chargingpile.iview.ChatPhotoViewPager>
18 18
19 19
    <!--<include layout="@layout/fragment_chat_content_common" />-->
20 20
    <android.support.constraint.ConstraintLayout