Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/AndroidManifest.xml

@@ -235,6 +235,9 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
+            android:theme="@style/MyDialogActivityTheme"
+            />
 
         <service android:name=".service.TopService"
                  android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
@@ -56,9 +57,11 @@ import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -336,7 +339,12 @@ public class ActMain extends BaseCompatActivity{
                                         }
                                     });
                                 } else {
-
+//                                    if(SpUtils.getClick(ActMain.this)){
+//                                        SpUtils.saveClick(ActMain.this, false);
+//                                    }else{
+//                                        DialogAccountAbnormal.showDialog((Activity) ActMain.this,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" );
+//                                        return;
+//                                    }
                                     FileDownloader.start(downloadUrl);
                                     addNewDownloadTask(game.getGameName(),
                                             downloadUrl,

app/src/main/java/com/kfzs/duanduan/utils/GameStatusScanner.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
@@ -7,6 +8,7 @@ import android.widget.Toast;
 
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
@@ -24,6 +26,7 @@ import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.proto.UserPlayedGameOuterClass;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.analytics.MobclickAgent;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
@@ -141,6 +144,15 @@ public abstract class GameStatusScanner {
         mTarget.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+//                if(SpUtils.getClick(mContext)){
+//                    SpUtils.saveClick(mContext, false);
+//                }else{
+//                    DialogAccountAbnormal.showDialog((Activity) mContext,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" );
+//                    return;
+//                }
+//                if(!DialogAccountAbnormal.showDialog((Activity) mContext,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" )){
+//                    return;
+//                }
                 if (null == downloadTaskService) {
                     downloadTaskService = new DownloadTaskService(mContext);
                 }

app/src/main/java/com/kfzs/duanduan/utils/dlg/DownBtnUtils.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.utils.dlg;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 
@@ -8,6 +9,7 @@ import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.utils.GameStatusScanner;
 import com.kfzs.duanduan.proto.GameOuterClass;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 
 import java.util.Map;
 

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

@@ -1,6 +1,10 @@
 package com.sheep.gamegroup.util;
 
+import android.text.TextUtils;
+import android.widget.Toast;
+
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 /**
  * 一些公用的class
@@ -58,4 +62,36 @@ public class CommonUtil {
         }
         return result;
     }
+
+    /**
+     * 昵称限制
+     * @param str
+     * @param maxLen
+     * @return
+     */
+    public String handleText(String str, int maxLen) {
+        if (TextUtils.isEmpty(str)) {
+            return str;
+        }
+        int count = 0;
+        int endIndex=0;
+        for (int i = 0; i < str.length(); i++) {
+            char item = str.charAt(i);
+            if (item < 128) {
+                count = count + 1;
+            } else {
+                count = count + 2;
+            }
+            if(maxLen==count || (item>=128 && maxLen+1==count)){
+                endIndex=i;
+            }
+        }
+        if (count <= maxLen) {
+            return str;
+        } else {
+            G.showToast("昵称超过限制长度");
+            return str.substring(0, endIndex) + "...";
+        }
+
+    }
 }

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

@@ -22,6 +22,7 @@ import com.sheep.gamegroup.view.activity.ChangeWxOrTelAct;
 import com.sheep.gamegroup.view.activity.CommitWxAct;
 import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
+import com.sheep.gamegroup.view.activity.DialogToastAct;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
 import com.sheep.gamegroup.view.activity.PersionInfoAct;
@@ -344,6 +345,15 @@ public class Jump2View {
         Intent i = new Intent(context, ChangeTelAct.class);
         context.startActivity(i);
     }
+    /**
+     * 跳转到绑定手机页面
+     * @param context
+     * @param o
+     */
+    public void goNoticeAct(Context context, Object o){
+        Intent i = new Intent(context, DialogToastAct.class);
+        context.startActivity(i);
+    }
 
 
 

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

@@ -19,7 +19,7 @@ public class TimeUtil {
     public static String[] getCalendarShowTime(long paramLong)
     {
         String[] localObject;
-        String str = new SimpleDateFormat("yyyy:MMM:d", Locale.ENGLISH).format(new Date(paramLong));
+        String str = new SimpleDateFormat("yyyy:MM:dd", Locale.ENGLISH).format(new Date(paramLong));
         try
         {
             String[] arrayOfString = str.split(":");

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

@@ -209,6 +209,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 break;
             case R.id.phone_sure_tv://更换手机号
                 sec_code = phoneEtCode.getText().toString()+"";
+
+                if(!checkPhoneInput(mobile)){
+                    return;
+                }
                 if(!checkCodeInput(sec_code)){
                     return;
                 }

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

@@ -242,7 +242,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 //                    downLoadApk();
                     if(!isStartPause){
                         if(NetUtil.isMobile(activity)){
-                            DialogAccountAbnormal.showDialog(activity,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" ).show();
+//                            DialogAccountAbnormal.showDialog(activity,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" ).show();
+                            Jump2View.getInstance().goNoticeAct(activity, null);
+                            isStartPause = !isStartPause;
                             return;
                         }
                         startFiler();

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

@@ -0,0 +1,62 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
+import com.sheep.jiuyan.samllsheep.R;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by ljy on 2018/3/29.
+ */
+
+public class DialogToastAct extends Activity {
+
+    @BindView(R.id.title_tv)
+    TextView titleTv;
+    @BindView(R.id.content_tv)
+    TextView contentTv;
+    @BindView(R.id.chec_cb)
+    CheckBox checCb;
+    @BindView(R.id.dialog_action)
+    TextView dialogAction;
+    @BindView(R.id.dialog_sure)
+    TextView dialogSure;
+    @BindView(R.id.dialog_close)
+    ImageView dialogClose;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_notice_layout);
+        ButterKnife.bind(this);
+    }
+
+    @OnClick({R.id.dialog_action, R.id.dialog_sure, R.id.dialog_close})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.dialog_action:
+                finish();
+                break;
+            case R.id.dialog_sure:
+                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
+                finish();
+                break;
+            case R.id.dialog_close:
+                finish();
+                break;
+        }
+    }
+}

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

@@ -54,6 +54,8 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     RelativeLayout rl_head;
     @BindView(R.id.iv_head_right)
     CircleImageView ivHeadRight;
+    @BindView(R.id.layout_more1)
+    RelativeLayout layout_more1;
 
 
     @Override
@@ -156,10 +158,10 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     }
 
 
-    @OnClick({R.id.iv_head_right, R.id.tv_nike, R.id.rl_qr, R.id.rl_head})
+    @OnClick({R.id.iv_head_right, R.id.layout_more1, R.id.rl_qr, R.id.rl_head})
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_nike:
+            case R.id.layout_more1:
                 Intent i = new Intent(PersionInfoAct.this, ReNameActivity.class);
                 i.putExtra("name", mEntity.getNickname());
                 startActivity(i);

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

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -12,6 +15,7 @@ import com.sheep.gamegroup.di.modules.ReNameModule;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.presenter.ReNameContract;
 import com.sheep.gamegroup.presenter.ReNamePresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -61,7 +65,22 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @Override
     public void initListener() {
+        et.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                et.setText(CommonUtil.getInstance().handleText(et.getText().toString(), 12));
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -1,9 +1,11 @@
 package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.event.BigEvent;
@@ -13,6 +15,7 @@ import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.uuzuche.lib_zxing.view.ViewfinderView;
 
 import org.greenrobot.eventbus.EventBus;
@@ -54,7 +57,8 @@ public class DialogAccountAbnormal {
         }
         return mAlertDialog;
     }
-    public static AlertDialog showDialog(final Activity activity,String title, String content, String cancel, String sure) {
+    public static boolean showDialog(final Activity activity,String title, String content, String cancel, String sure) {
+        final boolean[] flag = {false};
             View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                     .setView(view)
@@ -70,6 +74,60 @@ public class DialogAccountAbnormal {
             ((TextView)ViewFindUtils.find(view, R.id.content_tv)).setText(content);
         }
         TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
+        dialog_sure.setText(sure+"");
+        dialog_sure.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = true;
+                        SpUtils.saveClick(activity, true);
+                    }
+                });
+        ImageView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = false;
+                        SpUtils.saveClick(activity, false);
+                    }
+                });
+        TextView dialog_action = ViewFindUtils.find(view, R.id.dialog_action);
+        dialog_action.setText(cancel+"");
+        dialog_action.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = false;
+                        SpUtils.saveClick(activity, false);
+
+//                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
+                    }
+                });
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag[0];
+    }
+
+    public static AlertDialog showDialogs(final Activity activity,String title, String content, String cancel, String sure) {
+            View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(view)
+                .create();
+        if(TextUtils.isEmpty(title)){
+            ViewFindUtils.find(view, R.id.title_tv).setVisibility(View.GONE);
+        }else{
+            ((TextView)ViewFindUtils.find(view, R.id.title_tv)).setText(title);
+        }
+        if(TextUtils.isEmpty(content)){
+            ViewFindUtils.find(view, R.id.content_tv).setVisibility(View.GONE);
+        }else{
+            ((TextView)ViewFindUtils.find(view, R.id.content_tv)).setText(content);
+        }
+        TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
         dialog_sure.setText(cancel+"");
         dialog_sure.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -77,8 +135,7 @@ public class DialogAccountAbnormal {
                         mAlertDialog.dismiss();
                     }
                 });
-        TextView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
-        dialog_close.setText(sure+"");
+        ImageView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
         dialog_close.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -72,6 +72,24 @@ public class SpUtils {
         return user.getString("withdral_price", "");
     }
 
+    /**
+     * 点击事件 记录
+     * @param context
+     * @param vaule
+     */
+    public static void saveClick(Context context, boolean vaule) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putBoolean("click", vaule);
+        editor.apply();
+    }
+
+
+    public static boolean getClick(Context context) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
+        return user.getBoolean("click", false);
+    }
+
 
 
 

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

@@ -6,7 +6,9 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:padding="@dimen/content_padding_small"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -14,8 +16,7 @@
                 android:orientation="vertical"
                 android:layout_margin="@dimen/content_padding_10"
                 android:padding="@dimen/content_padding_20"
-                android:gravity="center"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/title_tv"
@@ -46,11 +47,11 @@
                         android:layout_width="0dp"
                         android:layout_weight="5"
                         android:layout_height="40dp"
-                        android:background="@drawable/sp_bg_gradient_rectangle_green"
+                        android:textColor="@color/white"
+                        android:background="@drawable/sp_bg_gradient_rectangle_blue"
                         android:gravity="center"
                         android:text="了解如何解封"
-                        android:textColor="#010101"
-                        android:textSize="@dimen/text_size_12" />
+                        android:textSize="@dimen/text_size_15" />
                     <View
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -63,7 +64,7 @@
                         android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
                         android:gravity="center"
                         android:text="确定"
-                        android:textColor="#010101"
+                        android:textColor="@color/white"
                         android:textSize="@dimen/text_size_15" />
                 </LinearLayout>
 

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

@@ -6,7 +6,10 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:layout_gravity="center"
+        android:padding="@dimen/content_padding_small"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -14,8 +17,7 @@
             android:orientation="vertical"
             android:layout_margin="@dimen/content_padding_10"
             android:padding="@dimen/content_padding_20"
-            android:gravity="center"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+            android:gravity="center">
 
             <TextView
                 android:id="@+id/title_tv"
@@ -24,7 +26,8 @@
                 android:layout_height="wrap_content"
                 android:textColor="#000000"
                 android:textSize="@dimen/text_size_15"
-                android:text="挂机账号异常" />
+                android:text="挂机账号异常"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/content_tv"
@@ -32,14 +35,15 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/content_padding_15"
                 android:lineSpacingExtra="@dimen/content_padding_8"
-                android:text="你的微信号由于没有实名认证，频繁进入游戏，已被微信封禁。请登录该微信号，完成自助解封后点击“已解封，继续赚钱”，小绵羊会继续帮你干活赚钱（已实名认证的不会再被微信封禁）。"
+                android:text="当前网络处于非WIFI状态，确定下载吗？"
                 android:textColor="#404040"
                 android:textSize="@dimen/text_size_12" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:visibility="gone">
                 <CheckBox
                     android:id="@+id/chec_cb"
                     android:layout_width="wrap_content"
@@ -62,11 +66,11 @@
                     android:layout_width="0dp"
                     android:layout_weight="5"
                     android:layout_height="40dp"
-                    android:background="@drawable/sp_bg_gradient_rectangle_green"
                     android:gravity="center"
                     android:text="取消"
-                    android:textColor="#010101"
-                    android:textSize="@dimen/text_size_12" />
+                    android:textColor="@color/white"
+                    android:background="@drawable/sp_bg_gradient_rectangle_blue"
+                    android:textSize="@dimen/text_size_15" />
                 <View
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -79,7 +83,7 @@
                     android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
                     android:gravity="center"
                     android:text="确定"
-                    android:textColor="#010101"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/text_size_15" />
             </LinearLayout>
 

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

@@ -31,7 +31,7 @@
             android:id="@+id/date_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2018/2/14 14:41"
+            android:text="2018/02/14 14:41"
             android:layout_below="@+id/name_tv"
             android:textSize="@dimen/text_size_3"
             android:textColor="@color/txt_black_818181"

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

@@ -21,7 +21,7 @@
             android:id="@+id/date_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2018/2/14 14:41"
+            android:text="2018/02/14 14:41"
             android:layout_below="@+id/name_tv"
             android:textSize="@dimen/text_size_3"
             android:textColor="@color/txt_black_818181"

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

@@ -65,7 +65,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
-
+            android:id="@+id/layout_more1"
             android:layout_margin="10dp"
             >
 

app/src/main/res/values/gamegroup_styles.xml

@@ -78,7 +78,7 @@
         <item name="android:layout_margin">@dimen/content_padding</item>
         <item name="android:background">@drawable/sp_bg_gradient_rectangle_blue</item>
     </style>
-    <style name="MyDialogActivityTheme">
+    <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->
         <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
         <item name="android:windowIsTranslucent">false</item><!--半透明-->