.error(R.drawable.icon_face2_0)
189
                    .placeholder(R.drawable.icon_user1118)
190
                    .error(R.drawable.icon_user1118)
191 191
                    .transform(new CircleTransform())
192 192
                    .into(sv_show_user_avatar);
193 193
        }

+ 2 - 2
app/src/main/java/com/electric/chargingpile/fragment/TotalListFragment.java

@ -152,8 +152,8 @@ public class TotalListFragment extends Fragment {
152 152
//                                        , iv_icon);
153 153
                                Picasso.with(MainApplication.context)
154 154
                                        .load(MainApplication.pic_url + userpic)
155
                                        .error(R.drawable.icon_face2_0)
156
                                        .placeholder(R.drawable.icon_face2_0)
155
                                        .error(R.drawable.icon_user1118)
156
                                        .placeholder(R.drawable.icon_user1118)
157 157
                                        .into(iv_icon);
158 158
                            }
159 159
                            //当月充电排行

+ 2 - 2
app/src/main/java/com/electric/chargingpile/util/PicassoUtil.java

@ -11,10 +11,10 @@ import com.nostra13.universalimageloader.core.ImageLoader;
11 11
public class PicassoUtil {
12 12
    public static void loadingNetImage(Context context, String url, ImageView imageView) {
13 13
        if (!"".equals(url)) {
14
            ImageLoader.getInstance().displayImage(url, imageView, MainApplication.getCacheOptions(R.drawable.icon_face2_0));
14
            ImageLoader.getInstance().displayImage(url, imageView, MainApplication.getCacheOptions(R.drawable.icon_user1118));
15 15
//			ImageLoader.getInstance().clearDiscCache();
16 16
        } else {
17
            imageView.setImageResource(R.drawable.icon_face2_0);
17
            imageView.setImageResource(R.drawable.icon_user1118);
18 18
        }
19 19
    }
20 20


+ 5 - 5
app/src/main/java/com/electric/chargingpile/view/VideoPubilshDialog.java

@ -65,16 +65,16 @@ public class VideoPubilshDialog extends Dialog implements View.OnClickListener {
65 65
        }
66 66
        if (TextUtils.isEmpty(talkRecommendBean.headImgUrl)) {
67 67
            Picasso.with(context)
68
                    .load(R.drawable.icon_face2_0)
69
                    .placeholder(R.drawable.icon_face2_0)
70
                    .error(R.drawable.icon_face2_0)
68
                    .load(R.drawable.icon_user1118)
69
                    .placeholder(R.drawable.icon_user1118)
70
                    .error(R.drawable.icon_user1118)
71 71
                    .transform(new CircleTransform())
72 72
                    .into(videoPublishUserAvatar);
73 73
        } else {
74 74
            Picasso.with(context)
75 75
                    .load(talkRecommendBean.headImgUrl)
76
                    .placeholder(R.drawable.icon_face2_0)
77
                    .error(R.drawable.icon_face2_0)
76
                    .placeholder(R.drawable.icon_user1118)
77
                    .error(R.drawable.icon_user1118)
78 78
                    .transform(new CircleTransform())
79 79
                    .into(videoPublishUserAvatar);
80 80
        }

+ 9 - 0
app/src/main/res/drawable/bg_white_radius6.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="@color/color_white" />
6
            <corners android:radius="6dp" />
7
        </shape>
8
    </item>
9
</selector>

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

@ -60,7 +60,7 @@
60 60
            android:id="@+id/iv_icon"
61 61
            android:layout_width="55dp"
62 62
            android:layout_height="55dp"
63
            android:src="@drawable/icon_face2_0"/>
63
            android:src="@drawable/icon_user1118"/>
64 64
65 65
        <RelativeLayout
66 66
            android:layout_width="wrap_content"

+ 54 - 47
app/src/main/res/layout/activity_skip_user_info.xml

@ -65,59 +65,66 @@
65 65
        <!--android:layout_marginTop="50dp"-->
66 66
        <!--android:src="@drawable/icon626" />-->
67 67
68
        <RelativeLayout
69
            android:id="@+id/rl_icon"
70
            android:layout_width="fill_parent"
71
            android:layout_height="80dp"
72
            android:layout_marginTop="15dp"
73
            android:layout_marginBottom="15dp"
74
            android:layout_marginStart="12dp"
75
            android:layout_marginEnd="12dp"
76
            android:background="@drawable/bg_white_radius6">
77
78
            <TextView
79
                android:layout_marginStart="20dp"
80
                android:layout_toEndOf="@+id/iv_user_icon"
81
                android:id="@+id/tv_head"
82
                android:layout_width="wrap_content"
83
                android:layout_height="match_parent"
84
                android:gravity="center"
85
                android:paddingLeft="16dp"
86
                android:text="头像"
87
                android:textColor="@color/title_row"
88
                android:textSize="15sp" />
89
90
            <com.electric.chargingpile.view.RoundImageView
91
                android:id="@+id/iv_user_icon"
92
                android:layout_width="45dp"
93
                android:layout_height="45dp"
94
                android:layout_marginStart="14dp"
95
                android:layout_alignParentStart="true"
96
                android:layout_centerVertical="true"
97
                android:src="@drawable/icon_user1118" />
98
            <!--<ImageView-->
99
            <!--android:id="@+id/iv_user_icon"-->
100
            <!--android:layout_width="55dp"-->
101
            <!--android:layout_height="55dp"-->
102
            <!--android:src="@drawable/icon_user1118"-->
103
            <!--android:layout_centerVertical="true"-->
104
            <!--android:layout_alignParentRight="true"-->
105
            <!--android:layout_alignParentEnd="true"-->
106
            <!--android:layout_marginRight="32dp"-->
107
            <!--android:layout_marginEnd="32dp" />-->
108
            <ImageView
109
                android:layout_width="wrap_content"
110
                android:layout_height="match_parent"
111
                android:layout_alignParentEnd="true"
112
                android:layout_alignParentRight="true"
113
                android:layout_centerVertical="true"
114
                android:layout_marginRight="16dp"
115
                android:src="@drawable/icon_more2_0" />
116
117
118
        </RelativeLayout>
68 119
69 120
        <LinearLayout
70 121
            android:layout_width="wrap_content"
122
            android:layout_marginStart="12dp"
123
            android:layout_marginEnd="12dp"
71 124
            android:layout_height="wrap_content"
72
            android:background="@color/white"
125
            android:background="@drawable/bg_white_radius6"
73 126
            android:orientation="vertical">
74 127
75
            <RelativeLayout
76
                android:id="@+id/rl_icon"
77
                android:layout_width="fill_parent"
78
                android:layout_height="62dp"
79
                android:background="@color/white">
80
81
                <TextView
82
                    android:layout_width="wrap_content"
83
                    android:layout_height="match_parent"
84
                    android:gravity="center"
85
                    android:paddingLeft="16dp"
86
                    android:text="头像"
87
                    android:textColor="@color/title_row"
88
                    android:textSize="15sp" />
89
90
                <com.electric.chargingpile.view.RoundImageView
91
                    android:id="@+id/iv_user_icon"
92
                    android:layout_width="45dp"
93
                    android:layout_height="45dp"
94
                    android:layout_alignParentEnd="true"
95
                    android:layout_alignParentRight="true"
96
                    android:layout_centerVertical="true"
97
                    android:layout_marginEnd="32dp"
98
                    android:layout_marginRight="32dp"
99
                    android:src="@drawable/icon_face2_0" />
100
                <!--<ImageView-->
101
                <!--android:id="@+id/iv_user_icon"-->
102
                <!--android:layout_width="55dp"-->
103
                <!--android:layout_height="55dp"-->
104
                <!--android:src="@drawable/icon_face2_0"-->
105
                <!--android:layout_centerVertical="true"-->
106
                <!--android:layout_alignParentRight="true"-->
107
                <!--android:layout_alignParentEnd="true"-->
108
                <!--android:layout_marginRight="32dp"-->
109
                <!--android:layout_marginEnd="32dp" />-->
110
                <ImageView
111
                    android:layout_width="wrap_content"
112
                    android:layout_height="match_parent"
113
                    android:layout_alignParentEnd="true"
114
                    android:layout_alignParentRight="true"
115
                    android:layout_centerVertical="true"
116
                    android:layout_marginRight="16dp"
117
                    android:src="@drawable/icon_more2_0" />
118
119
120
            </RelativeLayout>
121 128
122 129
            <View
123 130
                android:layout_width="match_parent"

+ 89 - 73
app/src/main/res/layout/activity_user_info.xml

@ -59,62 +59,63 @@
59 59
        android:background="@color/user_background"
60 60
        android:orientation="vertical">
61 61
62
        <RelativeLayout
63
            android:layout_marginEnd="12dp"
64
            android:layout_marginStart="12dp"
65
            android:layout_marginBottom="15dp"
66
            android:layout_marginTop="15dp"
67
            android:id="@+id/rl_icon"
68
            android:layout_width="fill_parent"
69
            android:layout_height="80dp"
70
            android:background="@drawable/bg_white_radius6">
71
            <com.electric.chargingpile.view.RoundImageView
72
                android:layout_alignParentStart="true"
73
                android:id="@+id/iv_user_icon"
74
                android:layout_width="45dp"
75
                android:layout_height="45dp"
76
                android:layout_marginStart="14dp"
77
                android:layout_centerVertical="true"
78
                android:src="@drawable/icon_user1118" />
62 79
63
        <LinearLayout
64
            android:layout_width="wrap_content"
65
            android:layout_height="wrap_content"
66
            android:background="@color/white"
67
            android:orientation="vertical">
80
            <TextView
81
                android:layout_marginStart="20dp"
82
                android:layout_toEndOf="@+id/iv_user_icon"
83
                android:layout_width="wrap_content"
84
                android:layout_height="match_parent"
85
                android:gravity="center"
86
                android:paddingEnd="15dp"
87
                android:text="修改头像"
88
                android:textColor="@color/color_f9f9f9"
89
                android:textSize="15sp" />
68 90
69
            <RelativeLayout
70
                android:id="@+id/rl_icon"
71
                android:layout_width="fill_parent"
72
                android:layout_height="62dp"
73
                android:background="@color/white">
74 91
75
                <TextView
76
                    android:layout_width="wrap_content"
77
                    android:layout_height="match_parent"
78
                    android:gravity="center"
79
                    android:paddingLeft="15dp"
80
                    android:text="头像"
81
                    android:textColor="@color/title_row"
82
                    android:textSize="15sp" />
92
            <ImageView
93
                android:layout_marginEnd="14dp"
94
                android:layout_alignParentEnd="true"
95
                android:layout_width="wrap_content"
96
                android:layout_height="match_parent"
97
                android:src="@drawable/icon_more2_0" />
83 98
84
                <com.electric.chargingpile.view.RoundImageView
85
                    android:id="@+id/iv_user_icon"
86
                    android:layout_width="45dp"
87
                    android:layout_height="45dp"
88
                    android:layout_alignParentEnd="true"
89
                    android:layout_alignParentRight="true"
90
                    android:layout_centerVertical="true"
91
                    android:layout_marginEnd="32dp"
92
                    android:layout_marginRight="32dp"
93
                    android:src="@drawable/icon_face2_0" />
94 99
95
                <ImageView
96
                    android:layout_width="wrap_content"
97
                    android:layout_height="match_parent"
98
                    android:layout_alignParentEnd="true"
99
                    android:layout_alignParentRight="true"
100
                    android:layout_centerVertical="true"
101
                    android:layout_marginEnd="15dp"
102
                    android:layout_marginRight="15dp"
103
                    android:src="@drawable/icon_more2_0" />
100
        </RelativeLayout>
104 101
105 102
106
            </RelativeLayout>
103
        <LinearLayout
104
            android:paddingBottom="10dp"
105
            android:paddingTop="10dp"
106
            android:layout_width="wrap_content"
107
            android:layout_height="wrap_content"
108
            android:layout_marginStart="12dp"
109
            android:layout_marginEnd="12dp"
110
            android:background="@drawable/bg_white_radius6"
111
            android:orientation="vertical">
112
107 113
108
            <View
109
                android:layout_width="match_parent"
110
                android:layout_height="0.5dp"
111
                android:layout_marginLeft="15dp"
112
                android:background="@color/ui_line" />
113 114
114 115
            <RelativeLayout
115 116
                android:layout_width="fill_parent"
116 117
                android:layout_height="45dp"
117
                android:background="@color/white">
118
               >
118 119
119 120
                <TextView
120 121
                    android:layout_width="wrap_content"
@ -122,7 +123,7 @@
122 123
                    android:gravity="center"
123 124
                    android:paddingLeft="15dp"
124 125
                    android:text="昵称"
125
                    android:textColor="@color/title_row"
126
                    android:textColor="@color/color_f9f9f9"
126 127
                    android:textSize="15sp" />
127 128
128 129
                <EditText
@ -146,17 +147,11 @@
146 147
147 148
            </RelativeLayout>
148 149
149
            <View
150
                android:layout_width="match_parent"
151
                android:layout_height="0.5dp"
152
                android:layout_marginLeft="15dp"
153
                android:background="@color/ui_line"
154
                android:visibility="visible" />
155 150
156 151
            <RelativeLayout
157 152
                android:layout_width="fill_parent"
158 153
                android:layout_height="45dp"
159
                android:background="@color/white">
154
                >
160 155
161 156
                <TextView
162 157
                    android:layout_width="wrap_content"
@ -164,7 +159,7 @@
164 159
                    android:gravity="center"
165 160
                    android:paddingLeft="15dp"
166 161
                    android:text="手机号"
167
                    android:textColor="@color/title_row"
162
                    android:textColor="@color/color_f9f9f9"
168 163
                    android:textSize="15sp" />
169 164
170 165
                <TextView
@ -183,19 +178,12 @@
183 178
184 179
            </RelativeLayout>
185 180
186
            <View
187
                android:layout_width="match_parent"
188
                android:layout_height="0.5dp"
189
                android:layout_marginLeft="15dp"
190
                android:background="@color/ui_line"
191
                android:visibility="visible" />
192 181
193 182
194
            <RelativeLayout
183
            <LinearLayout
195 184
                android:id="@+id/go_certificate"
196 185
                android:layout_width="fill_parent"
197 186
                android:layout_height="45dp"
198
                android:background="@color/white"
199 187
                android:visibility="visible">
200 188
201 189
                <TextView
@ -204,10 +192,13 @@
204 192
                    android:layout_height="match_parent"
205 193
                    android:gravity="center"
206 194
                    android:paddingLeft="15dp"
207
                    android:textColor="@color/title_row"
195
                    android:textColor="@color/color_f9f9f9"
208 196
                    android:textSize="15sp"
209
                    android:text="认证车主(获得充电优惠)" />
210
197
                    android:text="认证车主" />
198
                <View
199
                    android:layout_weight="1"
200
                    android:layout_width="0dp"
201
                    android:layout_height="match_parent"/>
211 202
                <TextView
212 203
                    android:id="@+id/go_desc"
213 204
                    android:layout_width="wrap_content"
@ -215,8 +206,6 @@
215 206
                    android:layout_alignParentTop="true"
216 207
                    android:layout_alignParentEnd="true"
217 208
                    android:layout_alignParentRight="true"
218
                    android:layout_marginEnd="15dp"
219
                    android:layout_marginRight="15dp"
220 209
                    android:background="@color/white"
221 210
                    android:gravity="center|right"
222 211
                    android:singleLine="true"
@ -226,23 +215,49 @@
226 215
                    android:textSize="15sp" />
227 216
228 217
                <ImageView
218
                    android:paddingEnd="14dp"
219
                    android:paddingStart="9dp"
229 220
                    android:id="@+id/go_cursor"
230 221
                    android:layout_width="wrap_content"
231 222
                    android:layout_height="match_parent"
232 223
                    android:layout_alignParentEnd="true"
233 224
                    android:layout_alignParentRight="true"
234 225
                    android:layout_centerVertical="true"
235
                    android:layout_marginRight="15dp"
236 226
                    android:src="@drawable/icon_more2_0" />
237 227
238
            </RelativeLayout>
228
            </LinearLayout>
239 229
240
            <View
230
            <LinearLayout
241 231
                android:layout_width="match_parent"
242
                android:layout_height="0.5dp"
243
                android:layout_marginLeft="15dp"
244
                android:background="@color/ui_line"
245
                android:visibility="visible" />
232
                android:layout_height="45dp">
233
                <TextView
234
                    android:gravity="center"
235
                    android:paddingLeft="15dp"
236
                    android:layout_width="wrap_content"
237
                    android:layout_height="match_parent"
238
                    android:text="意向车型"
239
                    android:textColor="@color/color_f9f9f9"
240
                    android:textSize="14sp"
241
                    />
242
                <View
243
                    android:layout_weight="1"
244
                    android:layout_width="0dp"
245
                    android:layout_height="match_parent"/>
246
                <TextView
247
                    android:gravity="center"
248
                    android:layout_width="wrap_content"
249
                    android:layout_height="match_parent"
250
                    android:text="首次选择意向车型(得充电余额)"
251
                    android:textColor="#ff0e0e0e"
252
                    android:textSize="14sp"
253
                    />
254
                <ImageView
255
                    android:paddingEnd="14dp"
256
                   android:paddingStart="9dp"
257
                    android:src="@drawable/icon_more2_0"
258
                    android:layout_width="wrap_content"
259
                    android:layout_height="match_parent"/>
260
            </LinearLayout>
246 261
247 262
            <com.zhy.autolayout.AutoRelativeLayout
248 263
                android:layout_width="fill_parent"
@ -317,6 +332,7 @@
317 332
318 333
319 334
            <View
335
                android:visibility="gone"
320 336
                android:layout_width="match_parent"
321 337
                android:layout_height="0.5dp"
322 338
                android:background="@color/ui_line" />

+ 1 - 0
app/src/main/res/values/color.xml

@ -190,6 +190,7 @@
190 190
    <color name="color_1bb637">#1bb637</color>
191 191
    <color name="color_0e0e0e">#0E0E0E</color>
192 192
    <color name="color_c4c7d2">#C4C7D2</color>
193
    <color name="color_f9f9f9">#ff9b9b9b</color>
193 194
    <color name="color_ffe32727">#ffe32727</color>
194 195
    <color name="color_f6f6f6">#F6F6F6</color>
195 196
    <color name="sv_black">#FF000000</color>

cdzApp - Gogs: Go Git Service

充电桩app代码

gradlew 5.0KB

    #!/usr/bin/env bash ############################################################################## ## ## Gradle start up script for UN*X ## ############################################################################## # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" warn ( ) { echo "$*" } die ( ) { echo echo "$*" echo exit 1 } # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false case "`uname`" in CYGWIN* ) cygwin=true ;; Darwin* ) darwin=true ;; MINGW* ) msys=true ;; esac # For Cygwin, ensure paths are in UNIX format before anything is touched. if $cygwin ; then [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` fi # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" # Need this for relative symlinks. while [ -h "$PRG" ] ; do ls=`ls -ld "$PRG"` link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else PRG=`dirname "$PRG"`"/$link" fi done SAVED="`pwd`" cd "`dirname \"$PRG\"`/" >&- APP_HOME="`pwd -P`" cd "$SAVED" >&- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" else JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi # Increase the maximum file descriptors if we can. if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then MAX_FD="$MAX_FD_LIMIT" fi ulimit -n $MAX_FD if [ $? -ne 0 ] ; then warn "Could not set maximum file descriptor limit: $MAX_FD" fi else warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" fi fi # For Darwin, add options to specify how the application appears in the dock if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi # For Cygwin, switch paths to Windows format before running java if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` SEP="" for dir in $ROOTDIRSRAW ; do ROOTDIRS="$ROOTDIRS$SEP$dir" SEP="|" done OURCYGPATTERN="(^($ROOTDIRS))" # Add a user-defined pattern to the cygpath arguments if [ "$GRADLE_CYGPATTERN" != "" ] ; then OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" fi # Now convert the arguments - kludge to limit ourselves to /bin/sh i=0 for arg in "$@" ; do CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` else eval `echo args$i`="\"$arg\"" fi i=$((i+1)) done case $i in (0) set -- ;; (1) set -- "$args0" ;; (2) set -- "$args0" "$args1" ;; (3) set -- "$args0" "$args1" "$args2" ;; (4) set -- "$args0" "$args1" "$args2" "$args3" ;; (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi # Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules function splitJvmOpts() { JVM_OPTS=("$@") } eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"