Selaa lähdekoodia

拍照功能几本没有其他问题,马上进行功能完善,并删除之前的库

zengjiebin 8 vuotta sitten
vanhempi
commit
db3bfc5e65
38 muutettua tiedostoa jossa 125 lisäystä ja 256 poistoa
  1. 2 1
      app/build.gradle
  2. 13 1
      app/src/main/AndroidManifest.xml
  3. 0 3
      app/src/main/java/com/kfzs/duanduan/ActDuJiaShouFa.java
  4. 9 12
      app/src/main/java/com/kfzs/duanduan/ActGameDetails.java
  5. 1 3
      app/src/main/java/com/kfzs/duanduan/adp/AdpFragmentRank.java
  6. 2 1
      app/src/main/java/com/kfzs/duanduan/adp/AdpGameBook.java
  7. 0 7
      app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java
  8. 3 5
      app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java
  9. 3 2
      app/src/main/java/com/kfzs/duanduan/adp/ClassificationAdapter.java
  10. 5 4
      app/src/main/java/com/kfzs/duanduan/adp/ClassificationGridviewAdapter.java
  11. 0 2
      app/src/main/java/com/kfzs/duanduan/adp/DownloadMgrAdapter.java
  12. 2 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  13. 4 3
      app/src/main/java/com/kfzs/duanduan/fragment/PictureViewPagerAdapter.java
  14. 2 1
      app/src/main/java/com/kfzs/duanduan/mine/GiftpackBroughtAdapter.java
  15. 2 1
      app/src/main/java/com/kfzs/duanduan/mine/VoucherItemAdapter.java
  16. 0 5
      app/src/main/java/com/kfzs/duanduan/react/MainTab.java
  17. 0 91
      app/src/main/java/com/kfzs/duanduan/utils/SelectorUtils.java
  18. 4 11
      app/src/main/java/com/kfzs/duanduan/view/AppHomepageAdvertisementDialog.java
  19. 2 1
      app/src/main/java/com/kfzs/duanduan/view/ImageGlarry.java
  20. 3 2
      app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java
  21. 3 2
      app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java
  22. 2 2
      app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java
  23. 3 2
      app/src/main/java/com/sheep/gamegroup/view/activity/PersionInfoAct.java
  24. 2 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
  25. 3 3
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  26. 8 2
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogChooseImage.java
  27. 5 4
      app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java
  28. 7 12
      app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java
  29. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java
  30. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
  31. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java
  32. 2 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java
  33. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java
  34. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java
  35. 3 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java
  36. 11 0
      app/src/main/res/values/style_theme.xml
  37. 4 2
      view/build.gradle
  38. 0 56
      view/src/main/java/com/kfzs/android/view/KFGlideRoundTransform.java

+ 2 - 1
app/build.gradle

@@ -222,6 +222,7 @@ dependencies {
     compile 'com.github.zhangkexpz:LayoutScroll:v1.0'
     compile 'com.arialyy.aria:aria-core:3.3.14'
     annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.14'
-
+    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
+    compile 'com.github.bumptech.glide:glide:4.1.1'
 
 }

+ 13 - 1
app/src/main/AndroidManifest.xml

@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.sheep.jiuyan.samllsheep">
-
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW"/>
     <uses-permission android:name="android.permission.REQUEST_MEDIA_PROJECTION"/>
@@ -356,6 +358,16 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ReNameActivity"
             android:screenOrientation="portrait"/>
+        <activity android:name="me.iwf.photopicker.PhotoPickerActivity"
+            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:screenOrientation="portrait"
+            />
+
+        <activity android:name="me.iwf.photopicker.PhotoPagerActivity"
+            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:screenOrientation="portrait"
+            />
+
         <!--友盟start-->
 
 

+ 0 - 3
app/src/main/java/com/kfzs/duanduan/ActDuJiaShouFa.java

@@ -13,7 +13,6 @@ import android.widget.RatingBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.adapter.recyclerview.DividerItemDecoration;
 import com.kfzs.appstore.utils.adapter.recyclerview.OnItemClickListener;
@@ -117,7 +116,6 @@ public class ActDuJiaShouFa extends BaseCompatActivity {
         final GameOuterClass.Game game = (GameOuterClass.Game) getIntent().getSerializableExtra(INTENT_GAME);
 
         Glide.with(this).load(game.getIconImage())
-                .transform(new KFGlideRoundTransform(this, 5))
                 .into(ViewFindUtils.find(mView, R.id.img_logo, ImageView.class));
 
         ViewFindUtils.find(mView, R.id.img_listview_item_game_info)
@@ -174,7 +172,6 @@ public class ActDuJiaShouFa extends BaseCompatActivity {
                         ratingBar.setRating(NumberFormatUtils.getDivideResult(model.getStar()));
                         Glide.with(mContext)
                                 .load(model.getIconImage())
-                                .transform(new KFGlideRoundTransform(mContext, 5))
                                 .into((ImageView) helper.getView(R.id.img_logo));
 
                         /**

+ 9 - 12
app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -18,16 +18,12 @@ import android.widget.TextView;
 import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
 import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.UserRecord;
-import com.kfzs.duanduan.fragment.FgContinuePlay;
-import com.kfzs.duanduan.utils.net.APIRequestV2;
-import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.kfzs.duanduan.adp.AdpViewPagerDetail;
+import com.kfzs.duanduan.bean.BaseMsg;
 import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.kfzs.duanduan.bean.UserRecord;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventDownloadHandler;
@@ -35,15 +31,17 @@ import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.fragment.FgtGameDetail;
 import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
+import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.kfzs.duanduan.utils.ShareUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.ShareUtils;
-import com.kfzs.duanduan.adp.AdpViewPagerDetail;
+import com.kfzs.duanduan.utils.net.APIRequestV2;
+import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -344,8 +342,7 @@ public class ActGameDetails extends BaseCompatActivity {
                 mGameStars.setRating(NumberFormatUtils.getDivideResult(respGame.getStar()));
 
 
-                Glide.with(ActGameDetails.this).load(respGame.getIconImage())
-                        .transform(new KFGlideRoundTransform(ActGameDetails.this, 10)).into(mGameIcon);
+                Glide.with(ActGameDetails.this).load(respGame.getIconImage()).into(mGameIcon);
 
                 Glide.with(ActGameDetails.this).load(respGame.getDetailBackImage()).into(mImgBg);
 

+ 1 - 3
app/src/main/java/com/kfzs/duanduan/adp/AdpFragmentRank.java

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.RatingBar;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.DiscountUtils;
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
@@ -182,7 +182,6 @@ public class AdpFragmentRank extends AdpCommonRecy<RecyleObj> {
                 ImageView ivChampion = helper.getView(R.id.game_rank_top3_1_bg);
                 Glide.with(mContext)
                         .load(oTempGame.getDetailBackImage())
-                        .bitmapTransform(new BlurTransformation(mContext, 15))//radius的取值范围是1-25,radius越大,模糊度越高
                         .into(ivChampion);
             }
 
@@ -191,7 +190,6 @@ public class AdpFragmentRank extends AdpCommonRecy<RecyleObj> {
             ImageView ivGameIcon = helper.getView(mIconId[i]);
             Glide.with(mContext)
                     .load(oTempGame.getIconImage())
-                    .transform(new KFGlideRoundTransform(mContext, 5))
                     .into(ivGameIcon);
 
             String position = String.valueOf((i + 1) * 12345);

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/adp/AdpGameBook.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.appstore.utils.sys.ClipboardUtils;
 import com.sheep.jiuyan.samllsheep.R;
@@ -79,7 +80,7 @@ public class AdpGameBook extends AdpCommonRecy<GameBookOuterClass.GameBooked> {
         }
         ImageView icon = holder.getView(R.id.img_item_game_book_self_icon);
         Glide.with(mContext).load(game.getIconImage())
-                .error(android.R.drawable.stat_notify_error)
+                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                 .into(icon);
 
         holder.getConvertView().setOnClickListener(new View.OnClickListener() {

+ 0 - 7
app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java

@@ -20,11 +20,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.duanduan.ActMain;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CateGameBean;
@@ -36,10 +32,7 @@ import com.kfzs.duanduan.bean.RecyleObj;
 import com.kfzs.duanduan.bean.RecyleType;
 import com.kfzs.duanduan.bean.SpecialRecommend;
 import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.proto.IndexBannerOuterClass;
-import com.kfzs.duanduan.proto.VoucherOuterClass;
 import com.kfzs.duanduan.utils.DiscountUtils;
 import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;

+ 3 - 5
app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java

@@ -8,14 +8,13 @@ import android.widget.RatingBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.view.KFProgressButton;
-import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
+import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.kfzs.duanduan.view.KFProgressButton;
+import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +66,6 @@ public class AdpSearchGame extends BaseAdpterWithDownBtn {
         }
 
         Glide.with(mContext).load(getItem(position).getIconImage())
-                .transform(new KFGlideRoundTransform(mContext, 5))
                 .into(ViewFindUtils.find(convertView, R.id.img_logo, ImageView.class));
 
         ViewFindUtils.find(convertView, R.id.img_listview_item_game_info)

+ 3 - 2
app/src/main/java/com/kfzs/duanduan/adp/ClassificationAdapter.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.GameTypeOuterClass;
 import com.kfzs.duanduan.proto.GameTypeSpecialOuterClass;
@@ -111,7 +112,7 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
         iconIv.setOnClickListener(new Onclick(gameType));
         Glide.with(mContext)
                 .load(gameType.getIcon()+"")
-                .error(android.R.drawable.stat_notify_error)
+                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                 .into(iconIv);
         return convertView;
     }
@@ -330,7 +331,7 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
         }else {
             Glide.with(mContext)
                     .load(((GameTypeSpecialOuterClass.GameTypeSpecial) o).getIcon()+"")
-                    .error(android.R.drawable.stat_notify_error)
+                    .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                     .into(bottomImageView1);
         }
 

+ 5 - 4
app/src/main/java/com/kfzs/duanduan/adp/ClassificationGridviewAdapter.java

@@ -13,6 +13,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.GameTypeSpecialOuterClass;
@@ -86,7 +87,7 @@ public class ClassificationGridviewAdapter extends BaseAdapter {
             type = gameTypeSpecial.getGameTypeId();
             Glide.with(mContext)
                     .load(gameTypeSpecial.getIcon())
-                    .error(android.R.drawable.stat_notify_error)
+                    .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                     .into( holder.imageView);
         }
 
@@ -105,19 +106,19 @@ public class ClassificationGridviewAdapter extends BaseAdapter {
                     case MotionEvent.ACTION_DOWN:
                         Glide.with(mContext)
                                 .load(gameTypeSpecial == null ?R.drawable.classification_gengduoyouxo_click :gameTypeSpecial.getHighlightIcon())
-                                .error(android.R.drawable.stat_notify_error)
+                                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                                 .into( finalHolder.imageView);
                         break;
                     case MotionEvent.ACTION_UP:
                         Glide.with(mContext)
                                 .load(gameTypeSpecial == null ?R.drawable.classification_gengduoyouxo :gameTypeSpecial.getIcon())
-                                .error(android.R.drawable.stat_notify_error)
+                                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                                 .into( finalHolder.imageView);
                         break;
                     default:
                         Glide.with(mContext)
                                 .load(gameTypeSpecial == null ?R.drawable.classification_gengduoyouxo :gameTypeSpecial.getIcon())
-                                .error(android.R.drawable.stat_notify_error)
+                                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                                 .into( finalHolder.imageView);
                         break;
                 }

+ 0 - 2
app/src/main/java/com/kfzs/duanduan/adp/DownloadMgrAdapter.java

@@ -5,7 +5,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.android.view.KFGlideRoundTransform;
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.adapter.MDLAdpater;
 import com.kfzs.appstore.utils.adapter.MDLViewHolderHelper;
@@ -74,7 +73,6 @@ public class DownloadMgrAdapter extends MDLAdpater<DownLoadInfo> {
 
         Glide.with(mContext)
                 .load(model.getMIconUrl())
-                .transform(new KFGlideRoundTransform(mContext, 5))
                 .into((ImageView) helper.getView(R.id.download_mgr_iv_icon));
 
 

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
@@ -129,7 +130,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         sheepNumTv.setText("绵羊号:" + userEntity.getInvitation_code());
         Glide.with(getActivity())
                 .load(userEntity.getAvatar())
-                .placeholder(R.drawable.icon)
+                .apply(new RequestOptions().placeholder(R.drawable.icon))
                 .into(iconImgIv);
 
     }

+ 4 - 3
app/src/main/java/com/kfzs/duanduan/fragment/PictureViewPagerAdapter.java

@@ -13,6 +13,7 @@ import android.widget.RelativeLayout;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.ActPicturesEnlarge;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.KFIntentKeys;
@@ -82,8 +83,8 @@ public class PictureViewPagerAdapter extends PagerAdapter {
 
             Glide.with(that)
                     .load(mUrlsCollection.get(position))
-                    .placeholder(R.drawable.loading)
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .apply(new RequestOptions().placeholder(R.drawable.loading)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL))
                     .into(ivChildItem);
 
             ivChildItem.setOnClickListener(new View.OnClickListener() {
@@ -113,7 +114,7 @@ public class PictureViewPagerAdapter extends PagerAdapter {
             ivChildItem.setLayoutParams(lp);
 
             Glide.with(that).load(mUrlsCollection.get(position))
-                    .placeholder(R.drawable.loading).into(ivChildItem);
+                    .apply(new RequestOptions().placeholder(R.drawable.loading)).into(ivChildItem);
             ivChildItem.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/mine/GiftpackBroughtAdapter.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.GiftList;
@@ -68,7 +69,7 @@ public class GiftpackBroughtAdapter extends BaseAdapter {
         TextView copyTv = view.findViewById(R.id.giftpack_key_copy_tv);
         Glide.with(mContext)
                 .load(giftList.getIcon())
-                .error(android.R.drawable.stat_notify_error)
+                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                 .into(iconIv);
         nameTv.setText(giftList.getGameName()+"");
         if(giftList.getEndTime() > 0){

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/mine/VoucherItemAdapter.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.GiftList;
 import com.kfzs.duanduan.proto.VoucherOuterClass;
@@ -67,7 +68,7 @@ public class VoucherItemAdapter extends BaseAdapter {
         View lineView = view.findViewById(R.id.line_view);
         Glide.with(mContext)
                 .load(voucher.getGameIcon())
-                .error(android.R.drawable.stat_notify_error)
+                .apply(new RequestOptions().error(android.R.drawable.stat_notify_error))
                 .into(iconIv);
         nameTv.setText(voucher.getGameName()+"");
         voucher_diraction_tv.setText(couponUtils.getVoucherContent(voucher));

+ 0 - 5
app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -9,7 +9,6 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.VipStyle;
 import com.kfzs.duanduan.fragment.FgtMainCategory;
 import com.kfzs.duanduan.fragment.FgtMainGame;
-import com.kfzs.duanduan.utils.SelectorUtils;
 
 /**
  * Created by realicing on 2018/1/4.
@@ -73,10 +72,6 @@ public enum MainTab {
         this.position = position;
     }
 
-    public void setSelect(ImageView imageView) {
-        SelectorUtils.addSeletorFromNet(imageView.getContext(), getImgUrl1(), getImgUrl2(), imageView);
-    }
-
     public abstract Fragment getFragment();
 
     protected abstract String getImgUrl2();

+ 0 - 91
app/src/main/java/com/kfzs/duanduan/utils/SelectorUtils.java

@@ -1,91 +0,0 @@
-package com.kfzs.duanduan.utils;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.StateListDrawable;
-import android.os.AsyncTask;
-import android.support.annotation.DrawableRes;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  SelectorUtils</p>
- * @ <p>Description:动态设置 selector 的工具类</p>
- * @ <p>Description:可以从本地和网络添加</p>
- * @ date:  2017/12/14 14:57
- * @ QQ:    315096953
- */
-
-public class SelectorUtils {
-
-    /**
-     * 从 drawable 获取图片 id 给 Imageview 添加 selector
-     *
-     * @param context      调用方法的 Activity
-     * @param idNormal     默认图片的 id
-     * @param idPress      点击图片的 id
-     * @param view         点击的 view,如果为imageView或imageButton会设置src
-     * @param isBackground 是否为后台点击
-     */
-    public static void addSelectorFromDrawable(Context context, @DrawableRes int idNormal,
-                                               @DrawableRes int idPress, View view, boolean isBackground) {
-        StateListDrawable drawable = new StateListDrawable();
-        Drawable normal = context.getResources().getDrawable(idNormal);
-        Drawable press = context.getResources().getDrawable(idPress);
-        drawable.addState(new int[]{android.R.attr.state_pressed}, press);
-        drawable.addState(new int[]{-android.R.attr.state_pressed}, normal);
-        if (isBackground) {
-            view.setBackgroundDrawable(drawable);
-            return;
-        }
-        if (view instanceof ImageView) {
-            ((ImageView) view).setImageDrawable(drawable);
-        }
-    }
-
-
-    /**
-     * 从网络获取图片 给 Button 设置 selector
-     *
-     * @param context   调用方法的类
-     * @param normalUrl 获取默认图片的链接
-     * @param pressUrl  获取点击图片的链接
-     * @param imageView 点击的 imageView
-     */
-    public static void addSeletorFromNet(Context context, final String normalUrl,
-                                         final String pressUrl, final ImageView imageView) {
-        imageView.setImageDrawable(new StateListDrawable());
-        Glide.with(context)
-                .load(normalUrl)
-                .into(new SimpleTarget<GlideDrawable>() {
-                    @Override
-                    public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) {
-                        StateListDrawable drawable = imageView.getDrawable() instanceof StateListDrawable ?
-                                (StateListDrawable) imageView.getDrawable() : new StateListDrawable();
-                        drawable.addState(new int[]{-android.R.attr.state_selected}, resource);
-                        imageView.setImageDrawable(drawable);
-                    }
-                });
-        Glide.with(context)
-                .load(pressUrl)
-                .into(new SimpleTarget<GlideDrawable>() {
-                    @Override
-                    public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) {
-                        StateListDrawable drawable = imageView.getDrawable() instanceof StateListDrawable ?
-                                (StateListDrawable) imageView.getDrawable() : new StateListDrawable();
-                        drawable.addState(new int[]{android.R.attr.state_pressed}, resource);
-                        drawable.addState(new int[]{android.R.attr.state_selected}, resource);
-                        imageView.setImageDrawable(drawable);
-                    }
-                });
-    }
-}

+ 4 - 11
app/src/main/java/com/kfzs/duanduan/view/AppHomepageAdvertisementDialog.java

@@ -12,6 +12,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -84,17 +85,9 @@ public class AppHomepageAdvertisementDialog extends Dialog {
 
         if (backgroundImg != null) {
             Glide.with(context).load(imagePath)
-                    .asBitmap()
-                    .error(R.drawable.loading)
-                    .into(new BitmapImageViewTarget(backgroundImg) {
-                        @Override
-                        protected void setResource(Bitmap resource) {
-                            RoundedBitmapDrawable circularBitmapDrawable =
-                                    RoundedBitmapDrawableFactory.create(getContext().getResources(), resource);
-                            circularBitmapDrawable.setCornerRadius(30);
-                            backgroundImg.setImageDrawable(circularBitmapDrawable);
-                        }
-                    });
+                    .apply(new RequestOptions()
+                    .error(R.drawable.loading))
+                    .into(backgroundImg);
         }
     }
 

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/view/ImageGlarry.java

@@ -14,6 +14,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -74,7 +75,7 @@ public class ImageGlarry {
             ImageView imageView = new ImageView(mActivity);
             imageView.setOnClickListener(new cls_main(pos));
             imageView.setScaleType(scaleType);
-            Glide.with(mActivity).load(pic).dontAnimate().into(imageView);
+            Glide.with(mActivity).load(pic).apply(new RequestOptions().dontAnimate()).into(imageView);
             mListImages.add(imageView);
 
 

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.lzy.imagepicker.loader.ImageLoader;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -30,8 +31,8 @@ public class GlideImageLoader implements ImageLoader {
     public static void displayImage(Activity activity, ImageView imageView, String path, int id){
         Glide.with(activity)
                 .load(path)
-                .centerCrop()
-                .placeholder(id)
+                .apply(new RequestOptions().centerCrop()
+                .placeholder(id))
                 .into(imageView);
     }
 }

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
@@ -128,7 +129,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         mEntity=user;
         Glide.with(AccountAndSecurityAct.this)
                 .load(mEntity.getAvatar())
-                .placeholder(R.drawable.icon)
+                .apply(new RequestOptions().placeholder(R.drawable.icon))
                 .into(ivHead);
     }
 
@@ -244,7 +245,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
                 Glide.with(AccountAndSecurityAct.this)
                         .load(mEntity.getAvatar())
-                        .placeholder(R.drawable.icon)
+                        .apply(new RequestOptions().placeholder(R.drawable.icon))
                         .into(ivHead);
                 if (TextUtils.isEmpty(entity.getWx_nickname())) {
                     tvWx.setText("未绑定");

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.utils.dlg.DeviceUtils;
@@ -151,8 +152,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         webview.loadUrl(task_entity.getBoot_address());
         Glide.with(this)
                 .load(task_entity.getIcon())
-                .placeholder(R.mipmap.ic_launcher)
-                .dontAnimate()
+                .apply(new RequestOptions().dontAnimate())
                 .into(dialogItemIconIv);
         dialogItemNameTv.setText(task_entity.getName());
         dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/PersionInfoAct.java

@@ -10,6 +10,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.lzy.imagepicker.bean.ImageItem;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.event.ImageHeadChange;
@@ -87,7 +88,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
                 Glide.with(PersionInfoAct.this)
                         .load(mEntity.getAvatar())
-                        .placeholder(R.drawable.icon)
+                        .apply(new RequestOptions().placeholder(R.drawable.icon))
                         .into(ivHeadRight);
             }
         }
@@ -143,7 +144,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         iv_qr.setLayoutParams(params);
         Glide.with(PersionInfoAct.this)
                 .load(mEntity.getAvatar())
-                .placeholder(R.mipmap.x_ic_def_head)
+                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
                 .into(iv_qr);
         dialog.show();
         iv.setOnClickListener(new View.OnClickListener() {

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
@@ -68,7 +69,7 @@ public class TaskListItemAdp extends BaseAdapter {
         holder.price_tv.setText(returnValue(ety));
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
-                .placeholder(R.mipmap.x_ic_def_head)
+                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
                 .into(holder.icon_iv);
         return convertView;
     }

+ 3 - 3
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -14,6 +14,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.adp.AdpCommonRecy;
 import com.sheep.gamegroup.model.api.ApiService;
@@ -133,7 +134,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
                 Glide.with(context)
                         .load(etyList.get(i).getTask().getIcon()+"")
-                        .placeholder(R.mipmap.x_ic_def_head)
+                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -170,8 +171,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
         Glide.with(context)
                 .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
-                .placeholder(R.mipmap.x_ic_def_head)
-                .dontAnimate()
+                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head).dontAnimate())
                 .into(icon);
         item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");
         item_num_tv.setText("剩余"+ acceptedEty.getRelease_task().getLast_num()+"份");

+ 8 - 2
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogChooseImage.java

@@ -12,6 +12,8 @@ import com.lzy.imagepicker.ui.ImageGridActivity;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
 
+import me.iwf.photopicker.PhotoPicker;
+
 import static com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity.REQUEST_CODE_CAMERA;
 import static com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity.REQUEST_CODE_SELECT;
 
@@ -46,8 +48,12 @@ public class DialogChooseImage {
                     @Override
                     public void onClick(View v) {
                         mAlertDialog.dismiss();
-                        Intent intent = new Intent(activity, ImageGridActivity.class);
-                        activity.startActivityForResult(intent, REQUEST_CODE_SELECT);
+                        PhotoPicker.builder()
+                                .setPhotoCount(1)
+                                .setShowCamera(true)
+                                .setShowGif(true)
+                                .setPreviewEnabled(false)
+                                .start(activity, PhotoPicker.REQUEST_CODE);
                     }
                 });
         Window window = mAlertDialog.getWindow();

+ 5 - 4
app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.view.customview.FlikerProgressBar;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.gamegroup.view.customview.TextProgressBar;
@@ -114,8 +115,8 @@ public class DownListAdapter extends BaseAdapter {
             ll_install = view.findViewById(R.id.ll_install);
             Glide.with(mContext)
                     .load(downloadInfo.getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
+                    .apply(new RequestOptions().placeholder(R.drawable.icon)
+                    .dontAnimate())
                     .into(ImageView);
             iv_state.setOnClickListener(this);
             iv_remove.setOnClickListener(this);
@@ -128,8 +129,8 @@ public class DownListAdapter extends BaseAdapter {
             super.update(downloadInfo);
             Glide.with(mContext)
                     .load(downloadInfo.getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
+                    .apply(new RequestOptions().placeholder(R.drawable.icon)
+                    .dontAnimate())
                     .into(ImageView);
         }
 

+ 7 - 12
app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -15,11 +15,13 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.view.dialog.DialogChooseImage;
 import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
 import java.util.ArrayList;
 
 import go.kfzssafe.Kfzssafe;
+import me.iwf.photopicker.PhotoPicker;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -45,19 +47,12 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == ImagePicker.RESULT_CODE_ITEMS) {
-            if (data != null && (requestCode == REQUEST_CODE_SELECT||requestCode == REQUEST_CODE_CAMERA)) {
-                ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
-                if(images != null && !images.isEmpty() && (imageItem = images.get(0)) != null && !TextUtils.isEmpty(imageItem.path)) {
-                    onGetImage(imageItem);
-                    if(isUpload){
-                        AbsChooseImageActivity.this.dialogShowLoading = DialogShowLoading.showDialog(AbsChooseImageActivity.this);
-                        UpFileUtils.upImage(new File(images.get(0).path), AbsChooseImageActivity.this);
-                    }
-                    return;
-                }
+        if (resultCode == RESULT_OK && requestCode == PhotoPicker.REQUEST_CODE) {
+            if (data != null) {
+                ArrayList<String> photos =
+                        data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
+                G.showToast(JSON.toJSONString(photos));
             }
-            onNotGetImage("没有数据");
         }
     }
 

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -25,6 +25,7 @@ import android.widget.Toast;
 
 import com.app.hubert.library.NewbieGuide;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -338,8 +339,8 @@ public class GameDetailActivity extends BaseActivity {
             mTvMoney.setText(mTask.getTask().getPrice());
             Glide.with(SheepApp.mContext)
                     .load(mTask.getTask().getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
+                    .apply(new RequestOptions().placeholder(R.drawable.icon)
+                    .dontAnimate())
                     .into(mImgIcon);
             mTxtTitle.setText(mTask.getTask().getTitle());
             mWebText.loadUrl(mTask.getTask().getGuide());

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -34,6 +34,7 @@ import android.widget.Toast;
 
 import com.app.hubert.library.NewbieGuide;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
@@ -291,8 +292,8 @@ if (BuildConfig.DEBUG)
                 .setText(G.mUser.getNickName());
         Glide.with(this)
                 .load(G.mUser.getIcon())
-                .placeholder(R.drawable.icon)
-                .dontAnimate()
+                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                .dontAnimate())
                 .into((CircleImageView) findViewById(R.id.img_user));
 
         if (G.mUser.getReceived_red_packet() == 1) {

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -19,6 +19,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -296,8 +297,8 @@ public class TaskRecordActivity extends BaseActivity {
                 viewHolder.setText(R.id.txt_baseactivity_title, item.getTask().getTitle());
                 Glide.with(TaskRecordActivity.this)
                         .load(item.getTask().getIcon())
-                        .placeholder(R.drawable.icon)
-                        .dontAnimate()
+                        .apply(new RequestOptions().placeholder(R.drawable.icon)
+                        .dontAnimate())
                         .into(viewHolder.<ImageView>getView(R.id.img_icon));
                 String strMoney=TextUtils.isEmpty(item.getCompleteMoney())?item.getTask().getPrice():item.getCompleteMoney();
                 viewHolder.setText(R.id.tv_money, "¥" + strMoney);

+ 2 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -107,7 +108,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                         mTvNick.setText(user.getNickName());
                         mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
                         mTvCode.setText("我的邀请码  " + user.getInvitationCode());
-                        Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
+                        Glide.with(getApplicationContext()).load(user.getIcon()).apply(new RequestOptions().placeholder(R.drawable.icon).dontAnimate()).into(mImgIcon);
                         if(TextUtils.isEmpty(user.getMobile())){
                             //做弹框
                             showBindPhoneDialog();

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
@@ -74,8 +75,8 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
                 .setText(taskPublish.getTask().getBonus());
         Glide.with(mContext)
                 .load(taskPublish.getTask().getIcon())
-                .placeholder(R.drawable.icon)
-                .dontAnimate()
+                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                .dontAnimate())
                 .into(holder.getView(R.id.img_icon, ImageView.class));
 
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java

@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
@@ -66,8 +67,8 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
         viewHolder.mTvBouns.setText(datas.get(position).getTask().getBonus());
         Glide.with(mActivity)
                 .load(datas.get(position).getTask().getIcon())
-                .placeholder(R.drawable.sheep)
-                .dontAnimate()
+                .apply(new RequestOptions().placeholder(R.drawable.sheep)
+                .dontAnimate())
                 .into(viewHolder.mImgIcon);
         viewHolder.mRootView.setOnClickListener(
                 new View.OnClickListener() {

+ 3 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -12,6 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -322,8 +323,8 @@ public class FgtMainPageTask extends BaseFragment {
                     if (!getActivity().isDestroyed())
                         Glide.with(getActivity())
                                 .load(taskPublish.getTask().getIcon())
-                                .placeholder(R.drawable.icon)
-                                .dontAnimate()
+                                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                                .dontAnimate())
                                 .into(mImgIcon);
                     mTvTitle.setText(taskPublish.getTask().getTitle());
                     try {

+ 11 - 0
app/src/main/res/values/style_theme.xml

@@ -47,4 +47,15 @@
     <attr name="main_color_accent" format="color|reference" />
     <attr name="main_color_light" format="color|reference" />
 
+    <style name="actionBarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
+        <item name="actionBarSize">14sp</item>
+    </style>
+
+    <style name="customTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="actionBarTheme">@style/actionBarTheme</item>
+        <item name="colorPrimary">#FFA500</item>
+        <item name="actionBarSize">14sp</item>
+        <item name="colorPrimaryDark">#CCa500</item>
+    </style>
 </resources>

+ 4 - 2
view/build.gradle

@@ -31,7 +31,9 @@ android {
 dependencies {
     compile 'com.android.support:appcompat-v7:27.1.0'
     compile 'com.android.support:support-v4:27.1.0'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'jp.wasabeef:glide-transformations:2.0.2'
+//    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile ('jp.wasabeef:glide-transformations:2.0.2'){
+        exclude group: 'com.github.bumptech.glide', module: 'glide'
+    }
 //    compile project(':sheep')
 }

+ 0 - 56
view/src/main/java/com/kfzs/android/view/KFGlideRoundTransform.java

@@ -1,56 +0,0 @@
-package com.kfzs.android.view;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-
-/**
- * ImageView to round
- * Created by HooRang on 2017/3/6.
- */
-public class KFGlideRoundTransform extends BitmapTransformation {
-
-
-    private static float radius = 0f;
-
-    public KFGlideRoundTransform(Context context) {
-        this(context, 4);
-    }
-
-    public KFGlideRoundTransform(Context context, int dp) {
-        super(context);
-        this.radius = Resources.getSystem().getDisplayMetrics().density * dp;
-    }
-
-    @Override protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
-        return roundCrop(pool, toTransform);
-    }
-
-    private static Bitmap roundCrop(BitmapPool pool, Bitmap source) {
-        if (source == null) return null;
-
-        Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
-        if (result == null) {
-            result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
-        }
-
-        Canvas canvas = new Canvas(result);
-        Paint paint = new Paint();
-        paint.setShader(new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
-        paint.setAntiAlias(true);
-        RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight());
-        canvas.drawRoundRect(rectF, radius, radius, paint);
-        return result;
-    }
-
-    @Override public String getId() {
-        return getClass().getName() + Math.round(radius);
-    }
-}