修复bug与调整界面

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan.fragment;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -21,6 +22,7 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
@@ -161,10 +163,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", userEntitys.getBalance()));
         ViewUtil.setText(nameTv, userEntitys.getNickname());
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntitys.getInvitation_code()));
-        Glide.with(activity)
-                .load(userEntitys.getAvatar() + "")
-                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
-                .into(iconImgIv);
+        GlideImageLoader.setAvatar(iconImgIv, userEntitys.getAvatar(), Color.argb(128, 255, 255, 255));
 
     }
 

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -244,11 +244,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             sheepNumTv.append(userEntity.getParent_code());
         }
         ViewUtil.setText(myPrice, String.format(Locale.CHINA, "%s\u0020元", userEntity.getBalance()));
-
-        Glide.with(activity)
-                .load(userEntity.getAvatar())
-                .apply(new RequestOptions().transform(new GlideCircleTransformWithBorder(2, Color.WHITE)).placeholder(R.drawable.icon))
-                .into(iconImgIv);
+        GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
 
     }
 
@@ -552,8 +548,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         PreferenceUtils.setPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID, userEntity.getOpen_id());
         //保存用户邀请人邀请码
         PreferenceUtils.setPrefString(SheepApp.mContext, "invitation_code", userEntity.getParent_code());
-        //统计用户登录信息
-        UMConfigUtils.onProfileSignIn();
         try {
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
 

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -70,8 +70,6 @@ public class TabsHelper {
      */
     private void nativeBack() {
         if (System.currentTimeMillis() - mLastBackTime < 1000) {
-            //退出统计
-            UMConfigUtils.onProfileSignOff();
 
             KFZSApp.getInstance().quit();
         } else {

app/src/main/java/com/sheep/gamegroup/util/ChannelContent.java

@@ -95,13 +95,7 @@ public class ChannelContent {
         }
         return hasChannelFile;
     }
-    private static final String[] defaultChannels = {
-            "849198", "935404", "34176879", "38291072", "25284360","976873",
-            "849198", "935404", "34176879", "38291072", "25284360"};//, "40253514", "61337548"};
     public String getChannel_name() {
-        if (TextUtils.isEmpty(channel_name)) {
-            return defaultChannels[Math.abs(new Random().nextInt())%defaultChannels.length];
-        }
         return channel_name;
     }
 

app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java

@@ -1,10 +1,13 @@
 package com.sheep.gamegroup.util;
 
+import android.graphics.Color;
+import android.text.TextUtils;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
+import com.sheep.gamegroup.util.glide.GlideCircleTransformWithBorder;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -109,4 +112,41 @@ public class GlideImageLoader {
             }
         });
     }
+
+    /**
+     * 设置头像
+     * @param iconImgIv
+     * @param avatar
+     */
+    public static void setAvatar(ImageView iconImgIv, String avatar) {
+        if(TextUtils.isEmpty(avatar)){
+            Glide.with(SheepApp.getInstance())
+                    .load(R.drawable.avatar)
+                    .apply(new RequestOptions().circleCrop())
+                    .into(iconImgIv);
+        } else {
+            Glide.with(SheepApp.getInstance())
+                    .load(avatar)
+                    .apply(new RequestOptions().placeholder(R.drawable.avatar))
+                    .into(iconImgIv);
+        }
+    }
+    /**
+     * 设置头像有外面的圆环
+     * @param iconImgIv
+     * @param avatar
+     */
+    public static void setAvatar(ImageView iconImgIv, String avatar, int color) {
+        if(TextUtils.isEmpty(avatar)){
+            Glide.with(SheepApp.getInstance())
+                    .load(R.drawable.avatar)
+                    .apply(new RequestOptions().override(iconImgIv.getMeasuredWidth()).transform(new GlideCircleTransformWithBorder(color)))
+                    .into(iconImgIv);
+        } else {
+            Glide.with(SheepApp.getInstance())
+                    .load(avatar)
+                    .apply(new RequestOptions().transform(new GlideCircleTransformWithBorder(color)).placeholder(R.drawable.avatar))
+                    .into(iconImgIv);
+        }
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -232,6 +232,8 @@ public class Jump2View {
             intent.putExtra(ActMain.INTENT_GAME_ID, (Integer) o);
             context.startActivity(intent);
         } else if(o instanceof String){
+            //统计用户登录信息
+            UMConfigUtils.onProfileSignIn();
             //从登录界面过来//新注册用户才添加到数据库,并设置可以显示
             NewbieTaskRecord newbie_task_record = new NewbieTaskRecord();
             newbie_task_record.setUser_id((String)o);

app/src/main/java/com/sheep/gamegroup/util/glide/GlideCircleTransformWithBorder.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.util.glide;
 
-import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
@@ -20,6 +19,20 @@ import java.security.MessageDigest;
 public class GlideCircleTransformWithBorder  extends BitmapTransformation {
     private Paint mBorderPaint;
     private float mBorderWidth;
+    public static float DEFAULT_BORDER_WIDTH = -1;
+    public GlideCircleTransformWithBorder(int borderColor) {
+        super();
+        if(DEFAULT_BORDER_WIDTH < 0)
+            DEFAULT_BORDER_WIDTH = Resources.getSystem().getDisplayMetrics().density * 2;
+        mBorderWidth = DEFAULT_BORDER_WIDTH;
+
+        mBorderPaint = new Paint();
+        mBorderPaint.setDither(true);
+        mBorderPaint.setAntiAlias(true);
+        mBorderPaint.setColor(borderColor);
+        mBorderPaint.setStyle(Paint.Style.STROKE);
+        mBorderPaint.setStrokeWidth(DEFAULT_BORDER_WIDTH);
+    }
     public GlideCircleTransformWithBorder(int borderWidth, int borderColor) {
         super();
         mBorderWidth = Resources.getSystem().getDisplayMetrics().density * borderWidth;

app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java

@@ -423,7 +423,7 @@ public class ActFindGame extends BaseActivity {
     TextView find_game_user_commit_tv;
 
     private void loadUserInfo(final UserEntity userEntity) {
-        GlideImageLoader.circleImage(find_game_user_iv, userEntity.getAvatar(), R.drawable.icon);
+        GlideImageLoader.setAvatar(find_game_user_iv, userEntity.getAvatar());
         ViewUtil.setText(find_game_user_name_tv, userEntity.getNickname());
         find_game_user_commit_tv.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -109,11 +109,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 Glide.with(PersonalInfoAct.this)
                         .load(AppUtil.getQRLink(mEntity.getShareLink(), 90))
                         .into(personal_info_qr);
-
-                Glide.with(PersonalInfoAct.this)
-                        .load(mEntity.getAvatar())
-                        .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
-                        .into(personal_info_avatar);
+                GlideImageLoader.setAvatar(personal_info_avatar, mEntity.getAvatar());
                 //账号与安全
 
                 if (TextUtils.isEmpty(mEntity.getMobile())) {

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -117,8 +117,52 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            if(!isRequestCodePermissions && !isLoaddingData && timerIsFinish())
-                gotoNext();
+            switch (msg.what){
+                case 0:
+                    if(!isRequestCodePermissions && !isLoaddingData && timerIsFinish())
+                        gotoNext();
+                    break;
+                case 1:
+                    if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告
+                        isLoaddingData = false;
+                        sendHandlerMessages(200);
+                    } else {
+                        Advertising cacheAdvertising = CommonUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
+                        if (cacheAdvertising != null) {
+                            isLoaddingData = false;
+                            advertising = cacheAdvertising;
+                            try {
+                                loadAdvertising();
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        } else {
+                            SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(1)
+                                    .subscribeOn(Schedulers.io())
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                                        @Override
+                                        public void onNext(BaseMessage baseMessage) {
+                                            CommonUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
+                                            isLoaddingData = false;
+                                            advertising = baseMessage.getData(Advertising.class);
+                                            try {
+                                                loadAdvertising();
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+
+                                        @Override
+                                        public void onError(BaseMessage baseMessage) {
+                                            isLoaddingData = false;
+                                            sendHandlerMessages(10);
+                                        }
+                                    });
+                        }
+                    }
+                    break;
+            }
 
         }
     };
@@ -145,43 +189,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     public void initView() {
         activity = this;
         GlideImageLoader.setImage(login_bg_img, "http://cdngame.kuaifazs.com/login_bg_img.png");
-        if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告
-            sendHandlerMessages(1000);
-        } else {
-            Advertising cacheAdvertising = CommonUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
-            if (cacheAdvertising != null) {
-                isLoaddingData = false;
-                advertising = cacheAdvertising;
-                try {
-                    loadAdvertising();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            } else {
-                SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(1)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                CommonUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
-                                isLoaddingData = false;
-                                advertising = baseMessage.getData(Advertising.class);
-                                try {
-                                    loadAdvertising();
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                isLoaddingData = false;
-                                sendHandlerMessages(10);
-                            }
-                        });
-            }
-        }
+        mHandler.sendEmptyMessageDelayed(1, 500);
     }
 
     @Override

app/src/main/res/layout/adp_homelist_gridview.xml

@@ -12,22 +12,24 @@
 
     <TextView
         android:id="@+id/gridview_item_name_tv"
-        style="@style/nomal_txt_style"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="试玩赚钱"
+        android:textSize="13sp"
+        android:textColor="@color/black_6_3"
         app:layout_constraintBottom_toTopOf="@+id/gridview_item_detail_tv"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/gridview_item_detail_tv"
-        style="@style/nomal_txt_style_11"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/content_padding_10"
         android:text="下载应用领现金"
         android:singleLine="true"
+        android:textSize="10sp"
+        android:textColor="@color/black_666666"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/gridview_item_icon_iv"
         app:layout_constraintStart_toStartOf="parent"
@@ -48,8 +50,8 @@
 
     <ImageView
         android:id="@+id/gridview_item_icon_iv"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="38dp"
+        android:layout_height="38dp"
         android:adjustViewBounds="true"
         android:src="@mipmap/home_try_play_circle_bg"
         app:layout_constraintTop_toTopOf="parent"

app/src/main/res/layout/adp_homelist_listview.xml

@@ -6,10 +6,10 @@
 
     <ImageView
         android:id="@+id/q_iv"
-        android:layout_width="43dp"
-        android:layout_height="43dp"
-        android:layout_marginBottom="@dimen/content_padding_small"
-        android:layout_marginTop="@dimen/content_padding_small"
+        android:layout_width="31dp"
+        android:layout_height="31dp"
+        android:layout_marginBottom="12.5dp"
+        android:layout_marginTop="12.5dp"
         android:src="@mipmap/home_q_circle_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
@@ -18,10 +18,11 @@
 
     <TextView
         android:id="@+id/q_name_tv"
-        style="@style/txt_style_16_black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="充值Q币"
+        android:textSize="13sp"
+        android:textColor="@color/black_6_3"
         android:layout_marginStart="@dimen/content_padding_small"
         app:layout_constraintBottom_toBottomOf="@+id/q_iv"
         app:layout_constraintStart_toEndOf="@+id/q_iv"
@@ -33,6 +34,8 @@
         android:layout_height="wrap_content"
         android:gravity="right"
         android:text="平台绵羊币，充值更便宜"
+        android:textSize="10sp"
+        android:textColor="@color/black_666666"
         app:layout_constraintBottom_toBottomOf="@+id/q_iv"
         app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
         app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/homepage_item_currenttime_reward.xml

@@ -6,34 +6,43 @@
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical"
     android:minHeight="@dimen/view_size_80"
-    android:paddingStart="@dimen/content_padding"
-    android:paddingEnd="@dimen/content_padding_10"
     android:paddingTop="@dimen/content_padding_10"
     android:paddingBottom="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/item_title_iv"
-            android:layout_width="@dimen/content_padding_20"
-            android:layout_height="@dimen/content_padding_20"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:src="@mipmap/current_time_icon"/>
         <TextView
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:layout_marginStart="@dimen/content_padding_small"
             android:text="实时动态"
             android:textColor="@color/black"
             android:textSize="15sp"/>
     </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/content_padding_10"
+        android:background="@color/gray_F0F0F0" />
     <com.sunfusheng.marqueeview.MarqueeView
         android:id="@+id/upview1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
         android:minHeight="30dp"
         app:mvAnimDuration="1000"
         app:mvDirection="bottom_to_top"

app/src/main/res/layout/homepage_item_gridview_listview.xml

@@ -28,7 +28,8 @@
         android:scrollbars="none"
         android:divider="@null"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:padding="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
         android:listSelector="@color/transparent"
         android:visibility="gone"/>
 

app/src/main/res/layout/homepage_item_top2.xml

@@ -13,11 +13,12 @@
 
     <ImageView
         android:id="@+id/icon_img_iv"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_marginBottom="6dp"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:scaleType="fitXY"
         android:src="@drawable/icon"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/name_tv"
+        app:layout_constraintBottom_toBottomOf="@+id/my_price" />
 
 
     <TextView

app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -9,7 +9,7 @@
         android:id="@+id/task_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/content_padding_10"
         android:orientation="horizontal">
 
         <ImageView
@@ -22,8 +22,9 @@
         <TextView
             android:id="@+id/item_title_tv"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="@dimen/content_padding_20"
             android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"
             android:layout_marginStart="@dimen/content_padding_small"
             android:layout_toEndOf="@+id/item_title_iv"
             android:text="进行中"
@@ -33,7 +34,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
-            android:layout_marginTop="36dp"
+            android:layout_marginTop="33dp"
             android:background="@color/gray_F0F0F0" />
     </RelativeLayout>
 
@@ -43,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="16dp">
+        android:layout_marginTop="@dimen/content_padding_10">
 
         <ImageView
             android:id="@+id/item_icon_iv"
@@ -223,7 +224,7 @@
         android:visibility="gone" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_16"/>
+        android:layout_height="@dimen/content_padding_10"/>
     <View
         android:id="@+id/line_tv"
         android:layout_width="match_parent"