zengjiebin лет назад: 8
Родитель
Сommit
fac8ebe1b6
30 измененных файлов с 494 добавлено и 541 удалено
  1. 57 55
      app/app.iml
  2. 2 2
      app/src/main/java/com/kfzs/duanduan/ActGameDetails.java
  3. 245 254
      app/src/main/java/com/kfzs/duanduan/adp/ClassificationAdapter.java
  4. 1 1
      app/src/main/java/com/kfzs/duanduan/adp/ClassificationGridviewAdapter.java
  5. 12 20
      app/src/main/java/com/kfzs/duanduan/fragment/FgtMainCategory.java
  6. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtMainGame.java
  7. 2 2
      app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java
  8. 28 0
      app/src/main/java/com/kfzs/duanduan/view/diag/MyListview.java
  9. 0 0
      app/src/main/java/com/kfzs/duanduan/view/diag/download
  10. BIN
      app/src/main/res/drawable-hdpi/index_download.png
  11. BIN
      app/src/main/res/drawable-hdpi/index_search.png
  12. BIN
      app/src/main/res/drawable-xhdpi/icon_download.png
  13. BIN
      app/src/main/res/drawable-xhdpi/index_download.png
  14. BIN
      app/src/main/res/drawable-xhdpi/index_search.png
  15. BIN
      app/src/main/res/drawable-xxhdpi/index_download.png
  16. BIN
      app/src/main/res/drawable-xxhdpi/index_search.png
  17. 9 0
      app/src/main/res/drawable/shape_class_item_bg.xml
  18. 2 1
      app/src/main/res/drawable/sp_search_edt_white.xml
  19. 3 2
      app/src/main/res/layout/classification_gridview_item.xml
  20. 81 177
      app/src/main/res/layout/classification_item.xml
  21. 37 8
      app/src/main/res/layout/fgt_main_category.xml
  22. 11 17
      app/src/main/res/layout/listview_item_game_rank_top3.xml
  23. 1 1
      app/src/main/res/layout/toolbar_main_activity.xml
  24. BIN
      app/src/main/res/mipmap-xhdpi/rank_1_img.png
  25. BIN
      app/src/main/res/mipmap-xhdpi/rank_2_img.png
  26. BIN
      app/src/main/res/mipmap-xhdpi/rank_3_img.png
  27. BIN
      app/src/main/res/mipmap-xxhdpi/rank_1_img.png
  28. BIN
      app/src/main/res/mipmap-xxhdpi/rank_2_img.png
  29. BIN
      app/src/main/res/mipmap-xxhdpi/rank_3_img.png
  30. 2 0
      app/src/main/res/values/colors.xml

+ 57 - 55
app/app.iml

@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="bandaimitestDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleBandaimitestDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileBandaimitestDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="bandaimiDebug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleBandaimiDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileBandaimiDebugSources" />
         <afterSyncTasks>
-          <task>generateBandaimitestDebugSources</task>
+          <task>generateBandaimiDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,59 +23,59 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/bandaimitest/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/bandaimitest/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/bandaimi/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/bandaimi/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/bandaimitest/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/bandaimitest/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/bandaimitest/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/bandaimitest/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/bandaimitest/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/bandaimitest/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/bandaimitest/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitestDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/bandaimitest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/bandaimitest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/bandaimitest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/bandaimitest/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimitest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimitest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/bandaimi/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/bandaimi/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/bandaimi/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/bandaimi/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/bandaimi/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/bandaimi/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/bandaimi/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimiDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/bandaimi/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/bandaimi/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/bandaimi/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/bandaimi/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/bandaimi/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/bandaimi/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/bandaimi/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimiDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/bandaimi/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testBandaimi/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestBandaimi/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -224,5 +224,7 @@
     <orderEntry type="module" module-name="datashare" exported="" />
     <orderEntry type="module" module-name="view" exported="" />
     <orderEntry type="library" exported="" name="android-android-27" level="project" />
+    <orderEntry type="module" module-name="datashare" exported="" />
+    <orderEntry type="module" module-name="view" exported="" />
   </component>
 </module>

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

@@ -160,8 +160,8 @@ public class ActGameDetails extends BaseCompatActivity {
         mFragmentGameDetail = new FgtGameDetail();
         AdpViewPagerDetail adpViewPagerDetail = new AdpViewPagerDetail(getSupportFragmentManager());
         adpViewPagerDetail.add(mFragmentGameDetail, getString(R.string.app_details_details));
-        adpViewPagerDetail.add(new FgtGift(), getString(R.string.app_details_user_gift));
-        adpViewPagerDetail.add(new FgContinuePlay(), getString(R.string.continue_play));
+//        adpViewPagerDetail.add(new FgtGift(), getString(R.string.app_details_user_gift));//小绵羊中注释掉用户礼包
+//        adpViewPagerDetail.add(new FgContinuePlay(), getString(R.string.continue_play));//小绵羊中注释掉借着玩
         mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
 

+ 245 - 254
app/src/main/java/com/kfzs/duanduan/adp/ClassificationAdapter.java

@@ -1,23 +1,16 @@
 package com.kfzs.duanduan.adp;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.BaseAdapter;
-import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 
@@ -25,7 +18,6 @@ import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.GameTypeOuterClass;
 import com.kfzs.duanduan.proto.GameTypeSpecialOuterClass;
-import com.kfzs.duanduan.G;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.kfzs.duanduan.view.diag.MyGridview;
 
@@ -41,7 +33,7 @@ import java.util.List;
 public class ClassificationAdapter extends BaseAdapter {  private ArrayList<String> mList;
     private LayoutInflater mInflater;
     private Context mContext;
-    List<GameTypeSpecialOuterClass.GameTypeSpecial> listGameTS;
+//    List<GameTypeSpecialOuterClass.GameTypeSpecial> listGameTS;
 
     public ClassificationAdapter(ArrayList list, Context context) {
         this.mList = list;
@@ -67,62 +59,61 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         Object o = getItem(position);
-        if(position == 0 ){
-            return createTopGridView();
-        }else {
-            GameTypeOuterClass.GameType gameType = ((GameTypeOuterClass.GameType) o);
-            convertView = mInflater.inflate(R.layout.classification_item, null);
-            ImageView iconIv = (ImageView) convertView.findViewById(R.id.icon_iv);
-            TextView one_tv = (TextView) convertView.findViewById(R.id.one_tv);
-            TextView two_tv = (TextView) convertView.findViewById(R.id.two_tv);
-            TextView three_tv = (TextView) convertView.findViewById(R.id.three_tv);
-            TextView four_tv = (TextView) convertView.findViewById(R.id.four_tv);
-            TextView five_tv = (TextView) convertView.findViewById(R.id.five_tv);
-            TextView six_tv = (TextView) convertView.findViewById(R.id.six_tv);
-            LinearLayout game_classified_layout = convertView.findViewById(R.id.game_classified_layout);
-            if(position == 1){
-                game_classified_layout.setVisibility(View.VISIBLE);
-            }else {
-                game_classified_layout.setVisibility(View.GONE);
-            }
-            if(gameType.getSecondTypesList() != null && gameType.getSecondTypesList().size() > 0){
-                for(int i=0;i<gameType.getSecondTypesList().size();i++){
-                    GameTypeOuterClass.GameType gameTypeSecond = gameType.getSecondTypesList().get(i);
-                    switch (i){
-                        case 0:
-                            setTextView(mContext,gameType,one_tv, i);
-                            one_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                        case 1:
-                            setTextView(mContext,gameType,two_tv, i);
-                            two_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                        case 2:
-                            setTextView(mContext,gameType,three_tv, i);
-                            three_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                        case 3:
-                            setTextView(mContext,gameType,four_tv, i);
-                            four_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                        case 4:
-                            setTextView(mContext,gameType,five_tv, i);
-                            five_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                        case 5:
-                            setTextView(mContext,gameType,six_tv, i);
-                            six_tv.setOnClickListener(new Onclick(gameTypeSecond));
-                            break;
-                    }
+//        if(position == 0 ){
+//            return createTopGridView();
+//        }
+        GameTypeOuterClass.GameType gameType = ((GameTypeOuterClass.GameType) o);
+        convertView = mInflater.inflate(R.layout.classification_item, null);
+        ImageView iconIv = (ImageView) convertView.findViewById(R.id.icon_iv);
+        TextView one_tv = (TextView) convertView.findViewById(R.id.one_tv);
+        TextView two_tv = (TextView) convertView.findViewById(R.id.two_tv);
+        TextView three_tv = (TextView) convertView.findViewById(R.id.three_tv);
+        TextView four_tv = (TextView) convertView.findViewById(R.id.four_tv);
+        TextView five_tv = (TextView) convertView.findViewById(R.id.five_tv);
+        TextView six_tv = (TextView) convertView.findViewById(R.id.six_tv);
+//        LinearLayout game_classified_layout = convertView.findViewById(R.id.game_classified_layout);
+//        if(position == 0){
+//            game_classified_layout.setVisibility(View.VISIBLE);
+//        }else {
+//            game_classified_layout.setVisibility(View.GONE);
+//        }
+        if(gameType.getSecondTypesList() != null && gameType.getSecondTypesList().size() > 0){
+            for(int i=0;i<gameType.getSecondTypesList().size();i++){
+                GameTypeOuterClass.GameType gameTypeSecond = gameType.getSecondTypesList().get(i);
+                switch (i){
+                    case 0:
+                        setTextView(mContext,gameType,one_tv, i);
+                        one_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
+                    case 1:
+                        setTextView(mContext,gameType,two_tv, i);
+                        two_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
+                    case 2:
+                        setTextView(mContext,gameType,three_tv, i);
+                        three_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
+                    case 3:
+                        setTextView(mContext,gameType,four_tv, i);
+                        four_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
+                    case 4:
+                        setTextView(mContext,gameType,five_tv, i);
+                        five_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
+                    case 5:
+                        setTextView(mContext,gameType,six_tv, i);
+                        six_tv.setOnClickListener(new Onclick(gameTypeSecond));
+                        break;
                 }
             }
-            iconIv.setOnClickListener(new Onclick(gameType));
-            Glide.with(mContext)
-                    .load(gameType.getIcon()+"")
-                    .error(android.R.drawable.stat_notify_error)
-                    .into(iconIv);
-            return convertView;
         }
+        iconIv.setOnClickListener(new Onclick(gameType));
+        Glide.with(mContext)
+                .load(gameType.getIcon()+"")
+                .error(android.R.drawable.stat_notify_error)
+                .into(iconIv);
+        return convertView;
     }
 
     private void setTextView(Context context, GameTypeOuterClass.GameType o, TextView v, int i){
@@ -147,183 +138,183 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
     }
 
 
-    public void toBindTopviewData(List<GameTypeSpecialOuterClass.GameTypeSpecial> listGameTS){
-        this.listGameTS = listGameTS;
-    }
-
-    /**
-     * 顶部 gridview
-     * @return
-     */
-    private View createTopGridView(){
-
-        View view = null;
-        GridviewHolder holder = null;
-        if( holder == null){
-            view = mInflater.inflate(R.layout.classification_gridview_item, null);
-            holder = new GridviewHolder(view);
-        }else{
-            holder = (GridviewHolder) view.getTag();
-        }
-
-        holder.adapter.toBindTopviewData(listGameTS);
-        holder.adapter.notifyDataSetChanged();
-        return view;
-    }
-
-    /**
-     * 创建图片容器
-     * @return
-     */
-    @SuppressLint("ResourceType")
-    public View createTopView() {
-        LinearLayout linearLayout = new LinearLayout(mContext);
-        if(listGameTS == null || listGameTS.size()<8){
-            return linearLayout;
-        }
-        linearLayout.setOrientation(LinearLayout.VERTICAL);
-        // 获取屏幕宽度
-        int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-        int cricleRadius = W / 2 ;
-        Log.e("-------------", cricleRadius+"");
-        // 根据每行个数设置布局大小
-        linearLayout.setPadding(5, 5, 5, 5);
-        linearLayout.setGravity(Gravity.CENTER);
-        // 设置图片大小
-        linearLayout.setLayoutParams(new AbsListView.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
-        /*--------------------------big img----------------------------------*/
-        LinearLayout bigLinearLayout = new LinearLayout(mContext);
-        bigLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
-        bigLinearLayout.setGravity(Gravity.CENTER);
-        // 设置图片大小
-        bigLinearLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
-        bigLinearLayout.setId(0);
-
-        ImageView bigCircleImageView = new ImageView(mContext);
-        bigCircleImageView.setLayoutParams(new LinearLayout.LayoutParams(cricleRadius, cricleRadius));
-//        Bitmap map = BitmapFactory.decodeResource(mContext.getResources(),R.drawable.classification_tengxun);
-//        bigCircleImageView.setImageBitmap(map);
-        Glide.with(mContext)
-                .load(listGameTS.get(0).getIcon())
-                .error(android.R.drawable.stat_notify_error)
-                .into(bigCircleImageView);
-        bigCircleImageView.setId(1);
-        bigCircleImageView.setPadding(0,3,0,3);
-
-        bigCircleImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startToActivity(listGameTS.get(0), mContext);
-            }
-        });
-        bigLinearLayout.addView(bigCircleImageView);
-
-        RelativeLayout bigLinearLayout2 = new RelativeLayout(mContext);
-        bigLinearLayout2.setPadding(5, 5, 5, 5);
-        bigLinearLayout2.setLayoutParams(new LinearLayout.LayoutParams(cricleRadius , cricleRadius));
-        bigLinearLayout2.setId(2);
-
-        ImageView ircleImageView1 = new ImageView(mContext);
-        RelativeLayout.LayoutParams imageView1Params = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
-        ircleImageView1.setLayoutParams(imageView1Params);
-        Glide.with(mContext)
-                .load(listGameTS.get(1).getIcon())
-                .error(android.R.drawable.stat_notify_error)
-                .into(ircleImageView1);
-        ircleImageView1.setId(21);
-        ircleImageView1.setPadding(0,0,2,0);
-        ircleImageView1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startToActivity(listGameTS.get(1), mContext);
-            }
-        });
-
-        ImageView ircleImageView2 = new ImageView(mContext);
-        RelativeLayout.LayoutParams imageView1Params2 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
-        imageView1Params2.addRule(RelativeLayout.RIGHT_OF, ircleImageView1.getId());
-        ircleImageView2.setLayoutParams(imageView1Params2);
-        Glide.with(mContext)
-                .load(listGameTS.get(2).getIcon())
-                .error(android.R.drawable.stat_notify_error)
-                .into(ircleImageView2);
-        ircleImageView2.setId(22);
-        ircleImageView2.setPadding(3,0,0,0);
-        ircleImageView2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startToActivity(listGameTS.get(2), mContext);
-            }
-        });
-
-        ImageView ircleImageView3 = new ImageView(mContext);
-        RelativeLayout.LayoutParams imageView1Params3 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
-        imageView1Params3.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-        ircleImageView3.setLayoutParams(imageView1Params3);
-
-        Glide.with(mContext)
-                .load(listGameTS.get(3).getIcon())
-                .error(android.R.drawable.stat_notify_error)
-                .into(ircleImageView3);
-        ircleImageView3.setId(23);
-        ircleImageView3.setPadding(0,5,0,0);
-        ircleImageView3.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startToActivity(listGameTS.get(3), mContext);
-            }
-        });
-
-        ImageView ircleImageView4 = new ImageView(mContext);
-        RelativeLayout.LayoutParams imageView1Params4 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
-        imageView1Params4.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-        imageView1Params4.addRule(RelativeLayout.RIGHT_OF, ircleImageView3.getId());
-        ircleImageView4.setLayoutParams(imageView1Params4);
-//        Bitmap map4 = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.classification_erciyuan);
-//        ircleImageView4.setImageBitmap(map4);
-        Glide.with(mContext)
-                .load(listGameTS.get(4).getIcon())
-                .error(android.R.drawable.stat_notify_error)
-                .into(ircleImageView4);
-        ircleImageView4.setId(24);
-        ircleImageView4.setPadding(5, 5, 0, 0);
-        ircleImageView4.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startToActivity(listGameTS.get(4), mContext);
-            }
-        });
-
-        bigLinearLayout2.addView(ircleImageView1);
-        bigLinearLayout2.addView(ircleImageView2);
-        bigLinearLayout2.addView(ircleImageView3);
-        bigLinearLayout2.addView(ircleImageView4);
-
-        bigLinearLayout.addView(bigLinearLayout2);
-
-        linearLayout.addView(bigLinearLayout);
-        /*------------------------------------------------------------*/
-
-        /*--------------------------bottom img----------------------------------*/
-
-        LinearLayout bottomLinearLayout = new LinearLayout(mContext);
-        bottomLinearLayout.setPadding(5, 5, 5, 5);
-        bottomLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
-        bottomLinearLayout.setGravity(Gravity.CENTER);
-        // 设置图片大小
-        bottomLinearLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
-        bottomLinearLayout.setId(3);
-
-        bottomLinearLayout.addView(createImageView(R.drawable.classification_chijizhuanq, cricleRadius/2-5, listGameTS.get(5)));
-        bottomLinearLayout.addView(createImageView(R.drawable.classification_wangyizhuanqu, cricleRadius/2-5, listGameTS.get(6)));
-        bottomLinearLayout.addView(createImageView(R.drawable.classification_xianxia, cricleRadius/2-5, listGameTS.get(7)));
-        bottomLinearLayout.addView(createImageView(R.drawable.classification_gengduoyouxo, cricleRadius/2-5, null));
-
-        linearLayout.addView(bottomLinearLayout);
-        /*--------------------------bottom img----------------------------------*/
-
-        return linearLayout;
-    }
+//    public void toBindTopviewData(List<GameTypeSpecialOuterClass.GameTypeSpecial> listGameTS){
+//        this.listGameTS = listGameTS;
+//    }
+//
+//    /**
+//     * 顶部 gridview
+//     * @return
+//     */
+//    private View createTopGridView(){
+//
+//        View view = null;
+//        GridviewHolder holder = null;
+//        if( holder == null){
+//            view = mInflater.inflate(R.layout.classification_gridview_item, null);
+//            holder = new GridviewHolder(view);
+//        }else{
+//            holder = (GridviewHolder) view.getTag();
+//        }
+//
+//        holder.adapter.toBindTopviewData(listGameTS);
+//        holder.adapter.notifyDataSetChanged();
+//        return view;
+//    }
+//
+//    /**
+//     * 创建图片容器
+//     * @return
+//     */
+//    @SuppressLint("ResourceType")
+//    public View createTopView() {
+//        LinearLayout linearLayout = new LinearLayout(mContext);
+//        if(listGameTS == null || listGameTS.size()<8){
+//            return linearLayout;
+//        }
+//        linearLayout.setOrientation(LinearLayout.VERTICAL);
+//        // 获取屏幕宽度
+//        int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
+//        int cricleRadius = W / 2 ;
+//        Log.e("-------------", cricleRadius+"");
+//        // 根据每行个数设置布局大小
+//        linearLayout.setPadding(5, 5, 5, 5);
+//        linearLayout.setGravity(Gravity.CENTER);
+//        // 设置图片大小
+//        linearLayout.setLayoutParams(new AbsListView.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
+//        /*--------------------------big img----------------------------------*/
+//        LinearLayout bigLinearLayout = new LinearLayout(mContext);
+//        bigLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
+//        bigLinearLayout.setGravity(Gravity.CENTER);
+//        // 设置图片大小
+//        bigLinearLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
+//        bigLinearLayout.setId(0);
+//
+//        ImageView bigCircleImageView = new ImageView(mContext);
+//        bigCircleImageView.setLayoutParams(new LinearLayout.LayoutParams(cricleRadius, cricleRadius));
+////        Bitmap map = BitmapFactory.decodeResource(mContext.getResources(),R.drawable.classification_tengxun);
+////        bigCircleImageView.setImageBitmap(map);
+//        Glide.with(mContext)
+//                .load(listGameTS.get(0).getIcon())
+//                .error(android.R.drawable.stat_notify_error)
+//                .into(bigCircleImageView);
+//        bigCircleImageView.setId(1);
+//        bigCircleImageView.setPadding(0,3,0,3);
+//
+//        bigCircleImageView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startToActivity(listGameTS.get(0), mContext);
+//            }
+//        });
+//        bigLinearLayout.addView(bigCircleImageView);
+//
+//        RelativeLayout bigLinearLayout2 = new RelativeLayout(mContext);
+//        bigLinearLayout2.setPadding(5, 5, 5, 5);
+//        bigLinearLayout2.setLayoutParams(new LinearLayout.LayoutParams(cricleRadius , cricleRadius));
+//        bigLinearLayout2.setId(2);
+//
+//        ImageView ircleImageView1 = new ImageView(mContext);
+//        RelativeLayout.LayoutParams imageView1Params = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
+//        ircleImageView1.setLayoutParams(imageView1Params);
+//        Glide.with(mContext)
+//                .load(listGameTS.get(1).getIcon())
+//                .error(android.R.drawable.stat_notify_error)
+//                .into(ircleImageView1);
+//        ircleImageView1.setId(21);
+//        ircleImageView1.setPadding(0,0,2,0);
+//        ircleImageView1.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startToActivity(listGameTS.get(1), mContext);
+//            }
+//        });
+//
+//        ImageView ircleImageView2 = new ImageView(mContext);
+//        RelativeLayout.LayoutParams imageView1Params2 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
+//        imageView1Params2.addRule(RelativeLayout.RIGHT_OF, ircleImageView1.getId());
+//        ircleImageView2.setLayoutParams(imageView1Params2);
+//        Glide.with(mContext)
+//                .load(listGameTS.get(2).getIcon())
+//                .error(android.R.drawable.stat_notify_error)
+//                .into(ircleImageView2);
+//        ircleImageView2.setId(22);
+//        ircleImageView2.setPadding(3,0,0,0);
+//        ircleImageView2.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startToActivity(listGameTS.get(2), mContext);
+//            }
+//        });
+//
+//        ImageView ircleImageView3 = new ImageView(mContext);
+//        RelativeLayout.LayoutParams imageView1Params3 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
+//        imageView1Params3.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+//        ircleImageView3.setLayoutParams(imageView1Params3);
+//
+//        Glide.with(mContext)
+//                .load(listGameTS.get(3).getIcon())
+//                .error(android.R.drawable.stat_notify_error)
+//                .into(ircleImageView3);
+//        ircleImageView3.setId(23);
+//        ircleImageView3.setPadding(0,5,0,0);
+//        ircleImageView3.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startToActivity(listGameTS.get(3), mContext);
+//            }
+//        });
+//
+//        ImageView ircleImageView4 = new ImageView(mContext);
+//        RelativeLayout.LayoutParams imageView1Params4 = new RelativeLayout.LayoutParams(cricleRadius/2-5,cricleRadius/2-5);
+//        imageView1Params4.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+//        imageView1Params4.addRule(RelativeLayout.RIGHT_OF, ircleImageView3.getId());
+//        ircleImageView4.setLayoutParams(imageView1Params4);
+////        Bitmap map4 = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.classification_erciyuan);
+////        ircleImageView4.setImageBitmap(map4);
+//        Glide.with(mContext)
+//                .load(listGameTS.get(4).getIcon())
+//                .error(android.R.drawable.stat_notify_error)
+//                .into(ircleImageView4);
+//        ircleImageView4.setId(24);
+//        ircleImageView4.setPadding(5, 5, 0, 0);
+//        ircleImageView4.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                startToActivity(listGameTS.get(4), mContext);
+//            }
+//        });
+//
+//        bigLinearLayout2.addView(ircleImageView1);
+//        bigLinearLayout2.addView(ircleImageView2);
+//        bigLinearLayout2.addView(ircleImageView3);
+//        bigLinearLayout2.addView(ircleImageView4);
+//
+//        bigLinearLayout.addView(bigLinearLayout2);
+//
+//        linearLayout.addView(bigLinearLayout);
+//        /*------------------------------------------------------------*/
+//
+//        /*--------------------------bottom img----------------------------------*/
+//
+//        LinearLayout bottomLinearLayout = new LinearLayout(mContext);
+//        bottomLinearLayout.setPadding(5, 5, 5, 5);
+//        bottomLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
+//        bottomLinearLayout.setGravity(Gravity.CENTER);
+//        // 设置图片大小
+//        bottomLinearLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT));
+//        bottomLinearLayout.setId(3);
+//
+//        bottomLinearLayout.addView(createImageView(R.drawable.classification_chijizhuanq, cricleRadius/2-5, listGameTS.get(5)));
+//        bottomLinearLayout.addView(createImageView(R.drawable.classification_wangyizhuanqu, cricleRadius/2-5, listGameTS.get(6)));
+//        bottomLinearLayout.addView(createImageView(R.drawable.classification_xianxia, cricleRadius/2-5, listGameTS.get(7)));
+//        bottomLinearLayout.addView(createImageView(R.drawable.classification_gengduoyouxo, cricleRadius/2-5, null));
+//
+//        linearLayout.addView(bottomLinearLayout);
+//        /*--------------------------bottom img----------------------------------*/
+//
+//        return linearLayout;
+//    }
 
     /**
      * 创建imageView
@@ -384,21 +375,21 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
         return new AbsListView.LayoutParams(w, h);
     }
 
-    /**
-     * gridview holder
-     */
-    class GridviewHolder{
-        MyGridview gridview;
-        ClassificationGridviewAdapter adapter;
-
-        public GridviewHolder(View view) {
-            this.gridview = view.findViewById(R.id.classification_gridview);
-            this.adapter = new ClassificationGridviewAdapter( listGameTS, mContext);
-            gridview.setAdapter(adapter);
-//            gridview.setSelector(new ColorDrawable(Color.TRANSPARENT));
-            view.setTag(this);
-        }
-    }
+//    /**
+//     * gridview holder
+//     */
+//    class GridviewHolder{
+//        MyGridview gridview;
+//        ClassificationGridviewAdapter adapter;
+//
+//        public GridviewHolder(View view) {
+//            this.gridview = view.findViewById(R.id.classification_gridview);
+//            this.adapter = new ClassificationGridviewAdapter( listGameTS, mContext);
+//            gridview.setAdapter(adapter);
+////            gridview.setSelector(new ColorDrawable(Color.TRANSPARENT));
+//            view.setTag(this);
+//        }
+//    }
 
     /**
      * 获取图片的颜色

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

@@ -62,7 +62,7 @@ public class ClassificationGridviewAdapter extends BaseAdapter {
             holder.imageView = view.findViewById(R.id.classification_gv_item_iv);
             // 获取屏幕宽度
             int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-            int cricleRadius = W / 3 ;
+            int cricleRadius = W / 4 ;
             int h = cricleRadius * 83 / 100;
             view.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, h));
             view.setPadding(0,15,0,20);

+ 12 - 20
app/src/main/java/com/kfzs/duanduan/fragment/FgtMainCategory.java

@@ -7,6 +7,8 @@ import android.widget.ListView;
 
 import com.android.volleyplus.Response;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.kfzs.duanduan.adp.ClassificationGridviewAdapter;
+import com.kfzs.duanduan.view.diag.MyGridview;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.adp.ClassificationAdapter;
 import com.kfzs.duanduan.bll.UrlBll;
@@ -43,9 +45,8 @@ public class FgtMainCategory extends BaseCompatFragment {
             switch (msg.what) {
                 case topViewAddData:
                     mListData.clear();
-                    mListData.add(null);
-                    mAdapter.toBindTopviewData(listGameTS);
-                    mAdapter.notifyDataSetChanged();
+                    adapter.toBindTopviewData(listGameTS);
+                    adapter.notifyDataSetChanged();
                     break;
                 case listViewAddData:
                     mListData.addAll(listGameT);
@@ -55,11 +56,17 @@ public class FgtMainCategory extends BaseCompatFragment {
         }
     };
 
+    MyGridview gridview;
+    ClassificationGridviewAdapter adapter;
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentViewChildMode(R.layout.fgt_main_category);
 
-        mListView = (ListView) mContentView.findViewById(R.id.list_fgt_main_category);
+        this.gridview = mContentView.findViewById(R.id.classification_gridview);
+        this.adapter = new ClassificationGridviewAdapter( listGameTS, mContext);
+        gridview.setAdapter(adapter);
+
+        mListView = mContentView.findViewById(R.id.list_fgt_main_category);
         mAdapter = new ClassificationAdapter(mListData, getActivity());
         mListView.setAdapter(mAdapter);
         loadClassificationListsTop();
@@ -80,7 +87,7 @@ public class FgtMainCategory extends BaseCompatFragment {
                         if (apiResponse.getGameTypeSpecialsList() != null && apiResponse.getGameTypeSpecialsList().size() > 0) {
                             listGameTS.clear();
                             listGameTS.addAll(apiResponse.getGameTypeSpecialsList());
-                            listGameTS.add(null);
+//                            listGameTS.add(null);
                             mHandler.sendEmptyMessage(topViewAddData);
                             loadClassificationLists();
                         }
@@ -122,19 +129,4 @@ public class FgtMainCategory extends BaseCompatFragment {
         KFZSNetwork.addRequest(bannerRequest);
     }
 
-
-    /**
-     * listview data
-     */
-    private void initData() {
-        mListData.clear();
-        mListData.add(null);
-        String datas = "abc";
-        for (int i = 0; i < 5; i++) {
-            mListData.add(datas + i);
-        }
-//        if(mListData != null && mListData.size() > 0){
-//            mAdapter.notifyDataSetChanged();
-//        }
-    }
 }

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

@@ -276,7 +276,7 @@ public class FgtMainGame extends BaseCompatFragment {
             mAdpMainPageRecy.add(RecyleObj.make(RecyleType.BANNER,
                     mAllBannerDatas.getShufflingList()), POS_BANNER);
         }
-        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.OWN_ZONE, null), POS_OWN);
+//        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.OWN_ZONE, null), POS_OWN);//VIP专区
 //        mAdpMainPageRecy.add(RecyleObj.make(RecyleType.THREE_PLAY, null), POS_THREE);
         mAdpMainPageRecy.add(RecyleObj.make(RecyleType.BACK_TOP, null), POS_BACK_TOP);
 

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -46,13 +46,13 @@ public class TabsHelper {
 
     private void initViews() {
         activity = KFZSApp.actMain;
-        other_container = (LinearLayout) activity.findViewById(R.id.other_container);
+        other_container = activity.findViewById(R.id.other_container);
         view_pager_container = activity.findViewById(R.id.view_pager_container);
         layout_main_activity_toolbar = activity.findViewById(R.id.layout_main_activity_toolbar);
         layout_bottom = activity.findViewById(R.id.layout_bottom);
         tab_container = activity.findViewById(R.id.tab_container);
         tab_line = activity.findViewById(R.id.tab_line);
-        mTxtToolBar = (TextView) activity.findViewById(R.id.txt_main_activity_toolbar);
+        mTxtToolBar = activity.findViewById(R.id.txt_main_activity_toolbar);
     }
 
     private List<Fragment> fragmentList = new ArrayList<>();

+ 28 - 0
app/src/main/java/com/kfzs/duanduan/view/diag/MyListview.java

@@ -0,0 +1,28 @@
+package com.kfzs.duanduan.view.diag;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.GridView;
+import android.widget.ListView;
+
+/**
+ * Created by Administrator on 2018/1/22.
+ */
+
+public class MyListview extends ListView {
+    public MyListview(Context context) {
+        super(context);
+    }
+
+    public MyListview(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, expandSpec);
+    }
+
+
+}

+ 0 - 0
app/src/main/java/com/kfzs/duanduan/view/diag/download


BIN
app/src/main/res/drawable-hdpi/index_download.png


BIN
app/src/main/res/drawable-hdpi/index_search.png


BIN
app/src/main/res/drawable-xhdpi/icon_download.png


BIN
app/src/main/res/drawable-xhdpi/index_download.png


BIN
app/src/main/res/drawable-xhdpi/index_search.png


BIN
app/src/main/res/drawable-xxhdpi/index_download.png


BIN
app/src/main/res/drawable-xxhdpi/index_search.png


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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <corners android:radius="15dp"/>
+
+  <stroke android:width="1dp"
+      android:color="@color/white"/>
+  <solid android:color="@color/white"/>
+</shape>

+ 2 - 1
app/src/main/res/drawable/sp_search_edt_white.xml

@@ -3,5 +3,6 @@
 
     android:shape="rectangle">
     <corners android:radius="16dp" />
-    <solid android:color="#e5e5e5" />
+    <solid android:color="#ffffff" />
+    <!--<solid android:color="#e5e5e5" />-->
 </shape>

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

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@drawable/shape_class_item_bg"
+    android:layout_margin="10dp"
     android:orientation="vertical">
 
     <com.kfzs.duanduan.view.diag.MyGridview
@@ -10,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        android:numColumns="3"
+        android:numColumns="4"
         android:listSelector="@android:color/background_dark"
         style="@style/gridview_padding"/>
 

+ 81 - 177
app/src/main/res/layout/classification_item.xml

@@ -1,210 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/white"
-    android:layout_marginRight="@dimen/content_padding_big"
-    android:layout_marginLeft="@dimen/content_padding_big">
+    android:layout_height="105dp"
+    android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_marginRight="@dimen/content_padding_big"
-        android:id="@+id/game_classified_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:layout_marginTop="@dimen/app_logo_icon"
-        android:layout_marginBottom="@dimen/content_padding_big"
-        android:visibility="gone">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/textSize1"
-            android:text="1"
-            android:maxWidth="@dimen/content_padding_default"
-            android:textColor="@color/theme_app_main"
-            android:background="@color/theme_app_main"
-            android:layout_marginRight="@dimen/content_padding_default"
-            android:layout_marginLeft="@dimen/content_padding_default"/>
+        android:layout_width="50dp"
+        android:layout_height="100dp"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/icon_iv"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:src="@drawable/classification_jiaosebanyan"
+            android:layout_marginBottom="5dp"/>
         <TextView
+            android:id="@+id/icon_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/game_classifiled"
-            android:textColor="@color/tv_black_3_2c"
-            android:textSize="@dimen/textSize2"
-            android:textStyle="bold"/>
+            android:text="角色扮演"
+            android:textSize="15dp"
+            android:visibility="gone"/>
+
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="105dp"
-        android:orientation="horizontal"
-        android:layout_marginRight="@dimen/content_padding_default"
-        android:layout_marginLeft="@dimen/content_padding_default"
-        android:background="@drawable/shape_square_corner">
-        <LinearLayout
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:orientation="vertical"
-            android:gravity="center">
-
-            <ImageView
-                android:id="@+id/icon_iv"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:src="@drawable/classification_jiaosebanyan"
-                android:layout_marginBottom="5dp"/>
-            <TextView
-                android:id="@+id/icon_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="角色扮演"
-                android:textSize="15dp"
-                android:visibility="gone"/>
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="1sp"
-            android:layout_height="70dp"
-            android:background="#F2F2F2"
-            android:layout_gravity="center_vertical"/>
+        android:layout_height="100dp"
+        android:layout_marginEnd="10dp"
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/one_tv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_gravity="center"
                 android:layout_weight="1"
-                android:orientation="horizontal">
+                android:gravity="center_vertical|end"
+                android:text=""
+                style="@style/classifiel_tv"
+                />
 
-                <TextView
-                    android:id="@+id/one_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text=""
-                    style="@style/classifiel_tv"
-                    />
+            <TextView
+                android:id="@+id/two_tv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_toRightOf="@+id/one_tv"
+                android:layout_weight="1"
+                android:gravity="center_vertical|end"
+                android:text=""
+                style="@style/classifiel_tv"/>
 
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="35dp"
-                    android:background="#F2F2F2"
-                    android:layout_gravity="center_vertical"/>
-                <TextView
-                    android:id="@+id/two_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_toRightOf="@+id/one_tv"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text=""
-                    style="@style/classifiel_tv"/>
+            <TextView
+                android:id="@+id/three_tv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@+id/two_tv"
+                android:layout_weight="1"
+                android:text=""
+                android:layout_gravity="center"
+                android:gravity="center_vertical|end"
+                style="@style/classifiel_tv"/>
 
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="35dp"
-                    android:background="#F2F2F2"
-                    android:layout_gravity="center_vertical"/>
-                <TextView
-                    android:id="@+id/three_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_toRightOf="@+id/two_tv"
-                    android:layout_weight="1"
-                    android:text=""
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    style="@style/classifiel_tv"/>
+        </LinearLayout>
 
-            </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="#F2F2F2"/>
-            <LinearLayout
+            <TextView
+                android:id="@+id/four_tv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_gravity="center"
                 android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/four_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text=""
-                    style="@style/classifiel_tv"/>
+                android:gravity="center_vertical|end"
+                android:text=""
+                style="@style/classifiel_tv"/>
 
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="35dp"
-                    android:background="#F2F2F2"
-                    android:layout_gravity="center_vertical"/>
-
-                <TextView
-                    android:id="@+id/five_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text=""
-                    style="@style/classifiel_tv"/>
+            <TextView
+                android:id="@+id/five_tv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center_vertical|end"
+                android:text=""
+                style="@style/classifiel_tv"/>
 
-                <View
-                    android:layout_width="1sp"
-                    android:layout_height="35dp"
-                    android:background="#F2F2F2"
-                    android:layout_gravity="center_vertical"/>
-                <TextView
-                    android:id="@+id/six_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text=""
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    style="@style/classifiel_tv"/>
+            <TextView
+                android:id="@+id/six_tv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text=""
+                android:layout_gravity="center"
+                android:gravity="center_vertical|end"
+                style="@style/classifiel_tv"/>
 
-            </LinearLayout>
-            android:background="@color/gray"/>
         </LinearLayout>
     </LinearLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1sp"
-            android:background="#F5F5F5"
-            android:layout_gravity="center_vertical"/>
-        <!--<View
-            android:layout_width="match_parent"
-            android:layout_height="3dp"
-            android:background="#F2F2F2"
-            android:layout_gravity="center_vertical"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1sp"
-            android:background="#F5F5F5"
-            android:layout_gravity="center_vertical"/>-->
-
-    </LinearLayout>
-
 </LinearLayout>

+ 37 - 8
app/src/main/res/layout/fgt_main_category.xml

@@ -1,12 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/list_fgt_main_category"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#EAEBED"/>
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="#F2F2F2"/>
-</RelativeLayout>
+        android:background="@color/bg_class_grey">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <com.kfzs.duanduan.view.diag.MyGridview
+                android:id="@+id/classification_gridview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:numColumns="4"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:verticalSpacing="10dp"
+                android:background="@drawable/shape_class_item_bg"
+                android:layout_margin="10dp"/>
+            <com.kfzs.duanduan.view.diag.MyListview
+                android:id="@+id/list_fgt_main_category"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/shape_class_item_bg"
+                android:layout_marginLeft="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginRight="10dp"
+                android:padding="20dp"
+                android:dividerHeight="1dp"
+                android:divider="#f7f7f7"/>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

+ 11 - 17
app/src/main/res/layout/listview_item_game_rank_top3.xml

@@ -61,8 +61,9 @@
 
             <ImageView
                 android:id="@+id/game_rank_top3_icon2"
-                android:layout_width="@dimen/app_icon_wh_height_big"
-                android:layout_height="@dimen/app_icon_wh_height_big"
+                android:layout_width="@dimen/app_icon_wh_height_normal"
+                android:layout_height="@dimen/app_icon_wh_height_normal"
+                android:layout_marginTop="3dp"
                 android:layout_below="@id/rank_2_img"
                 android:layout_centerHorizontal="true"
                 android:padding="0dip"
@@ -88,7 +89,7 @@
                 android:gravity="center_horizontal"
                 android:singleLine="true"
                 android:textColor="@color/black"
-                android:textSize="16sp" />
+                android:textSize="14sp" />
 
 
             <com.kfzs.duanduan.view.KFProgressButton
@@ -116,23 +117,15 @@
                 android:id="@+id/rank_1_img"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5.0dip"
+                android:layout_marginTop="10dp"
                 android:src="@mipmap/rank_1_img" />
 
-            <ImageView
-                android:id="@+id/game_rank_top3_bg1"
-                android:layout_width="@dimen/app_group_height_120"
-                android:layout_height="@dimen/app_group_height_120"
-                android:layout_below="@id/rank_1_img"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="40dp"
-                android:background="@mipmap/rank_1_bg"
-                android:padding="0dip" />
 
             <RelativeLayout
                 android:paddingBottom="5dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
                 android:layout_below="@id/rank_1_img">
 
                 <ImageView
@@ -162,7 +155,7 @@
                     android:gravity="center_horizontal"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
 
 
                 <com.kfzs.duanduan.view.KFProgressButton
@@ -200,8 +193,9 @@
 
             <ImageView
                 android:id="@+id/game_rank_top3_icon3"
-                android:layout_width="@dimen/app_icon_wh_height_big"
-                android:layout_height="@dimen/app_icon_wh_height_big"
+                android:layout_width="@dimen/app_icon_wh_height_normal"
+                android:layout_height="@dimen/app_icon_wh_height_normal"
+                android:layout_marginTop="3dp"
                 android:layout_below="@id/rank_3_img"
                 android:layout_centerHorizontal="true"
                 android:padding="0dip"
@@ -227,7 +221,7 @@
                 android:gravity="center_horizontal"
                 android:singleLine="true"
                 android:textColor="@color/black"
-                android:textSize="16sp" />
+                android:textSize="14sp" />
 
 
             <com.kfzs.duanduan.view.KFProgressButton

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/app_nav_toolbar_height"
-    android:background="@color/white"
+    android:background="@color/bg_class_grey"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:visibility="visible">

BIN
app/src/main/res/mipmap-xhdpi/rank_1_img.png


BIN
app/src/main/res/mipmap-xhdpi/rank_2_img.png


BIN
app/src/main/res/mipmap-xhdpi/rank_3_img.png


BIN
app/src/main/res/mipmap-xxhdpi/rank_1_img.png


BIN
app/src/main/res/mipmap-xxhdpi/rank_2_img.png


BIN
app/src/main/res/mipmap-xxhdpi/rank_3_img.png


+ 2 - 0
app/src/main/res/values/colors.xml

@@ -23,4 +23,6 @@
     <color name="et_bg">#dfdddd</color>
 
     <color name="bbb">#f7dc0f</color>
+
+    <color name="bg_class_grey">#f5f5f5</color>
 </resources>