Merge remote-tracking branch 'origin/2.3' into 2.3

2017-01-17 11:06:35 +08:00
parent 560c34afed b3fc66f6b9
commit d4dbee023e
47 changed files with 208 additions and 309 deletions
--- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
@ -38,7 +38,6 @@ import java.util.Vector;
 import java.util.concurrent.CountDownLatch;

 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.functions.Action1;

@ -101,8 +100,6 @@ public class ShareCardPicActivity extends BaseActivity {
        View contentView = View.inflate(this, R.layout.activity_sharecard_pic, null);
        init(contentView, "分享卡片");

-        ButterKnife.bind(this);
-
        shareArrImg = new Vector<>();;
        shareArrImg.addAll(arrImg);