1145873331@qq.com 6 years ago
parent
commit
074036cafe

+ 4 - 26
app/src/main/java/com/electric/chargingpile/activity/FindActivity.java

@ -11,7 +11,6 @@ import android.content.Intent;
11 11
import android.content.IntentFilter;
12 12
import android.content.SharedPreferences;
13 13
import android.content.res.AssetManager;
14
import android.content.res.TypedArray;
15 14
import android.graphics.Bitmap;
16 15
import android.graphics.BitmapFactory;
17 16
import android.net.ConnectivityManager;
@ -31,23 +30,18 @@ import android.util.Log;
31 30
import android.view.KeyEvent;
32 31
import android.view.LayoutInflater;
33 32
import android.view.View;
34
import android.view.Window;
35 33
import android.webkit.WebView;
36 34
import android.widget.ImageView;
37 35
import android.widget.LinearLayout;
38
import android.widget.ListView;
39 36
import android.widget.RelativeLayout;
40 37
import android.widget.TextView;
41 38
import android.widget.Toast;
42 39
43 40
import com.blankj.utilcode.util.EmptyUtils;
44
import com.blankj.utilcode.util.FileIOUtils;
45
import com.blankj.utilcode.util.FileUtils;
46 41
import com.blankj.utilcode.util.LogUtils;
47 42
import com.electric.chargingpile.R;
48 43
import com.electric.chargingpile.adapter.BaseRecyclerAdapter;
49 44
import com.electric.chargingpile.adapter.FindAdapter;
50
import com.electric.chargingpile.adapter.SelectPileAdapter;
51 45
import com.electric.chargingpile.application.MainApplication;
52 46
import com.electric.chargingpile.data.Adin;
53 47
import com.electric.chargingpile.data.ChargingShareBean;
@ -57,9 +51,7 @@ import com.electric.chargingpile.util.BarColorUtil;
57 51
import com.electric.chargingpile.util.DES3;
58 52
import com.electric.chargingpile.util.ImageTools;
59 53
import com.electric.chargingpile.util.JsonUtils;
60
import com.electric.chargingpile.util.Md5Util;
61 54
import com.electric.chargingpile.util.OkHttpUtil;
62
import com.electric.chargingpile.util.SystemTypeUtil;
63 55
import com.electric.chargingpile.util.ToastUtil;
64 56
import com.electric.chargingpile.view.GridDividerItemDecoration;
65 57
import com.electric.chargingpile.view.SlideFindView;
@ -79,30 +71,15 @@ import java.io.BufferedReader;
79 71
import java.io.File;
80 72
import java.io.IOException;
81 73
import java.io.InputStreamReader;
82
import java.io.UnsupportedEncodingException;
83 74
import java.net.URLEncoder;
84
import java.security.InvalidKeyException;
85
import java.security.NoSuchAlgorithmException;
86
import java.security.SecureRandom;
87 75
import java.util.ArrayList;
88
import java.util.Collection;
89 76
import java.util.HashMap;
90 77
import java.util.List;
91 78
import java.util.Map;
92
import java.util.Set;
93
94
import javax.crypto.BadPaddingException;
95
import javax.crypto.Cipher;
96
import javax.crypto.IllegalBlockSizeException;
97
import javax.crypto.KeyGenerator;
98
import javax.crypto.NoSuchPaddingException;
99
import javax.crypto.SecretKey;
100
import javax.crypto.spec.SecretKeySpec;
101 79
102 80
import cn.sharesdk.framework.Platform;
103 81
import cn.sharesdk.framework.PlatformActionListener;
104 82
import cn.sharesdk.framework.ShareSDK;
105
import cn.sharesdk.onekeyshare.OnekeyShare;
106 83
import cn.sharesdk.tencent.qq.QQ;
107 84
import cn.sharesdk.wechat.friends.Wechat;
108 85
import cn.sharesdk.wechat.moments.WechatMoments;
@ -217,9 +194,9 @@ public class FindActivity extends AppCompatActivity implements View.OnClickListe
217 194
        tab_qa = (LinearLayout) findViewById(R.id.tab_qa);
218 195
        tab_qa.setOnClickListener(this);
219 196
220
        ivPoint = findViewById(R.id.iv_point);
197
        ivPoint = (ImageView) findViewById(R.id.iv_point);
221 198
222
        rl_help = findViewById(R.id.rl_help);
199
        rl_help = (RelativeLayout) findViewById(R.id.rl_help);
223 200
        rl_help.setOnClickListener(this);
224 201
225 202
        sfv = (SlideFindView) findViewById(R.id.ll_ad);
@ -236,7 +213,7 @@ public class FindActivity extends AppCompatActivity implements View.OnClickListe
236 213
        mTvMarkerViewNum = (TextView) mMarkerView.findViewById(R.id.tv_num);
237 214
        mIvMarkerBg = (ImageView) mMarkerView.findViewById(R.id.iv_icon);
238 215
239
        rvFind = findViewById(R.id.rv_find);
216
        rvFind = (RecyclerView) findViewById(R.id.rv_find);
240 217
241 218
242 219
    }
@ -1093,6 +1070,7 @@ public class FindActivity extends AppCompatActivity implements View.OnClickListe
1093 1070
             * @param webView webview对象。
1094 1071
             * @param code 复制的券码
1095 1072
             */
1073
            @Override
1096 1074
            public void onCopyCode(WebView webView, String code) {
1097 1075
                //当未登录的用户点击去登录时,会调用此处代码。
1098 1076
                new AlertDialog.Builder(webView.getContext())

+ 5 - 6
app/src/main/java/com/electric/chargingpile/activity/GalleryActivityComment.java

@ -4,11 +4,6 @@ package com.electric.chargingpile.activity;
4 4
 * Created by demon on 2017/3/7.
5 5
 */
6 6
7
import java.io.ByteArrayInputStream;
8
import java.io.ByteArrayOutputStream;
9
import java.util.ArrayList;
10
import java.util.List;
11
12 7
import android.app.Activity;
13 8
import android.content.Context;
14 9
import android.content.Intent;
@ -26,12 +21,16 @@ import android.widget.TextView;
26 21
27 22
import com.electric.chargingpile.R;
28 23
import com.electric.chargingpile.util.Bimp;
29
import com.electric.chargingpile.util.PublicWay;
30 24
import com.electric.chargingpile.util.PublicWayONE;
31 25
import com.electric.chargingpile.util.Res;
32 26
import com.electric.chargingpile.widge.photoview.PhotoView;
33 27
import com.electric.chargingpile.widge.photoview.ZoomingViewpager;
34 28
29
import java.io.ByteArrayInputStream;
30
import java.io.ByteArrayOutputStream;
31
import java.util.ArrayList;
32
import java.util.List;
33
35 34
public class GalleryActivityComment extends Activity {
36 35
    private Intent intent;
37 36
    // 返回按钮

+ 9 - 11
app/src/main/java/com/electric/chargingpile/activity/GalleryPrivateActivity.java

@ -1,8 +1,5 @@
1 1
package com.electric.chargingpile.activity;
2 2
3
import java.util.ArrayList;
4
import java.util.List;
5
6 3
import android.app.Activity;
7 4
import android.content.Context;
8 5
import android.content.Intent;
@ -11,11 +8,9 @@ import android.graphics.Color;
11 8
import android.os.Bundle;
12 9
import android.support.v4.view.PagerAdapter;
13 10
import android.support.v4.view.ViewPager.OnPageChangeListener;
14
import android.view.KeyEvent;
15 11
import android.view.View;
16 12
import android.view.View.OnClickListener;
17 13
import android.view.ViewGroup.LayoutParams;
18
import android.widget.Button;
19 14
import android.widget.RelativeLayout;
20 15
import android.widget.TextView;
21 16
@ -23,8 +18,11 @@ import com.electric.chargingpile.R;
23 18
import com.electric.chargingpile.util.Bimp;
24 19
import com.electric.chargingpile.util.PublicWay;
25 20
import com.electric.chargingpile.util.Res;
26
import com.electric.chargingpile.zoom.PhotoView;
27
import com.electric.chargingpile.zoom.ViewPagerFixed;
21
import com.electric.chargingpile.widge.photoview.PhotoView;
22
import com.electric.chargingpile.widge.photoview.ZoomingViewpager;
23
24
import java.util.ArrayList;
25
import java.util.List;
28 26
29 27
public class GalleryPrivateActivity extends Activity {
30 28
    private Intent intent;
@ -42,7 +40,7 @@ public class GalleryPrivateActivity extends Activity {
42 40
    private int location = 0;
43 41
44 42
    private ArrayList<View> listViews = null;
45
    private ViewPagerFixed pager;
43
    private ZoomingViewpager pager;
46 44
    private MyPageAdapter adapter;
47 45
48 46
    public List<Bitmap> bmp = new ArrayList<Bitmap>();
@ -69,7 +67,7 @@ public class GalleryPrivateActivity extends Activity {
69 67
        position = Integer.parseInt(intent.getStringExtra("position"));
70 68
        isShowOkBt();
71 69
        // 为发送按钮设置文字
72
        pager = (ViewPagerFixed) findViewById(Res.getWidgetID("gallery01"));
70
        pager = (ZoomingViewpager) findViewById(Res.getWidgetID("gallery01"));
73 71
        pager.setOnPageChangeListener(pageChangeListener);
74 72
        for (int i = 0; i < Bimp.tempSelectBitmap.size(); i++) {
75 73
            initListViews( Bimp.tempSelectBitmap.get(i).getBitmap() );
@ -208,7 +206,7 @@ public class GalleryPrivateActivity extends Activity {
208 206
        }
209 207
210 208
        public void destroyItem(View arg0, int arg1, Object arg2) {
211
            ((ViewPagerFixed) arg0).removeView(listViews.get(arg1 % size));
209
            ((ZoomingViewpager) arg0).removeView(listViews.get(arg1 % size));
212 210
        }
213 211
214 212
        public void finishUpdate(View arg0) {
@ -216,7 +214,7 @@ public class GalleryPrivateActivity extends Activity {
216 214
217 215
        public Object instantiateItem(View arg0, int arg1) {
218 216
            try {
219
                ((ViewPagerFixed) arg0).addView(listViews.get(arg1 % size), 0);
217
                ((ZoomingViewpager) arg0).addView(listViews.get(arg1 % size), 0);
220 218
221 219
            } catch (Exception e) {
222 220
            }

+ 0 - 3
app/src/main/java/com/electric/chargingpile/activity/H5Activity.java

@ -30,15 +30,12 @@ import android.widget.ProgressBar;
30 30
import android.widget.TextView;
31 31
import android.widget.Toast;
32 32
33
34
import com.alibaba.fastjson.JSON;
35 33
import com.electric.chargingpile.R;
36 34
import com.electric.chargingpile.application.MainApplication;
37 35
import com.electric.chargingpile.data.User;
38 36
import com.electric.chargingpile.manager.ProfileManager;
39 37
import com.electric.chargingpile.util.DES3;
40 38
import com.electric.chargingpile.util.JsonUtils;
41
42 39
import com.electric.chargingpile.util.MediaUtility;
43 40
import com.electric.chargingpile.util.ToastUtil;
44 41
import com.google.gson.Gson;

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

@ -11,7 +11,7 @@ import android.view.ViewGroup;
11 11
import android.widget.ImageView;
12 12
import android.widget.ProgressBar;
13 13
14
import com.electric.chargingpile.zoom.PhotoViewAttacher;
14
import com.electric.chargingpile.widge.photoview.PhotoViewAttacher;
15 15
import com.nostra13.universalimageloader.core.ImageLoader;
16 16
import com.nostra13.universalimageloader.core.assist.FailReason;
17 17
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;

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

@ -10,7 +10,6 @@ import android.view.View.OnClickListener;
10 10
import android.widget.GridView;
11 11
import android.widget.TextView;
12 12
13
14 13
import com.electric.chargingpile.util.PublicWay;
15 14
import com.electric.chargingpile.util.Res;
16 15

+ 0 - 3
app/src/main/java/com/electric/chargingpile/activity/MainActicity.java

@ -19,15 +19,12 @@ import android.util.Log;
19 19
import android.view.KeyEvent;
20 20
import android.widget.Toast;
21 21

22

23 22
import com.electric.chargingpile.R;
24 23
import com.electric.chargingpile.application.MainApplication;
25

26 24
import com.electric.chargingpile.manager.ProfileManager;
27 25
import com.electric.chargingpile.util.ExampleUtil;
28 26
import com.electric.chargingpile.util.NetUtil;
29 27
import com.electric.chargingpile.view.SlidingMenu;
30

31 28
import com.umeng.analytics.MobclickAgent;
32 29

33 30
public class MainActicity extends FragmentActivity {

+ 3 - 3
app/src/main/java/com/electric/chargingpile/activity/MyPosterView.java

@ -1,8 +1,5 @@
1 1
package com.electric.chargingpile.activity;
2 2

3
import java.util.ArrayList;
4
import java.util.List;
5

6 3
import android.content.Context;
7 4
import android.graphics.drawable.BitmapDrawable;
8 5
import android.os.Handler;
@ -21,6 +18,9 @@ import android.widget.RelativeLayout;
21 18

22 19
import com.electric.chargingpile.R;
23 20

21
import java.util.ArrayList;
22
import java.util.List;
23

24 24
/**��ͼƬ����չʾ��
25 25
 * @author chewei
26 26
 */

+ 1 - 3
app/src/main/java/com/electric/chargingpile/activity/MyQAActivity.java

@ -1,9 +1,8 @@
1 1
package com.electric.chargingpile.activity;
2 2
3 3
import android.content.Intent;
4
import android.support.v7.app.AppCompatActivity;
5 4
import android.os.Bundle;
6
import android.util.Log;
5
import android.support.v7.app.AppCompatActivity;
7 6
import android.view.View;
8 7
import android.widget.ImageView;
9 8
import android.widget.RelativeLayout;
@ -12,7 +11,6 @@ import android.widget.Toast;
12 11
13 12
import com.electric.chargingpile.R;
14 13
import com.electric.chargingpile.application.MainApplication;
15
import com.electric.chargingpile.data.CarType;
16 14
import com.electric.chargingpile.util.BarColorUtil;
17 15
import com.electric.chargingpile.util.CarTypeUtil;
18 16
import com.electric.chargingpile.util.CircleTransform;

+ 1 - 9
app/src/main/java/com/electric/chargingpile/activity/QaActivity.java

@ -2,18 +2,14 @@ package com.electric.chargingpile.activity;
2 2
3 3
import android.Manifest;
4 4
import android.app.Activity;
5
import android.content.DialogInterface;
6 5
import android.content.Intent;
7 6
import android.content.SharedPreferences;
7
import android.os.Bundle;
8 8
import android.support.annotation.NonNull;
9
import android.support.v7.app.AlertDialog;
10 9
import android.support.v7.app.AppCompatActivity;
11
import android.os.Bundle;
12 10
import android.util.Log;
13 11
import android.view.KeyEvent;
14 12
import android.view.View;
15
import android.view.animation.Animation;
16
import android.view.animation.AnimationUtils;
17 13
import android.widget.AbsListView;
18 14
import android.widget.ImageView;
19 15
import android.widget.LinearLayout;
@ -31,16 +27,12 @@ import com.electric.chargingpile.manager.ProfileManager;
31 27
import com.electric.chargingpile.util.BarColorUtil;
32 28
import com.electric.chargingpile.util.JsonUtils;
33 29
import com.electric.chargingpile.util.ToastUtil;
34
import com.electric.chargingpile.view.CarTypeDialog;
35
import com.electric.chargingpile.view.HongBaoDialog;
36 30
import com.handmark.pulltorefresh.library.PullToRefreshBase;
37 31
import com.handmark.pulltorefresh.library.PullToRefreshListView;
38 32
import com.umeng.analytics.MobclickAgent;
39 33
import com.zhy.http.okhttp.OkHttpUtils;
40 34
import com.zhy.http.okhttp.callback.StringCallback;
41 35
42
import org.json.JSONObject;
43
44 36
import java.util.ArrayList;
45 37
import java.util.HashMap;
46 38
import java.util.List;

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

@ -13,7 +13,6 @@ import android.widget.TextView;
13 13
14 14
import com.electric.chargingpile.R;
15 15
import com.electric.chargingpile.application.MainApplication;
16
17 16
import com.electric.chargingpile.util.DES3;
18 17
import com.umeng.analytics.MobclickAgent;
19 18

+ 19 - 23
app/src/main/res/layout/activity_gallery_activity4_alter.xml

@ -2,36 +2,34 @@
2 2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    android:layout_width="match_parent"
4 4
    android:layout_height="match_parent"
5
    android:background="@color/activity_bgcolor"
6
    >
5
    android:background="@color/activity_bgcolor">
7 6
8 7
    <RelativeLayout
9 8
        android:id="@+id/headview"
10 9
        android:layout_width="fill_parent"
11 10
        android:layout_height="45dp"
12 11
        android:background="@color/lvse"
13
        android:gravity="center_vertical"
14
        >
12
        android:gravity="center_vertical">
13
15 14
        <TextView
16
            android:textSize="16sp"
17
            android:textColor="#fff"
18 15
            android:id="@+id/gallery_back"
19
            android:text="@string/album"
20
            android:paddingLeft="16dp"
21
            android:paddingRight="16dp"
22
            android:gravity="center"
23 16
            android:layout_width="wrap_content"
24 17
            android:layout_height="match_parent"
25 18
            android:layout_centerVertical="true"
26
            android:visibility="gone"
27
            />
19
            android:gravity="center"
20
            android:paddingLeft="16dp"
21
            android:paddingRight="16dp"
22
            android:text="@string/album"
23
            android:textColor="#fff"
24
            android:textSize="16sp"
25
            android:visibility="gone" />
26
28 27
        <TextView
29 28
            android:id="@+id/gallery_del"
30
            android:background="@drawable/plugin_camera_del_state"
31
            android:layout_alignParentRight="true"
32 29
            android:layout_width="50dp"
33 30
            android:layout_height="wrap_content"
34
            />
31
            android:layout_alignParentRight="true"
32
            android:background="@drawable/plugin_camera_del_state" />
35 33
    </RelativeLayout>
36 34
37 35
    <RelativeLayout
@ -39,7 +37,7 @@
39 37
        android:layout_width="match_parent"
40 38
        android:layout_height="45dp"
41 39
        android:layout_alignParentBottom="true"
42
        android:background="@color/lvse" >
40
        android:background="@color/lvse">
43 41
44 42
        <TextView
45 43
            android:id="@+id/send_button"
@ -47,16 +45,15 @@
47 45
            android:layout_height="match_parent"
48 46
            android:layout_alignParentRight="true"
49 47
            android:layout_centerVertical="true"
50
            android:paddingRight="16dp"
51
            android:paddingLeft="16dp"
52 48
            android:gravity="center"
49
            android:paddingLeft="16dp"
50
            android:paddingRight="16dp"
53 51
            android:text="@string/finish"
54
            android:textColor="@color/white"
55
            />
52
            android:textColor="@color/white" />
56 53
57 54
    </RelativeLayout>
58 55
59
    <com.electric.chargingpile.zoom.ViewPagerFixed
56
    <com.electric.chargingpile.widge.photoview.ZoomingViewpager
60 57
        android:id="@+id/gallery01"
61 58
        android:layout_width="fill_parent"
62 59
        android:layout_height="wrap_content"
@ -64,8 +61,7 @@
64 61
        android:layout_below="@id/headview"
65 62
        android:layout_centerHorizontal="true"
66 63
        android:background="@color/plugin_camera_black"
67
        android:unselectedAlpha="1">
68
    </com.electric.chargingpile.zoom.ViewPagerFixed>
64
        android:unselectedAlpha="1" />
69 65
70 66
</RelativeLayout>
71 67

+ 2 - 3
app/src/main/res/layout/activity_gallery_activity4_claim.xml

@ -56,7 +56,7 @@
56 56
57 57
    </RelativeLayout>
58 58
59
    <com.electric.chargingpile.zoom.ViewPagerFixed
59
    <com.electric.chargingpile.widge.photoview.ZoomingViewpager
60 60
        android:id="@+id/gallery01"
61 61
        android:layout_width="fill_parent"
62 62
        android:layout_height="wrap_content"
@ -64,8 +64,7 @@
64 64
        android:layout_below="@id/headview"
65 65
        android:layout_centerHorizontal="true"
66 66
        android:background="@color/plugin_camera_black"
67
        android:unselectedAlpha="1">
68
    </com.electric.chargingpile.zoom.ViewPagerFixed>
67
        android:unselectedAlpha="1"/>
69 68
70 69
</RelativeLayout>
71 70

+ 20 - 24
app/src/main/res/layout/activity_gallery_activity_alter.xml

@ -1,38 +1,36 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:id="@+id/alter"
3 4
    android:layout_width="match_parent"
4 5
    android:layout_height="match_parent"
5
    android:id="@+id/alter"
6
    android:background="@color/activity_bgcolor"
7
    >
6
    android:background="@color/activity_bgcolor">
8 7
9 8
    <RelativeLayout
10 9
        android:id="@+id/headview"
11 10
        android:layout_width="fill_parent"
12 11
        android:layout_height="45dp"
13 12
        android:background="@color/white"
14
        android:gravity="center_vertical"
15
        >
13
        android:gravity="center_vertical">
14
16 15
        <TextView
17
            android:textSize="16sp"
18
            android:textColor="#fff"
19 16
            android:id="@+id/gallery_back"
20
            android:text="@string/album"
21
            android:paddingLeft="16dp"
22
            android:paddingRight="16dp"
23
            android:gravity="center"
24 17
            android:layout_width="wrap_content"
25 18
            android:layout_height="match_parent"
26 19
            android:layout_centerVertical="true"
27
            android:visibility="gone"
28
            />
20
            android:gravity="center"
21
            android:paddingLeft="16dp"
22
            android:paddingRight="16dp"
23
            android:text="@string/album"
24
            android:textColor="#fff"
25
            android:textSize="16sp"
26
            android:visibility="gone" />
27
29 28
        <TextView
30 29
            android:id="@+id/gallery_del"
31
            android:background="@drawable/plugin_camera_del_state"
32
            android:layout_alignParentRight="true"
33 30
            android:layout_width="50dp"
34 31
            android:layout_height="wrap_content"
35
            />
32
            android:layout_alignParentRight="true"
33
            android:background="@drawable/plugin_camera_del_state" />
36 34
    </RelativeLayout>
37 35
38 36
    <RelativeLayout
@ -40,7 +38,7 @@
40 38
        android:layout_width="match_parent"
41 39
        android:layout_height="45dp"
42 40
        android:layout_alignParentBottom="true"
43
        android:background="@color/white" >
41
        android:background="@color/white">
44 42
45 43
        <TextView
46 44
            android:id="@+id/send_button"
@ -48,16 +46,15 @@
48 46
            android:layout_height="match_parent"
49 47
            android:layout_alignParentRight="true"
50 48
            android:layout_centerVertical="true"
51
            android:paddingRight="16dp"
52
            android:paddingLeft="16dp"
53 49
            android:gravity="center"
50
            android:paddingLeft="16dp"
51
            android:paddingRight="16dp"
54 52
            android:text="@string/finish"
55
            android:textColor="@color/white"
56
            />
53
            android:textColor="@color/white" />
57 54
58 55
    </RelativeLayout>
59 56
60
    <com.electric.chargingpile.zoom.ViewPagerFixed
57
    <com.electric.chargingpile.widge.photoview.ZoomingViewpager
61 58
        android:id="@+id/gallery01"
62 59
        android:layout_width="fill_parent"
63 60
        android:layout_height="wrap_content"
@ -65,8 +62,7 @@
65 62
        android:layout_below="@id/headview"
66 63
        android:layout_centerHorizontal="true"
67 64
        android:background="@color/white"
68
        android:unselectedAlpha="1">
69
    </com.electric.chargingpile.zoom.ViewPagerFixed>
65
        android:unselectedAlpha="1" />
70 66
71 67
</RelativeLayout>
72 68

+ 2 - 3
app/src/main/res/layout/plugin_camera_gallery.xml

@ -56,7 +56,7 @@
56 56

57 57
    </RelativeLayout>
58 58
    
59
    <com.electric.chargingpile.zoom.ViewPagerFixed
59
    <com.electric.chargingpile.widge.photoview.ZoomingViewpager
60 60
      android:id="@+id/gallery01" 
61 61
      android:layout_width="fill_parent" 
62 62
      android:layout_height="wrap_content"
@ -64,8 +64,7 @@
64 64
      android:layout_below="@id/headview"
65 65
      android:layout_centerHorizontal="true"
66 66
      android:background="@color/plugin_camera_black"
67
      android:unselectedAlpha="1">
68
   	</com.electric.chargingpile.zoom.ViewPagerFixed>
67
      android:unselectedAlpha="1"/>
69 68
   
70 69
</RelativeLayout>
71 70