1145873331@qq.com 6 years ago
parent
commit
7082cc0853

+ 12 - 13
app/build.gradle

@ -145,18 +145,18 @@ android {
145 145
146 146
    productFlavors {
147 147
        wandoujia {}
148
        baidu {}
149
        c360 {}
150
        yingyongbao {}
151
        xiaomi {}
152
        anzhi {}
153
        pp {}
154
        vivo {}
155
        huawei {}
156
        oppo {}
157
        meizu {}
158
        cdz {}
159
        sougou {}
148
//        baidu {}
149
//        c360 {}
150
//        yingyongbao {}
151
//        xiaomi {}
152
//        anzhi {}
153
//        pp {}
154
//        vivo {}
155
//        huawei {}
156
//        oppo {}
157
//        meizu {}
158
//        cdz {}
159
//        sougou {}
160 160
        productFlavors.all { flavor ->
161 161
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
162 162
        }
@ -221,7 +221,6 @@ dependencies {
221 221
//    compile files('libs/badgeview.jar')
222 222
    compile files('libs/mframework.jar')
223 223
    compile files('libs/picasso-2.5.2.jar')
224
//    compile files('libs/httpmime-4.3.5.jar')
225 224
    compile project(':autolayout')
226 225
    compile files('libs/universal-image-loader-1.9.1.jar')
227 226
    compile files('libs/bugly_1.2.9_release.jar')

+ 1 - 7
app/src/main/java/com/electric/chargingpile/activity/EditQuestionOneActivity.java

@ -1,12 +1,9 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
import android.content.Context;
4
import android.content.DialogInterface;
5 4
import android.content.Intent;
6
import android.support.v4.widget.SwipeRefreshLayout;
7
import android.support.v7.app.AlertDialog;
8
import android.support.v7.app.AppCompatActivity;
9 5
import android.os.Bundle;
6
import android.support.v7.app.AppCompatActivity;
10 7
import android.text.Editable;
11 8
import android.text.TextWatcher;
12 9
import android.util.Log;
@ -20,11 +17,9 @@ import android.widget.TextView;
20 17
import android.widget.Toast;
21 18
22 19
import com.electric.chargingpile.R;
23
import com.electric.chargingpile.adapter.QADataAdapter;
24 20
import com.electric.chargingpile.adapter.QSearchDataAdapter;
25 21
import com.electric.chargingpile.application.MainApplication;
26 22
import com.electric.chargingpile.data.QSearchData;
27
import com.electric.chargingpile.data.TextSearch;
28 23
import com.electric.chargingpile.util.BarColorUtil;
29 24
import com.electric.chargingpile.util.JsonUtils;
30 25
import com.electric.chargingpile.util.SoftInputUtil;
@ -35,7 +30,6 @@ import com.zhy.http.okhttp.OkHttpUtils;
35 30
import com.zhy.http.okhttp.callback.StringCallback;
36 31
37 32
import java.util.ArrayList;
38
import java.util.List;
39 33
40 34
import okhttp3.Call;
41 35

+ 0 - 13
app/src/main/java/com/electric/chargingpile/fragment/TalkFragment.java

@ -1,36 +1,23 @@
1 1
package com.electric.chargingpile.fragment;
2 2
3 3
import android.Manifest;
4
import android.app.Activity;
5 4
import android.content.Intent;
6
import android.content.SharedPreferences;
7 5
import android.os.Bundle;
8 6
import android.support.annotation.NonNull;
9 7
import android.support.v4.app.Fragment;
10
import android.support.v7.app.AppCompatActivity;
11 8
import android.util.Log;
12
import android.view.KeyEvent;
13 9
import android.view.LayoutInflater;
14 10
import android.view.View;
15 11
import android.view.ViewGroup;
16 12
import android.widget.AbsListView;
17 13
import android.widget.ImageView;
18
import android.widget.LinearLayout;
19 14
import android.widget.ListView;
20
import android.widget.RelativeLayout;
21 15
import android.widget.TextView;
22 16
import android.widget.Toast;
23 17
24
import com.blankj.utilcode.util.ActivityUtils;
25 18
import com.electric.chargingpile.R;
26
import com.electric.chargingpile.activity.EditQuestionOneActivity;
27
import com.electric.chargingpile.activity.FindActivity;
28
import com.electric.chargingpile.activity.LoginActivity;
29 19
import com.electric.chargingpile.activity.MainMapActivity;
30
import com.electric.chargingpile.activity.SearchQuestionActivity;
31 20
import com.electric.chargingpile.activity.StaggeredRecyclerViewActivity;
32
import com.electric.chargingpile.activity.UnansweredActivity;
33
import com.electric.chargingpile.activity.UserCenterActivity;
34 21
import com.electric.chargingpile.adapter.QADataAdapter;
35 22
import com.electric.chargingpile.application.MainApplication;
36 23
import com.electric.chargingpile.data.QAData;

+ 1 - 1
app/src/main/res/layout/activity_publish_picture_content.xml

@ -50,7 +50,7 @@
50 50
            android:paddingTop="4dp"
51 51
            android:paddingBottom="4dp"
52 52
            android:enabled="false"
53
            android:background="@color/color_9ed3ae"/>
53
            android:background="#9ed3ae"/>
54 54

55 55
        <View
56 56
            android:layout_width="match_parent"

+ 2 - 4
ijkplayer-java/build.gradle

@ -2,11 +2,10 @@ apply plugin: 'com.android.library'
2 2
3 3
android {
4 4
5
      compileSdkVersion 26
5
    compileSdkVersion 26
6 6
    buildToolsVersion '28.0.3'
7 7
    defaultConfig {
8
        minSdkVersion 14
9
        targetSdkVersion 26
8
        minSdkVersion 19
10 9
    }
11 10
    buildTypes {
12 11
        release {
@ -17,5 +16,4 @@ android {
17 16
}
18 17
19 18
dependencies {
20
//    implementation fileTree(dir: 'libs', include: ['*.jar'])
21 19
}

+ 5 - 3
library/build.gradle

@ -1,11 +1,10 @@
1 1
apply plugin: 'com.android.library'
2 2
android {
3
    compileSdkVersion 16
3
    compileSdkVersion 26
4 4
    buildToolsVersion '28.0.3'
5 5
6 6
    defaultConfig {
7
        minSdkVersion 4
8
        targetSdkVersion 4
7
        minSdkVersion 19
9 8
    }
10 9
11 10
    buildTypes {
@ -14,6 +13,9 @@ android {
14 13
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
15 14
        }
16 15
    }
16
    lintOptions {
17
        abortOnError false
18
    }
17 19
}
18 20
19 21
dependencies {

+ 1 - 5
library/src/main/AndroidManifest.xml

@ -1,10 +1,6 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    package="com.handmark.pulltorefresh.library"
4
    android:versionCode="2110"
5
    android:versionName="2.1.1" >
6
7
    <uses-sdk android:minSdkVersion="4" />
3
    package="com.handmark.pulltorefresh.library">
8 4
9 5
    <application />
10 6

+ 135 - 136
library/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java

@ -21,145 +21,144 @@ import android.os.Build.VERSION;
21 21
import android.os.Build.VERSION_CODES;
22 22
import android.os.Bundle;
23 23
import android.util.AttributeSet;
24
import android.util.FloatMath;
25 24
import android.webkit.WebChromeClient;
26 25
import android.webkit.WebView;
27 26
28 27
public class PullToRefreshWebView extends PullToRefreshBase<WebView> {
29 28
30
	private static final OnRefreshListener<WebView> defaultOnRefreshListener = new OnRefreshListener<WebView>() {
31
32
		@Override
33
		public void onRefresh(PullToRefreshBase<WebView> refreshView) {
34
			refreshView.getRefreshableView().reload();
35
		}
36
37
	};
38
39
	private final WebChromeClient defaultWebChromeClient = new WebChromeClient() {
40
41
		@Override
42
		public void onProgressChanged(WebView view, int newProgress) {
43
			if (newProgress == 100) {
44
				onRefreshComplete();
45
			}
46
		}
47
48
	};
49
50
	public PullToRefreshWebView(Context context) {
51
		super(context);
52
53
		/**
54
		 * Added so that by default, Pull-to-Refresh refreshes the page
55
		 */
56
		setOnRefreshListener(defaultOnRefreshListener);
57
		mRefreshableView.setWebChromeClient(defaultWebChromeClient);
58
	}
59
60
	public PullToRefreshWebView(Context context, AttributeSet attrs) {
61
		super(context, attrs);
62
63
		/**
64
		 * Added so that by default, Pull-to-Refresh refreshes the page
65
		 */
66
		setOnRefreshListener(defaultOnRefreshListener);
67
		mRefreshableView.setWebChromeClient(defaultWebChromeClient);
68
	}
69
70
	public PullToRefreshWebView(Context context, Mode mode) {
71
		super(context, mode);
72
73
		/**
74
		 * Added so that by default, Pull-to-Refresh refreshes the page
75
		 */
76
		setOnRefreshListener(defaultOnRefreshListener);
77
		mRefreshableView.setWebChromeClient(defaultWebChromeClient);
78
	}
79
80
	public PullToRefreshWebView(Context context, Mode mode, AnimationStyle style) {
81
		super(context, mode, style);
82
83
		/**
84
		 * Added so that by default, Pull-to-Refresh refreshes the page
85
		 */
86
		setOnRefreshListener(defaultOnRefreshListener);
87
		mRefreshableView.setWebChromeClient(defaultWebChromeClient);
88
	}
89
90
	@Override
91
	public final Orientation getPullToRefreshScrollDirection() {
92
		return Orientation.VERTICAL;
93
	}
94
95
	@Override
96
	protected WebView createRefreshableView(Context context, AttributeSet attrs) {
97
		WebView webView;
98
		if (VERSION.SDK_INT >= VERSION_CODES.GINGERBREAD) {
99
			webView = new InternalWebViewSDK9(context, attrs);
100
		} else {
101
			webView = new WebView(context, attrs);
102
		}
103
104
		webView.setId(R.id.webview);
105
		return webView;
106
	}
107
108
	@Override
109
	protected boolean isReadyForPullStart() {
110
		return mRefreshableView.getScrollY() == 0;
111
	}
112
113
	@Override
114
	protected boolean isReadyForPullEnd() {
115
		float exactContentHeight = FloatMath.floor(mRefreshableView.getContentHeight() * mRefreshableView.getScale());
116
		return mRefreshableView.getScrollY() >= (exactContentHeight - mRefreshableView.getHeight());
117
	}
118
119
	@Override
120
	protected void onPtrRestoreInstanceState(Bundle savedInstanceState) {
121
		super.onPtrRestoreInstanceState(savedInstanceState);
122
		mRefreshableView.restoreState(savedInstanceState);
123
	}
124
125
	@Override
126
	protected void onPtrSaveInstanceState(Bundle saveState) {
127
		super.onPtrSaveInstanceState(saveState);
128
		mRefreshableView.saveState(saveState);
129
	}
130
131
	@TargetApi(9)
132
	final class InternalWebViewSDK9 extends WebView {
133
134
		// WebView doesn't always scroll back to it's edge so we add some
135
		// fuzziness
136
		static final int OVERSCROLL_FUZZY_THRESHOLD = 2;
137
138
		// WebView seems quite reluctant to overscroll so we use the scale
139
		// factor to scale it's value
140
		static final float OVERSCROLL_SCALE_FACTOR = 1.5f;
141
142
		public InternalWebViewSDK9(Context context, AttributeSet attrs) {
143
			super(context, attrs);
144
		}
145
146
		@Override
147
		protected boolean overScrollBy(int deltaX, int deltaY, int scrollX, int scrollY, int scrollRangeX,
148
				int scrollRangeY, int maxOverScrollX, int maxOverScrollY, boolean isTouchEvent) {
149
150
			final boolean returnValue = super.overScrollBy(deltaX, deltaY, scrollX, scrollY, scrollRangeX,
151
					scrollRangeY, maxOverScrollX, maxOverScrollY, isTouchEvent);
152
153
			// Does all of the hard work...
154
			OverscrollHelper.overScrollBy(PullToRefreshWebView.this, deltaX, scrollX, deltaY, scrollY,
155
					getScrollRange(), OVERSCROLL_FUZZY_THRESHOLD, OVERSCROLL_SCALE_FACTOR, isTouchEvent);
156
157
			return returnValue;
158
		}
159
160
		private int getScrollRange() {
161
			return (int) Math.max(0, FloatMath.floor(mRefreshableView.getContentHeight() * mRefreshableView.getScale())
162
					- (getHeight() - getPaddingBottom() - getPaddingTop()));
163
		}
164
	}
29
    private static final OnRefreshListener<WebView> defaultOnRefreshListener = new OnRefreshListener<WebView>() {
30
31
        @Override
32
        public void onRefresh(PullToRefreshBase<WebView> refreshView) {
33
            refreshView.getRefreshableView().reload();
34
        }
35
36
    };
37
38
    private final WebChromeClient defaultWebChromeClient = new WebChromeClient() {
39
40
        @Override
41
        public void onProgressChanged(WebView view, int newProgress) {
42
            if (newProgress == 100) {
43
                onRefreshComplete();
44
            }
45
        }
46
47
    };
48
49
    public PullToRefreshWebView(Context context) {
50
        super(context);
51
52
        /**
53
         * Added so that by default, Pull-to-Refresh refreshes the page
54
         */
55
        setOnRefreshListener(defaultOnRefreshListener);
56
        mRefreshableView.setWebChromeClient(defaultWebChromeClient);
57
    }
58
59
    public PullToRefreshWebView(Context context, AttributeSet attrs) {
60
        super(context, attrs);
61
62
        /**
63
         * Added so that by default, Pull-to-Refresh refreshes the page
64
         */
65
        setOnRefreshListener(defaultOnRefreshListener);
66
        mRefreshableView.setWebChromeClient(defaultWebChromeClient);
67
    }
68
69
    public PullToRefreshWebView(Context context, Mode mode) {
70
        super(context, mode);
71
72
        /**
73
         * Added so that by default, Pull-to-Refresh refreshes the page
74
         */
75
        setOnRefreshListener(defaultOnRefreshListener);
76
        mRefreshableView.setWebChromeClient(defaultWebChromeClient);
77
    }
78
79
    public PullToRefreshWebView(Context context, Mode mode, AnimationStyle style) {
80
        super(context, mode, style);
81
82
        /**
83
         * Added so that by default, Pull-to-Refresh refreshes the page
84
         */
85
        setOnRefreshListener(defaultOnRefreshListener);
86
        mRefreshableView.setWebChromeClient(defaultWebChromeClient);
87
    }
88
89
    @Override
90
    public final Orientation getPullToRefreshScrollDirection() {
91
        return Orientation.VERTICAL;
92
    }
93
94
    @Override
95
    protected WebView createRefreshableView(Context context, AttributeSet attrs) {
96
        WebView webView;
97
        if (VERSION.SDK_INT >= VERSION_CODES.GINGERBREAD) {
98
            webView = new InternalWebViewSDK9(context, attrs);
99
        } else {
100
            webView = new WebView(context, attrs);
101
        }
102
103
        webView.setId(R.id.webview);
104
        return webView;
105
    }
106
107
    @Override
108
    protected boolean isReadyForPullStart() {
109
        return mRefreshableView.getScrollY() == 0;
110
    }
111
112
    @Override
113
    protected boolean isReadyForPullEnd() {
114
        float exactContentHeight = (float) Math.floor(mRefreshableView.getContentHeight() * mRefreshableView.getScale());
115
        return mRefreshableView.getScrollY() >= (exactContentHeight - mRefreshableView.getHeight());
116
    }
117
118
    @Override
119
    protected void onPtrRestoreInstanceState(Bundle savedInstanceState) {
120
        super.onPtrRestoreInstanceState(savedInstanceState);
121
        mRefreshableView.restoreState(savedInstanceState);
122
    }
123
124
    @Override
125
    protected void onPtrSaveInstanceState(Bundle saveState) {
126
        super.onPtrSaveInstanceState(saveState);
127
        mRefreshableView.saveState(saveState);
128
    }
129
130
    @TargetApi(9)
131
    final class InternalWebViewSDK9 extends WebView {
132
133
        // WebView doesn't always scroll back to it's edge so we add some
134
        // fuzziness
135
        static final int OVERSCROLL_FUZZY_THRESHOLD = 2;
136
137
        // WebView seems quite reluctant to overscroll so we use the scale
138
        // factor to scale it's value
139
        static final float OVERSCROLL_SCALE_FACTOR = 1.5f;
140
141
        public InternalWebViewSDK9(Context context, AttributeSet attrs) {
142
            super(context, attrs);
143
        }
144
145
        @Override
146
        protected boolean overScrollBy(int deltaX, int deltaY, int scrollX, int scrollY, int scrollRangeX,
147
                                       int scrollRangeY, int maxOverScrollX, int maxOverScrollY, boolean isTouchEvent) {
148
149
            final boolean returnValue = super.overScrollBy(deltaX, deltaY, scrollX, scrollY, scrollRangeX,
150
                    scrollRangeY, maxOverScrollX, maxOverScrollY, isTouchEvent);
151
152
            // Does all of the hard work...
153
            OverscrollHelper.overScrollBy(PullToRefreshWebView.this, deltaX, scrollX, deltaY, scrollY,
154
                    getScrollRange(), OVERSCROLL_FUZZY_THRESHOLD, OVERSCROLL_SCALE_FACTOR, isTouchEvent);
155
156
            return returnValue;
157
        }
158
159
        private int getScrollRange() {
160
            return (int) Math.max(0, Math.floor(mRefreshableView.getContentHeight() * mRefreshableView.getScale())
161
                    - (getHeight() - getPaddingBottom() - getPaddingTop()));
162
        }
163
    }
165 164
}