统一使用同一风格对话框；新手任务逻辑修改

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

@@ -28,7 +28,7 @@ public class ActGategoryRank extends BaseCompatActivity {
         mIntGameTypeId=getIntent().getIntExtra(INTENT_TYPE_ID,0);
         TitleBarUtils.getInstance().setTitle(this, "分类");
         TitleBarUtils.getInstance().setTitleFinish(this);
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();;
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Bundle bundle = new Bundle();
         bundle.putInt(INTENT_TYPE_ID, mIntGameTypeId);
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");

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

@@ -61,12 +61,11 @@ public class ActMain extends BaseActivity {
     @BindView(R.id.other_container)
     LinearLayout other_container;
 
-    public final static String INTEN_GAME_ID = "INTEN_GAME_ID";
+    public final static String INTENT_GAME_ID = "INTEN_GAME_ID";
+    public final static String INTENT_IS_FROM_LOGIN = "INTENT_IS_FROM_LOGIN";
 
-    private DownloadTaskService mDownloadTaskService;
 
     private ImageView mImgDot;//下载按钮的小红点
-    private AppHomepageAdvertisementDialog gameDialog;//预约窗口
 
 
     private final static int INTENT_GET_PERMISSION = 1;
@@ -89,7 +88,6 @@ public class ActMain extends BaseActivity {
 
         mImgDot = findViewById(R.id.img_download_manager_dot);
         tabsHelper.init();
-        mDownloadTaskService = new DownloadTaskService(this);
     }
 
     @Override
@@ -164,15 +162,6 @@ public class ActMain extends BaseActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-//
-//    /**
-//     * 传递事件
-//     */
-//    @Override
-//    protected void onResume() {
-//        super.onResume();
-//    }
-
 
     /**
      * 传递事件
@@ -206,13 +195,10 @@ public class ActMain extends BaseActivity {
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
-        if (intent.hasExtra(INTEN_GAME_ID)) {
-            tabsHelper.goToPostion(intent.getIntExtra(INTEN_GAME_ID, 0));
+        if (intent.hasExtra(INTENT_GAME_ID)) {
+            tabsHelper.goToPostion(intent.getIntExtra(INTENT_GAME_ID, 0));
         } else {
             recreate();
-            if (gameDialog != null) {
-                gameDialog.dismiss();
-            }
         }
     }
 
@@ -224,174 +210,5 @@ public class ActMain extends BaseActivity {
         tabsHelper.onBackPressed();
     }
 
-    /**
-     * 获取首页弹窗Dialog广告
-     */
-    public void getAdvertisementDialogData() {
-        Log.d(TAG, "getAdvertisementDialogData: " + UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT);
-        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT, null, new ResponseNetworkTask() {
-
-            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
-                showAdvertisementDialog(apiResponse);
-            }
-
-            @Override
-            public void onFail(int code, String msg) {
-                Log.d("FLY", "code: " + code + "\nmsg: " + msg);
-            }
-        }, null);
-        KFZSNetwork.addRequest(bannerRequest);
-    }
-
-    private void showAdvertisementDialog(ApiResponseOuterClass.ApiResponse apiResponse) {
-        if (apiResponse == null || apiResponse.getRecommendedGamesList().isEmpty()) {
-            Log.d(TAG, "The showAdvertisementDialog response is null ");
-            return;
-        }
-
-        final RecommendedGameOuterClass.RecommendedGame recommendeGame = apiResponse.getRecommendedGamesList().get(0);
-        final String splashImageUrL = recommendeGame.getImageUrl();
-        Log.d(TAG, "splashImageUrL: " + splashImageUrL);
-        final String splashImageUr1 = recommendeGame.getTitle();
-        Log.d(TAG, "splashImageUrL: " + splashImageUr1);
-        final GameOuterClass.Game game = recommendeGame.getGame();
-        Log.d(TAG, "game: " + game.toString());
-        if (null != game || splashImageUrL != null || (!"".equals(splashImageUrL))) {
-            if (gameDialog != null) {
-                gameDialog.dismiss();
-            }
-            gameDialog = new AppHomepageAdvertisementDialog(ActMain.this);
-            gameDialog.setShutImg(BitmapFactory.decodeResource(getResources(), R.drawable.btn_dialog_close));
-            gameDialog.setBackground(splashImageUrL);
-            if (getBtntext(recommendeGame).equals(getString(R.string.book_now))) {
-                gameDialog.setCanceledOnTouchOutside(true);
-                gameDialog.setCanceledOnTouchOutside(true);
-                gameDialog.setCancelable(true);
-                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame), new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
-                    @Override
-                    public void onDownloadClick() {
-                        SkipUtils.getInstance().goGameDetails(ActMain.this,
-                                recommendeGame.getGame().getId());
-                    }
-                });
-                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
-                    @Override
-                    public void onClick() {
-                        SkipUtils.getInstance().goGameDetails(ActMain.this, recommendeGame.getGame().getId());
-                    }
-                });
-
-
-            } else {
-                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame),
-                        new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
-                            @Override
-                            public void onDownloadClick() {
-                                final String downloadUrl = game.getDownloadUrl();
-                                if (!TextUtils.isEmpty(downloadUrl) && !downloadUrl.endsWith(".apk")) {
-                                    String url = UrlBll.GameApi.DOWNLOAD_REDIRECT + "game_id=" + game.getId() + "&channel=" + DataSave.getInstance().getChannelName();
-                                    OkHttpUtils.get().url(url).build().execute(new StringCallback() {
-                                        @Override
-                                        public void onError(Call call, Exception e, int id) {
-                                        }
-
-                                        @Override
-                                        public void onResponse(String response, int id) {
-                                            if (!TextUtils.isEmpty(response)) {
-                                                try {
-                                                    JSONObject object = new JSONObject(response);
-                                                    String realUrl = object.optString("DownloadUrl");
-                                                    if (TextUtils.isEmpty(realUrl))
-                                                        Toast.makeText(ActMain.this, "获取" + DataSave.getInstance().getChannelName() + "渠道下载地址失败", Toast.LENGTH_SHORT).show();
-                                                    else {
-                                                        KFZSApp.getInstance().mRealDownloadUrl.put(realUrl, downloadUrl);
-                                                        DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(), realUrl, game.getPackageName(),
-                                                                Integer.parseInt(game.getVersionCode()), game.getIconImage(), game.getSize(), game.getId(), STATUS_ING);
-                                                        mDownloadTaskService.start(downloadInfo);
-                                                        EventBus.getDefault().post(BigEvent.get()
-                                                                .setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                                    }
-                                                } catch (JSONException e) {
-                                                    e.printStackTrace();
-                                                }
-                                            }
-
-                                        }
-                                    });
-                                } else {
-//                                    if(SpUtils.getClick(ActMain.this)){
-//                                        SpUtils.saveClick(ActMain.this, false);
-//                                    }else{
-//                                        DialogAccountAbnormal.showDialog((Activity) ActMain.this,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" );
-//                                        return;
-//                                    }
-                                    DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(),
-                                            downloadUrl,
-                                            game.getPackageName(),
-                                            Integer.parseInt(game.getVersionCode()),
-                                            game.getIconImage(),
-                                            game.getSize(),
-                                            game.getId(),
-                                            STATUS_ING);
-
-                                    mDownloadTaskService.start(downloadInfo);
-                                    EventBus.getDefault().post(BigEvent.get()
-                                            .setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                }
-                            }
-                        });
-
-                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
-                    @Override
-                    public void onClick() {
-                        Intent intent = new Intent(ActMain.this, ActGameDetails.class);
-                        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, recommendeGame.getGameId() + "");
-                        ActMain.this.startActivity(intent);
-                    }
-                });
-            }
-
-
-            gameDialog.show();
-        } else {
-            Log.d(TAG, "showAdvertisementDialog: game or splashImageUrL is null");
-        }
-    }
-
-    private DownLoadInfo addNewDownloadTask(String gameName, String downloadUrl, String packageName,
-                                    int versionCode, String iconUrl, String size, Integer gameId, int state) {
-
-        final DownLoadInfo task = new DownLoadInfo();
-        task.setMIconUrl(iconUrl);
-        task.setMGameName(gameName);
-        task.setMDownloadUrl(downloadUrl);
-        task.setMPackageName(packageName);
-        task.setMVersionCode(versionCode);
-        task.setMTotalSize(Double.valueOf(size));
-        task.setMGameID(gameId);
-        task.setMStatus(state);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                mDownloadTaskService.addDownloadTask(task);
-            }
-        }).start();
-        return task;
-    }
-
-
-    /**
-     * 返回首页启动广告弹窗的按钮文本
-     *
-     * @param game
-     * @return
-     */
-    private String getBtntext(RecommendedGameOuterClass.RecommendedGame game) {
-        String backStr = "立即下载";
-        if (TextUtils.isEmpty(game.getApkUrl())) {
-            backStr = getString(R.string.book_now);
-        }
-        return backStr;
-    }
 
 }

app/src/main/java/com/sheep/gamegroup/IBase/IBaseView.java

@@ -6,7 +6,7 @@ package com.sheep.gamegroup.IBase;
 
 public interface IBaseView {
 
-    void  NetSuccess(int code, String msg);
+    void  NetSuccess(int code, String msg, String invitation_code);
     void  NetError(int code, String errorMsg);
 
 }

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.text.TextUtils;
+
 import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
 
@@ -253,4 +255,8 @@ public class UserEntity implements Serializable {
     public void setIs_agent(int is_agent) {
         this.is_agent = is_agent;
     }
+
+    public boolean isNewRegistUser() {//新注册用户
+        return TextUtils.equals(create_time, last_login_time);
+    }
 }

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.JSONObject;
 
 import com.sheep.gamegroup.model.api.ApiService;
@@ -55,19 +57,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-
-                            if(baseMessage!=null){
-                                LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
-                                SpUtils.login(SheepApp.mContext, loginEty.getToken());
-                                try {
-                                    MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-                                } catch (DbException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-
-                            view.NetSuccess(1,"登录成功");
-
+                            loginSuccess(view, baseMessage);
                         }
                     });
 
@@ -84,16 +74,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-                            if(baseMessage!=null){
-                                LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
-                                SpUtils.login(SheepApp.mContext, loginEty.getToken());
-                                try {
-                                    MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-                                } catch (DbException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                            view.NetSuccess(1,"登录成功");
+                            loginSuccess(view, baseMessage);
 
                         }
                     });
@@ -102,4 +83,17 @@ public class LoginPresenter implements LoginContract.Presenter {
 
 
     }
+    private void loginSuccess(LoginContract.View view, BaseMessage baseMessage){
+        LoginEntity loginEty = null;
+        if(baseMessage!=null){
+            loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
+            SpUtils.login(SheepApp.mContext, loginEty.getToken());
+            try {
+                MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
+            } catch (DbException e) {
+                e.printStackTrace();
+            }
+        }
+        view.NetSuccess(1,"登录成功", loginEty != null && loginEty.getUser()!= null && loginEty.getUser().isNewRegistUser() && !TextUtils.isEmpty(loginEty.getUser().getInvitation_code()) ? loginEty.getUser().getInvitation_code(): null);
+    }
 }

app/src/main/java/com/sheep/gamegroup/presenter/ReNamePresenter.java

@@ -47,7 +47,7 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if(baseMessage!=null){
-                            view.NetSuccess(1,"修改昵称成功");
+                            view.NetSuccess(1,"修改昵称成功", null);
                         }else{
                             view.NetError(-1,"数据解析出错");
                         }

app/src/main/java/com/sheep/gamegroup/presenter/RealNameAutherPresenter.java

@@ -49,7 +49,7 @@ public class RealNameAutherPresenter implements  RealNameAutherContract.Presente
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        view.NetSuccess(0,baseMessage.getMsg() +"");
+                        view.NetSuccess(0,baseMessage.getMsg() +"", null);
 
                     }
                 });

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

@@ -183,7 +183,13 @@ public class Jump2View {
     public void goHomePageView(Context context, Object o){
         Intent intent = new Intent(context, ActMain.class);
         if(o instanceof Integer){
-            intent.putExtra(ActMain.INTEN_GAME_ID, (Integer) o);
+            intent.putExtra(ActMain.INTENT_GAME_ID, (Integer) o);
+        } else if(o instanceof String){
+            //从登录界面过来//新注册用户才添加到数据库,并设置可以显示
+            NewbieTaskRecord newbie_task_record = new NewbieTaskRecord();
+            newbie_task_record.setUser_id((String)o);
+            newbie_task_record.setDontShowNewbieTaskDialog(false);
+            MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
         }
         context.startActivity(intent);
     }
@@ -884,7 +890,7 @@ public class Jump2View {
     }
 
     public void tryShowNewbieTask(final Activity activity, final UserEntity userEntity, final View newbie_task) {
-        if (userEntity.getIs_new() == 2) {//1新用户 2老用户
+        if (userEntity.getIs_new() == 2){ //1新用户 2老用户
             newbie_task.setVisibility(View.GONE);
         } else {
             NewbieTaskRecord newbie_task_record = null;
@@ -893,15 +899,10 @@ public class Jump2View {
             } catch (DbException e) {
                 e.printStackTrace();
             }
-            if (newbie_task_record == null) {
-                newbie_task_record = new NewbieTaskRecord();
-                newbie_task_record.setUser_id(userEntity.getInvitation_code());
-                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
-            }
-            boolean dontShowNewbieTaskDialog = newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
+            boolean dontShowNewbieTaskDialog = newbie_task_record == null || newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
             if (
 //                !BuildConfig.DEBUG &&
-                    dontShowNewbieTaskDialog) {
+                    !userEntity.isNewRegistUser() || dontShowNewbieTaskDialog) {
                 newbie_task.setVisibility(View.VISIBLE);
                 return;
             }

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

@@ -1,19 +1,21 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.provider.MediaStore;
+import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
@@ -88,12 +90,16 @@ public class ViewUtil {
      * @param link
      */
     public static void shareLink(final Activity activity, final String link) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        View view = View.inflate(activity, R.layout.x_recommend_dialog, null);
-        builder.setView(view);
+        View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
+        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(dialog_parent)
+                .create();
+        TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
+        View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
+        LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
+        View view = LayoutInflater.from(activity).inflate(R.layout.x_recommend_dialog, dialog_center_ll, true);
+        dialog_title.setText("推荐给好友");
 
-        final AlertDialog dialog = builder.create();
-        ImageView iv = view.findViewById(R.id.iv_close);
         TextView withdrawal = view.findViewById(R.id.withdrawal);
         TextView tv_link = view.findViewById(R.id.tv_link);
         TextView save_pic = view.findViewById(R.id.save_pic);
@@ -105,15 +111,7 @@ public class ViewUtil {
                 .load(AppUtil.getQRLink(link, 800))
                 .apply(new RequestOptions().override(800, 800))
                 .into(iv_qr);
-        dialog.show();
-        Window window = dialog.getWindow();
-        if(window != null) {
-            android.view.WindowManager.LayoutParams p = window.getAttributes();
-            p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
-            dialog.getWindow().setAttributes(p);     //设置生效
-        }
-        iv.setOnClickListener(new View.OnClickListener() {
+        dialog_close.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dialog.dismiss();
@@ -144,6 +142,7 @@ public class ViewUtil {
                 G.showToast("已保存");
             }
         });
+        dialog.show();
 
     }
 
@@ -207,107 +206,45 @@ public class ViewUtil {
     }
 
 
-    public static void showSignPay(final Activity activity) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        View view = View.inflate(activity, R.layout.x_sign_type_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        ImageView iv = view.findViewById(R.id.iv_close);
-        TextView dialog_sure = view.findViewById(R.id.dialog_sure);
-        dialog_sure.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //跳转到系统闹钟
-                SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7,0);
-                dialog.dismiss();
-            }
-        });
-        dialog.show();
-        Window window = dialog.getWindow();
-        if(window != null) {
-            android.view.WindowManager.LayoutParams p = window.getAttributes();
-            p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
-            dialog.getWindow().setAttributes(p);     //设置生效
-        }
-        iv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
-
-
-    }
-
-    //打卡 -》未报名提示对话框
-    public static void showSignAlert(final Activity activity) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        View view = View.inflate(activity, R.layout.x_sign_alert_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        ImageView iv = view.findViewById(R.id.iv_close);
-        TextView dialog_sure = view.findViewById(R.id.dialog_sure);
-        dialog_sure.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
-        dialog.show();
-        Window window = dialog.getWindow();
-        if(window != null) {
-            android.view.WindowManager.LayoutParams p = window.getAttributes();
-            p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
-            dialog.getWindow().setAttributes(p);     //设置生效
-        }
-        iv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
+    public static void showMsgDialog(final Activity activity, String msg) {
+        showMsgDialog(activity, msg, null, null, null);
     }
-
-    //打卡->超出时间提示对话框
-    public static void showSignTimeAlert(final Activity activity, String title) {
-        showSignTimeAlert(activity, title, null, null);
+    public static void showMsgDialog(final Activity activity, String msg, String title, String sureText) {
+        showMsgDialog(activity, msg, title, sureText, null);
     }
-    //打卡->超出时间提示对话框
-    public static void showSignTimeAlert(final Activity activity, String title, String sureText, final View.OnClickListener onClickListener) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        View view = View.inflate(activity, R.layout.x_sign_alerttime_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        ImageView iv = view.findViewById(R.id.iv_close);
-        TextView sign_tv_alert_title = view.findViewById(R.id.sign_tv_alert_title);
+    public static void showMsgDialog(final Activity activity, String msg, String title, String sureText, final View.OnClickListener onClickListener) {
+        View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
+        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(dialog_parent)
+                .create();
+        TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
+        View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
+        LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
+        View view = LayoutInflater.from(activity).inflate(R.layout.x_msg_dialog, dialog_center_ll, true);
+        if(!TextUtils.isEmpty(title))
+            dialog_title.setText(title);
+
+        TextView dialog_msg = view.findViewById(R.id.dialog_msg);
         TextView dialog_sure = view.findViewById(R.id.dialog_sure);
-        sign_tv_alert_title.setText(title);
+        dialog_msg.setText(msg);
         if(!TextUtils.isEmpty(sureText))
             dialog_sure.setText(sureText);
         dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if(onClickListener != null)
+                if(onClickListener != null){
                     onClickListener.onClick(v);
+                }
                 dialog.dismiss();
             }
         });
-        dialog.show();
-        Window window = dialog.getWindow();
-        if(window != null) {
-            android.view.WindowManager.LayoutParams p = window.getAttributes();
-            p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
-            dialog.getWindow().setAttributes(p);     //设置生效
-        }
-        iv.setOnClickListener(new View.OnClickListener() {
+        dialog_close.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dialog.dismiss();
             }
         });
+        dialog.show();
     }
 
     public static final int REQUEST_CODE_TASK_LIST = 110;

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

@@ -190,7 +190,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     }
 
     @Override
-    public void NetSuccess(int code, String msg) {
+    public void NetSuccess(int code, String msg, String s) {
         showToast(msg);
     }
 

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

@@ -185,7 +185,7 @@ public class ActMainGame extends BaseActivity {
         Log.d(TAG, "splashImageUrL: " + splashImageUr1);
         final GameOuterClass.Game game = recommendeGame.getGame();
         Log.d(TAG, "game: " + game.toString());
-        if (null != game || splashImageUrL != null || (!"".equals(splashImageUrL))) {
+        if (!TextUtils.isEmpty(splashImageUrL)) {
             if (gameDialog != null) {
                 gameDialog.dismiss();
             }

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

@@ -172,7 +172,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     }
 
     @Override
-    public void NetSuccess(int code, String msg) {
+    public void NetSuccess(int code, String msg, String s) {
 
     }
 

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

@@ -170,10 +170,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
 
     @Override
-    public void NetSuccess(int code, String msg) {
+    public void NetSuccess(int code, String msg, String invitation_code) {
         showToast(msg);
         hideProgress();
-        Jump2View.getInstance().goHomePageView(this, null);
+        Jump2View.getInstance().goHomePageView(this, invitation_code);
         finish();
 
     }

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

@@ -238,19 +238,26 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         BaseMessage baseMessage = (BaseMessage) o;
 //        JSONObject a = JSON.parseObject(o.toString());
         Log.e("------data", baseMessage.getData() + "");
-        LoginEntity loginEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
-        SpUtils.login(activity, loginEty.getToken());
+        LoginEntity loginEty = null;
         try {
-            MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-            showToast("登录成功");
-//            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
+            loginEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if(loginEty != null) {
+            SpUtils.login(activity, loginEty.getToken());
+            try {
+                MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
+                UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
+                Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
+                showToast("登录成功");
+//            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
 
-        Jump2View.getInstance().goHomePageView(activity, null);
+        Jump2View.getInstance().goHomePageView(this, loginEty != null && loginEty.getUser()!= null && loginEty.getUser().isNewRegistUser() && !TextUtils.isEmpty(loginEty.getUser().getInvitation_code()) ? loginEty.getUser().getInvitation_code(): null);
         ActivityManager.getInstance().endActivity(LoginAct.class);
         finish();
         Log.e("---login_-", o.toString());
@@ -311,73 +318,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
 
     private void goMain() {
-        // TODO: 2018/3/22  测试界面，过后删除s
         SpUtils.login(getApplicationContext(), "13626@395a75211751465f54789a7f459089bd");
-//        startActivity(new Intent(this, ActMain.class));
         Jump2View.getInstance().goHomePageView(this, null);
         ActivityManager.getInstance().endActivity(LoginAct.class);
         finish();
     }
 
-
-    private void testData(){
-        try{
-            String data = "{\n" +
-                    "  \"data\": {\n" +
-                    "    \"token\": \"12@38948cb4b6e74079615b154a80e3054b\",\n" +
-                    "    \"user\": {\n" +
-                    "      \"id\": 12,\n" +
-                    "      \"mobile\": \"17628083502\",\n" +
-                    "      \"nickname\": \"17628083502\",\n" +
-                    "      \"balance\": 0,\n" +
-                    "      \"invitation_code\": \"076031871\",\n" +
-                    "      \"parent_code\": \"\",\n" +
-                    "      \"total_asset\": 0,\n" +
-                    "      \"last_login_time\": 1521280845,\n" +
-                    "      \"create_time\": 1521279330,\n" +
-                    "      \"update_time\": 1521279330,\n" +
-                    "      \"avatar\": \"\",\n" +
-                    "      \"access_token\": \"VOC1Qkg_R_KdbylyvvWwQA\",\n" +
-                    "      \"refresh_token\": \"ZPgcoYhPSYWaZ5m-ySVoKw\",\n" +
-                    "      \"open_id\": \"3135079\",\n" +
-                    "      \"real_name\": \"\",\n" +
-                    "      \"id_number\": \"\",\n" +
-                    "      \"bank_card\": \"\",\n" +
-                    "      \"total_withdraw\": 0,\n" +
-                    "      \"wx_openid\": \"\"\n" +
-                    "    }\n" +
-                    "  }\n" +
-                    "}";
-            String showStr = "登录失败";
-            Log.e("---login_-", data);
-            JSONObject a = JSON.parseObject(data);
-            Log.e("------data",a.get("data")+"");
-            LoginEntity loginEty = JSON.parseObject(a.get("data").toString(), LoginEntity.class);
-            SpUtils.login(activity, loginEty.getToken());
-            try {
-                MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
-                UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-                Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
-                showToast(userEntity.getNickname()+"|"+userEntity.getMobile());
-            } catch (DbException e) {
-                e.printStackTrace();
-            }
-            showStr = "登录成功";
-//            String s1 = "523cbac3be1748ba65be01af9ca4412da011cc0196baf9fa54ce8d1f8b12b986";
-//            String s2 = "2b08e160271fd9eeb8de2a7372782478425fe733e79b086fb4cb9353b793eaa6";
-//
-//            String e1 = "123123";
-//            String d1 = "xxxx";
-////        String hexStr = HexUtils.bytes2HexStr(Kfzssafe.XByteEncode(e1.getBytes()));
-////        Log.e("j加密密1--", hexStr);
-//            Log.e("解密2--", XXTEA.bytes2HexStr(XXTEA.Encrypt(e1, XXTEA.KEY).getBytes("utf-8")));
-//            Log.e("解密3--", XXTEA.Decrypt(s1, XXTEA.KEY));
-//            Log.e("解密4--", XXTEA.Decrypt(s2, XXTEA.KEY));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -92,7 +92,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
 
     @Override
-    public void NetSuccess(int code, String msg) {
+    public void NetSuccess(int code, String msg, String string) {
         showToast(msg);
         UserNameChange  name=new UserNameChange();
         name.setNikeName(et.getText().toString());

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

@@ -121,7 +121,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     @Override
-    public void NetSuccess(int code, String msg) {
+    public void NetSuccess(int code, String msg, String s) {
           hideProgress();
           showToast(msg);
            RealNameAutehrChange  change=new RealNameAutehrChange();

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

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.presenter.SignCardContract;
 import com.sheep.gamegroup.presenter.SignCardPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
@@ -145,7 +146,13 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         if("OK".equals(o.getMsg())){
             signTvYybm.setEnabled(false);
             signTvYybm.setText("已报名");
-            ViewUtil.showSignPay(activity);
+            ViewUtil.showMsgDialog(activity, "记得明日7:00-9:00来参加打卡哦！", "恭喜你，报名成功", "设置闹铃提醒", new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    //跳转到系统闹钟
+                    SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7,5);
+                }
+            });
             presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
         }else {
             showToast(o.getMsg());
@@ -254,7 +261,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
             UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
             presenter.goSignUp();
         }else {
-            ViewUtil.showSignTimeAlert(activity, "抱歉，你的余额不足，请先去充值再来参与打卡哦！", "去充值、好的", new View.OnClickListener() {
+            ViewUtil.showMsgDialog(activity, "抱歉，你的余额不足，请先去充值再来参与打卡哦！", null, "去充值、好的", new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     Jump2View.getInstance().goSignRechargeAct(activity,null);
@@ -266,20 +273,20 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     private void tryPunch() {
         switch (punchType) {//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
             case 1:
-                ViewUtil.showSignAlert(activity);//未报名
+                ViewUtil.showMsgDialog(activity, "您昨日未报名，无法获取今日打卡资格，先去报名吧！");//未报名
                 break;
             case 2:
-                ViewUtil.showSignTimeAlert(activity, "您已经打卡，活动结束后平分奖励会直接发放到个人账户中");
+                ViewUtil.showMsgDialog(activity, "您已经打卡，活动结束后平分奖励会直接发放到个人账户中");
                 break;
             case 3:
                 presenter.goSignPunch();
                 UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
                 break;
             case 4:
-                ViewUtil.showSignTimeAlert(activity, "今日打卡活动已结束，请先去报名，明日再来哦！");
+                ViewUtil.showMsgDialog(activity, "今日打卡活动已结束，请先去报名，明日再来哦！");
                 break;
             case 5:
-                ViewUtil.showSignTimeAlert(activity, "活动暂未开始，请于早上7点至9点来参与打卡");
+                ViewUtil.showMsgDialog(activity, "活动暂未开始，请于早上7点至9点来参与打卡");
                 break;
         }
     }

app/src/main/res/drawable/shape_main_solid_rectangle_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="18dp" android:topRightRadius="18dp" />
+    <solid android:color="#2ebef2" />
+</shape>

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

@@ -71,6 +71,6 @@
             android:layout_marginTop="@dimen/content_padding_10"
             android:layout_centerHorizontal="true"
             android:layout_below="@+id/dialog_center_ll"
-            android:src="@drawable/newbie_task_close" />
+            android:src="@mipmap/close" />
     </RelativeLayout>
 </FrameLayout>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/content_padding_10">
+
+        <LinearLayout
+            android:id="@+id/dialog_center_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="64dp"
+            android:background="@drawable/shape_white_solid_rectangle"
+            android:gravity="center"
+            android:paddingBottom="@dimen/content_padding_10"
+            android:paddingStart="@dimen/content_padding_10"
+            android:paddingEnd="@dimen/content_padding_10"
+            android:orientation="vertical">
+        </LinearLayout>
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:text="提示"
+            android:textSize="20sp"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:padding="@dimen/content_padding_10"
+            android:background="@drawable/shape_main_solid_rectangle_top" />
+
+        <ImageView
+            android:id="@+id/dialog_close"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_below="@+id/dialog_center_ll"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_30"
+            android:src="@mipmap/close" />
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/content_padding_10">
+
+        <LinearLayout
+            android:id="@+id/dialog_center_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="64dp"
+            android:background="@drawable/shape_white_solid_rectangle"
+            android:gravity="center"
+            android:paddingBottom="@dimen/content_padding_10"
+            android:paddingStart="@dimen/content_padding_10"
+            android:paddingEnd="@dimen/content_padding_10"
+            android:orientation="vertical">
+            <include layout="@layout/x_msg_dialog"/>
+        </LinearLayout>
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:text="@string/app_name"
+            android:textSize="20sp"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:padding="@dimen/content_padding_10"
+            android:background="@drawable/shape_main_solid_rectangle_top" />
+
+        <ImageView
+            android:id="@+id/dialog_close"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_below="@+id/dialog_center_ll"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_30"
+            android:src="@mipmap/close" />
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/dialog_msg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="@dimen/content_padding_20"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:lineSpacingExtra="2dp"
+        android:text="内容"
+        android:gravity="center_horizontal"
+        android:textColor="@color/black_text_deep"
+        android:textSize="24sp" />
+
+    <TextView
+        android:id="@+id/dialog_sure"
+        style="@style/style_button"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginLeft="@dimen/content_padding_20"
+        android:layout_marginRight="@dimen/content_padding_20"
+        android:layout_marginTop="40dp"
+        android:text="我知道了" />
+</merge>

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

@@ -1,145 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
 
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:background="@color/blue_end"
-            android:text="推荐给好友"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_16" />
-        <ImageView
-            android:id="@+id/iv_close"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="right"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/content_padding_10"
-            android:src="@mipmap/try_dialog_x" />
-    </RelativeLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginBottom="@dimen/content_padding_small"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:text="请小绵羊下载链接发给好友"
+        android:textColor="@color/black_text_deep"
+        android:textSize="@dimen/text_size_15" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="@dimen/text_size_5"
-        android:orientation="vertical">
-
+        android:layout_height="40dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginTop="@dimen/content_padding_small"
-            android:layout_marginBottom="@dimen/content_padding_small"
-            android:text="请小绵羊下载链接发给好友"
-            android:textColor="@color/txt_black_cc444444"
+            android:id="@+id/tv_link"
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="1"
+            android:background="@drawable/recharge_bg_angle_blue_normal"
+            android:gravity="left|center_vertical"
+            android:lines="1"
+            android:maxLines="1"
+            android:paddingLeft="@dimen/content_padding_10"
+            android:paddingRight="@dimen/content_padding_10"
+            android:singleLine="true"
+            android:textColor="#999999"
             android:textSize="@dimen/text_size_15" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/tv_link"
-                android:layout_width="0.0dp"
-                android:layout_height="30dp"
-                android:layout_weight="1"
-                android:gravity="left|center_vertical"
-                android:lines="1"
-                android:maxLines="1"
-                android:singleLine="true"
-                android:paddingLeft="@dimen/content_padding_10"
-                android:paddingRight="@dimen/content_padding_10"
-                android:textColor="@color/txt_black_cc444444"
-                android:textSize="@dimen/text_size_15"
-                android:background="@drawable/recharge_bg_angle_blue_normal"
-                />
-
-            <TextView
-                android:id="@+id/withdrawal"
-                style="@style/style_button"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/content_padding_30"
-                android:textSize="@dimen/text_size_12"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:text="复制链接" />
-        </LinearLayout>
-
-
         <TextView
+            android:id="@+id/withdrawal"
+            style="@style/style_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_height="@dimen/content_padding_30"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
-            android:text="通过链接加入小绵羊即为你的好友下线，好友完成任务你可以额外获得20%的提成奖励哦!"
-            android:textColor="@color/txt_black_cc444444"
-            android:layout_marginRight="@dimen/content_padding_20"
-            android:layout_marginLeft="@dimen/content_padding_20"
+            android:text="复制链接"
             android:textSize="@dimen/text_size_12" />
+    </LinearLayout>
 
 
-        <RelativeLayout
-            android:layout_width="180dp"
-            android:layout_height="180dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="5dp"
-            >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="5dp"
+        android:text="通过链接加入小绵羊即为你的好友下线，好友完成任务你可以额外获得20%的提成奖励哦!"
+        android:textColor="@color/txt_black_cc444444"
+        android:textSize="@dimen/text_size_12" />
 
-            <ImageView
-                android:id="@+id/iv_qr"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerInParent="true"
-                android:src="@drawable/loading" />
 
-            <ImageView
-                android:id="@+id/iv_qr_small"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_centerInParent="true"
-                android:src="@drawable/icon"/>
+    <RelativeLayout
+        android:layout_width="180dp"
+        android:layout_height="180dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/content_padding_10">
 
-        </RelativeLayout>
+        <ImageView
+            android:id="@+id/iv_qr"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:src="@drawable/loading" />
 
-        <TextView
-            android:id="@+id/save_pic"
-            style="@style/style_button"
-            android:layout_marginBottom="20dp"
-            android:layout_marginLeft="100dp"
-            android:layout_marginRight="100dp"
-            android:layout_marginTop="20dp"
-            android:text="保存二维码至手机" />
+        <ImageView
+            android:id="@+id/iv_qr_small"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_centerInParent="true"
+            android:src="@drawable/icon" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:text="邀请好友下载小绵羊App,开启赚钱之路"
-            android:textColor="@color/txt_black_cc444444"
-            android:textSize="13sp" />
-    </LinearLayout>
-</LinearLayout>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/save_pic"
+        style="@style/style_button"
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="20dp"
+        android:text="保存二维码至手机" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:text="邀请好友下载小绵羊App,开启赚钱之路"
+        android:textColor="#666666"
+        android:textSize="13sp" />
+</merge>

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

@@ -1,40 +0,0 @@
-<?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="wrap_content"
-    android:background="#ffffff"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:src="@mipmap/try_dialog_x" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:lineSpacingExtra="2dp"
-        android:gravity="center"
-        android:text="您昨日未报名，无法获取今日打卡资格，先去报名吧！"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_size_20" />
-
-    <TextView
-        android:id="@+id/dialog_sure"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_marginLeft="@dimen/content_padding_20"
-        android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
-        android:gravity="center"
-        android:text="我知道了"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_15" />
-</LinearLayout>

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

@@ -1,41 +0,0 @@
-<?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="wrap_content"
-    android:background="#ffffff"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:src="@mipmap/try_dialog_x" />
-
-    <TextView
-        android:id="@+id/sign_tv_alert_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:lineSpacingExtra="2dp"
-        android:textColor="@color/black"
-        android:gravity="center_horizontal"
-        android:text="打卡成功，活动结束后平分奖励会直接发放到个人账户中"
-        android:textSize="@dimen/text_size_20" />
-
-    <TextView
-        android:id="@+id/dialog_sure"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_marginLeft="@dimen/content_padding_20"
-        android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
-        android:gravity="center"
-        android:text="我知道了"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_15" />
-</LinearLayout>

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

@@ -1,53 +0,0 @@
-<?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="wrap_content"
-    android:background="#ffffff"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:src="@mipmap/try_dialog_x" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:lineSpacingExtra="2dp"
-        android:textColor="@color/black"
-        android:text="恭喜你，报名成功"
-        android:gravity="center_horizontal"
-        android:textSize="@dimen/text_size_20" />
-
-    <TextView
-        android:id="@+id/sign_tv_count"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:lineSpacingExtra="2dp"
-        android:text="记得明日7:00-9:00来参加打卡哦！"
-        android:gravity="center_horizontal"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_size_3" />
-
-    <TextView
-        android:id="@+id/dialog_sure"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_marginLeft="@dimen/content_padding_20"
-        android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
-        android:gravity="center"
-        android:text="设置闹铃提醒"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_15" />
-</LinearLayout>