优化各种界面

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

@@ -67,7 +67,6 @@ public class ActMain extends BaseActivity {
 
         mImgDot = findViewById(R.id.img_download_manager_dot);
         tabsHelper.init();
-        Jump2View.getInstance().tryShowHalfScreenAd(this, container);
     }
 
     @Override
@@ -144,6 +143,10 @@ public class ActMain extends BaseActivity {
 
     private Container<Action1<Integer>> container = new Container<>();
 
+    public Container<Action1<Integer>> getContainer() {
+        return container;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -431,36 +431,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 break;
             case R.id.newbie_task://新手任务
-                if(getActivity() instanceof BaseActivity){
-                    ((BaseActivity) getActivity()).showProgress();
-                }
-                UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST);
-                SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                if(getActivity() instanceof BaseActivity){
-                                    ((BaseActivity) getActivity()).hideProgress();
-                                }
-                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
-                                DialogNewbieTaskList.showDialog(getActivity(), newbieTaskList);
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                if(getActivity() instanceof BaseActivity){
-                                    ((BaseActivity) getActivity()).hideProgress();
-                                }
-                                G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
-                            }
-                        });
+                DialogNewbieTaskList.tryShowDialog(activity);
                 break;
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {
-//                    TestUtil.test(getActivity());
-                    Jump2View.getInstance().testIntent(activity);
+                    TestUtil.test(getActivity());
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;

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

@@ -320,6 +320,16 @@ public class SysAppUtil {
      * @param ignoreMd5 用户手动时传null；进入主要界面时不要传null，传保存的忽略md5值，为空字符串时传""
      */
     public static void showVersionInfo(final Activity activity, final String ignoreMd5) {
+        showVersionInfo(activity, ignoreMd5, null);
+    }
+
+    /**
+     * 显示升级对话框
+     * @param activity
+     * @param ignoreMd5 用户手动时传null；进入主要界面时不要传null，传保存的忽略md5值，为空字符串时传""
+     * @param action1 动作完成后的回调
+     */
+    public static void showVersionInfo(final Activity activity, final String ignoreMd5, final Action1<Integer> action1) {
         SheepApp.getInstance().getNetComponent().getApiService().getNewVersion(SheepApp.getInstance().getConnectAddress().getVersionType())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -331,21 +341,29 @@ public class SysAppUtil {
                         if(version == null){
                             if(ignoreMd5 == null)
                                 G.showToast(baseMessage);
+                            if(action1 != null)
+                                action1.call(0);
                             return;
                         }
                         if(ignoreMd5 != null && TextUtils.equals(ignoreMd5, version.getMd5_address()) && !version.isForceUpdate()){
                             LogUtil.println("showVersionInfo", "忽略", ignoreMd5, version.getVersion_name());
+                            if(action1 != null)
+                                action1.call(0);
                             return;
                         }
                         String fileMD5 = SysAppUtil.getConnectAdrressFileMD5();
                         if(TextUtils.isEmpty(fileMD5)){
                             if(ignoreMd5 == null)
                                 G.showToast(baseMessage);
+                            if(action1 != null)
+                                action1.call(0);
                             return;
                         }
                         if(fileMD5.equalsIgnoreCase(version.getMd5_address())){//已经是最新版本
                             if(ignoreMd5 == null)
                                 G.showToast("当前版本为最新版本，无需更新");
+                            if(action1 != null)
+                                action1.call(0);
                         } else {//有新版本
                             final String fileName = version.getMd5_address()+".apk";
                             final File file = new File(ClassFileHelper.DIR, fileName);
@@ -414,6 +432,8 @@ public class SysAppUtil {
                         LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         if(ignoreMd5 == null)
                             G.showToast(baseMessage);
+                        if(action1 != null)
+                            action1.call(0);
                     }
                 });
     }

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

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.view.activity.ActInstallApkList;
 import com.sheep.gamegroup.view.activity.ActWeb;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -272,13 +273,16 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"md5","空间不足提示框","显示已经安装应用列表","复制token","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试", "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","提交身份认证时的提示", "检查标签", "友盟分享"};
+        final String[] items = {"新手对话框","md5","空间不足提示框","显示已经安装应用列表","复制token","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试", "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","提交身份认证时的提示", "检查标签", "友盟分享"};
         AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择测试项目")
                 .setItems(items, new DialogInterface.OnClickListener() {
 
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
+                            case "新手对话框":
+                                DialogNewbieTaskList.tryShowDialog(activity);
+                                break;
                             case "md5":
                                 String md5 = SysAppUtil.getConnectAdrressFileMD5();
                                 StringUtils.CopyText(activity, md5);

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

@@ -62,11 +62,16 @@ public class ViewUtil {
     }
 
     public static void showQR(final Activity activity, String link) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        View view = View.inflate(activity, R.layout.x_ask_qr_dialog, null);
-        builder.setView(view);
-        final AlertDialog dialog = builder.create();
-        ImageView iv = view.findViewById(R.id.iv_close);
+        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_ask_qr_dialog, dialog_center_ll, true);
+        dialog_title.setText("我的二维码");
+
         final ImageView iv_qr = view.findViewById(R.id.iv_qr);
         View save_pic = view.findViewById(R.id.save_pic);
         ImageView iv_qr_small = view.findViewById(R.id.iv_qr_small);
@@ -76,21 +81,10 @@ public class ViewUtil {
                 .into(iv_qr);
         Glide.with(activity)
                 .load(R.drawable.icon)
-                .apply(new RequestOptions().override(G.WIDTH / 5))
+                .apply(new RequestOptions().override(G.WIDTH / 8))
                 .into(iv_qr_small);
-        try {
-            dialog.show();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        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();
@@ -112,6 +106,11 @@ public class ViewUtil {
                 G.showToast("已保存");
             }
         });
+        try {
+            dialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
     }
 

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

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -121,7 +122,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);
                 break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
-//                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
+                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
                 break;
         }
     }

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

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
 import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -9,6 +12,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.utils.StatusBarUtils;
+import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewAboutUs;
@@ -49,7 +53,37 @@ public class ActNewAboutUs extends BaseActivity {
                 .setTitle(this,"关于小绵羊")
                 .setTitleFinish(this);
         GlideImageLoader.displayImage(this, about_us_iv, "http://cdngame.kuaifazs.com/icon_phone.png");
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
+        /*
+          标题显示和隐藏的监听
+         */
+        ((AppBarLayout) findViewById(R.id.appbar_act_game_details)).addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
+            @Override
+            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+                if (Math.abs(verticalOffset) <
+                        appBarLayout.getTotalScrollRange() - HelperUtils.getDpiToPix(20)) {
+                    if (!mIsExpanded) {
+                        mIsExpanded = true;//修改状态标记为展开
+                        txt_baseactivity_title.setVisibility(View.INVISIBLE);
+                        new_about_us_bar.setVisibility(View.INVISIBLE);
+                        title_bottom_line.setVisibility(View.INVISIBLE);
+                        about_us_version_tv.setVisibility(View.VISIBLE);
+                        img_baseactivity_title.setImageLevel(0);
+                    }
+                } else if (Math.abs(verticalOffset) >= appBarLayout.getTotalScrollRange()) {
+                    if (mIsExpanded) {
+                        txt_baseactivity_title.setVisibility(View.VISIBLE);
+                        new_about_us_bar.setVisibility(View.VISIBLE);
+                        title_bottom_line.setVisibility(View.VISIBLE);
+                        about_us_version_tv.setVisibility(View.INVISIBLE);
+                        img_baseactivity_title.setImageLevel(1);
+                        mIsExpanded = false;//修改状态标记为折叠
+                    }
+                }
+            }
+        });
     }
+    private boolean mIsExpanded = false;//是否是折叠状态
 
     @Override
     public void initListener() {
@@ -88,6 +122,14 @@ public class ActNewAboutUs extends BaseActivity {
 
     @BindView(R.id.about_us_iv)
     ImageView about_us_iv;
+    @BindView(R.id.new_about_us_bar)
+    View new_about_us_bar;
+    @BindView(R.id.title_bottom_line)
+    View title_bottom_line;
+    @BindView(R.id.img_baseactivity_title)
+    ImageView img_baseactivity_title;
+    @BindView(R.id.txt_baseactivity_title)
+    View txt_baseactivity_title;
 
 
     @BindView(R.id.about_us_addr_tv)

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

@@ -205,7 +205,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         mHandler.removeMessages(0);
         if(advertising.getShow_time() > 0) {
             splash_skip.setVisibility(View.VISIBLE);
-            timer = RxjavaCountDownTimer.getInstance(BuildConfig.DEBUG ? 10 : advertising.getShow_time())
+            timer = RxjavaCountDownTimer.getInstance(BuildConfig.DEBUG ? 1 : advertising.getShow_time())
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                         @Override
                         public void onFinish() {

app/src/main/java/com/sheep/gamegroup/view/adapter/RechargeAdapter.java

@@ -65,11 +65,11 @@ public class RechargeAdapter extends BaseAdapter {
         }
         RechargeEntity priceShow = getItem(position);
         if (position == select){
-            holder.tv_pay.setBackground(context.getResources().getDrawable(R.drawable.selector_button_full_main));
-            holder.tv_pay.setTextColor(ContextCompat.getColor(context,R.color.white));
+            holder.tv_pay.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
+            holder.tv_pay.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
         }else{
-            holder.tv_pay.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            holder.tv_pay.setTextColor(ContextCompat.getColor(context,R.color.black));
+            holder.tv_pay.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+            holder.tv_pay.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
 
         }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/RechargePriceAdapter.java

@@ -61,12 +61,6 @@ public class RechargePriceAdapter extends BaseAdapter {
 
             holder.item_tv_y = convertView.findViewById(R.id.item_tv_y);
 
-            // 获取屏幕宽度
-            int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-            int cricleRadius = W / 4 ;
-            int h = cricleRadius  / 3;
-            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, ViewGroup.LayoutParams.WRAP_CONTENT));
-//            convertView.setPadding(0,0,0,2);
             convertView.setTag(holder);
         }
         RechargePriceEntity priceShow = getItem(position);

app/src/main/java/com/sheep/gamegroup/view/adapter/WithdrawalAdapter.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -53,22 +54,17 @@ public class WithdrawalAdapter extends BaseAdapter {
 
             holder.priceTv = convertView.findViewById(R.id.item_tv);
 
-            // 获取屏幕宽度
-            int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-            int cricleRadius = W / 4  -50;
-            int h = cricleRadius  / 3;
-            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, ViewGroup.LayoutParams.WRAP_CONTENT));
-//            convertView.setPadding(0,0,0,2);
             convertView.setTag(holder);
         }else {
             holder = (ViewHolder) convertView.getTag();
         }
         GridViewEntity priceShow = getItem(position).getGridViewEntity();
         if (priceShow.isSelectState()){
-            convertView.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
+            convertView.setBackground(context.getResources().getDrawable(R.drawable.layer_list_check_rectgangle_small));
+            holder.priceTv.setTextColor(ContextCompat.getColor(context,R.color.main_tab_activated));
         }else{
-
-            convertView.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            convertView.setBackground(context.getResources().getDrawable(R.drawable.btn_main_stroke_no_check_small));
+            holder.priceTv.setTextColor(ContextCompat.getColor(context,R.color.main_tab));
         }
 
         holder.priceTv.setText(priceShow.getValue() +"元");

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

@@ -2,41 +2,86 @@ package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.TextView;
 
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
 
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
 
 public class DialogNewbieTaskList {
 
     public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList) {
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST_DIALOG);
-        View view = View.inflate(activity, R.layout.dialog_newbie_task_list, null);
-        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
-                .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.dialog_newbie_task_list, dialog_center_ll, true);
+        dialog_title.setText("新手任务");
+
+
         View.OnClickListener onClickListener =  new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mAlertDialog.dismiss();
+                dialog.dismiss();
             }
         };
-        final ListView dialog_center_lv = ViewFindUtils.find(view, R.id.dialog_center_lv);
+        final ListView dialog_center_lv = view.findViewById(R.id.dialog_center_lv);
         dialog_center_lv.setAdapter(new NewbieTaskAdp(activity, newbieTaskList).setOnClickListener(onClickListener));
-        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
         dialog_close.setOnClickListener(onClickListener);
         try {
-            mAlertDialog.show();
+            dialog.show();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return mAlertDialog;
+        return dialog;
+    }
+
+    public static void tryShowDialog(final Activity activity) {
+        if(activity instanceof BaseActivity){
+            ((BaseActivity) activity).showProgress();
+        }
+        SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(activity instanceof BaseActivity){
+                            ((BaseActivity) activity).hideProgress();
+                        }
+                        List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                        DialogNewbieTaskList.showDialog(activity, newbieTaskList);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(activity instanceof BaseActivity){
+                            ((BaseActivity) activity).hideProgress();
+                        }
+                        G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
+                    }
+                });
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -26,6 +26,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
 
+import rx.functions.Action1;
+
 /**
  * Created by kemllor on 2017/12/21.
  */
@@ -114,11 +116,19 @@ public class SheepApp extends BaseApplication {
      */
     ActivityLifecycleCallbacks activityLifecycleCallbacks = new ActivityLifecycleCallbacks() {
         @Override
-        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        public void onActivityCreated(final Activity activity, Bundle savedInstanceState) {
             ActivityManager.getInstance().pushActivity(activity);
-            if(activity instanceof SplashAct || activity instanceof LoginAct || activity instanceof PhoneAct || activity instanceof ActMain){
+            if(activity instanceof SplashAct || activity instanceof LoginAct || activity instanceof PhoneAct){
                 SysAppUtil.showVersionInfo(activity, SpUtils.getIgnoreMd5());
+            } else if(activity instanceof ActMain){
+                SysAppUtil.showVersionInfo(activity, SpUtils.getIgnoreMd5(), new Action1<Integer>() {
+                    @Override
+                    public void call(Integer integer) {
+                        Jump2View.getInstance().tryShowHalfScreenAd(activity, ((ActMain) activity).getContainer());
+                    }
+                });
             }
+
             if(mActivityAount == 0) {
                 LogUtil.println("SheepApp SHEEP_START");
                 UMConfigUtils.Event.SHEEP_START.onEvent();

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/narrow_back_white" />
+    <item android:maxLevel="1" android:drawable="@drawable/narrow_back_black" />
+</level-list>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="15dp" />
+    <corners android:radius="10dp" />
     <solid android:color="#E5E5E5" />
 </shape>

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

@@ -1,6 +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" />
+    <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" />
     <solid android:color="@color/gray_bg" />
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:bottomLeftRadius="18dp" android:bottomRightRadius="18dp" />
+    <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
     <solid android:color="#ffffff" />
 </shape>

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

@@ -28,13 +28,17 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/feedback_notice_hellow"
-                    style="@style/txt_style_15_black"/>
+                    style="@style/txt_style_15_black"
+                    android:textSize="@dimen/text_size_3"
+                    android:textColor="@color/gray_4"/>
                 <TextView
                     android:id="@+id/feedbook_notice_end_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/feedback_notice_end"
                     style="@style/txt_style_15_black"
+                    android:textSize="@dimen/text_size_3"
+                    android:textColor="@color/gray_4"
                     android:layout_below="@+id/feedbook_notice_top_tv"
                     android:layout_alignParentRight="true"
                     android:layout_marginTop="@dimen/content_padding_15"/>
@@ -63,6 +67,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/txt_style_15_black"
+                        android:textSize="@dimen/text_size_12"
                         android:text="@string/contact_qq_email"
                         android:layout_gravity="center_vertical"/>
 
@@ -71,6 +76,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:cursorVisible="false"
+                        android:layout_marginStart="5dp"
                         android:hint="@string/feedback_notice_input_email_address"
                         android:gravity="top"
                         android:text=""

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

@@ -88,13 +88,13 @@
                     android:text="@string/dingxiang_amount"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
+
                 <ImageView
                     android:id="@+id/my_money_dingxiang_amount_iv"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:padding="10dp"
-                    android:src="@mipmap/question_mark"
-                    android:visibility="invisible"/>
+                    android:src="@mipmap/question_mark" />
             </LinearLayout>
 
             <TextView

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

@@ -1,218 +1,256 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white_light"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <android.support.constraint.ConstraintLayout
+    <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@mipmap/home_blue_bg"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_20"
-        android:paddingStart="@dimen/content_padding_20"
-        android:paddingTop="@dimen/status_bar_height">
+        android:layout_height="match_parent"
+        android:background="@color/white_light">
 
-        <ImageView
-            android:id="@+id/img_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/layout_heigh_default"
-            android:gravity="center_vertical"
-            android:scaleType="centerInside"
-            android:src="@drawable/narrow_back_white"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar_act_game_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true">
 
-        <TextView
-            android:id="@+id/txt_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/layout_heigh_default"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_4"
-            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+            <android.support.constraint.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/home_blue_bg"
+                android:paddingBottom="@dimen/content_padding_10"
+                android:paddingEnd="@dimen/content_padding_20"
+                android:paddingStart="@dimen/content_padding_20"
+                android:paddingTop="@dimen/status_bar_height"
+                app:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-        <ImageView
-            android:id="@+id/about_us_iv"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:src="@mipmap/icon"
-            app:layout_constraintBottom_toTopOf="@+id/about_us_app_tv"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_heigh_default"
+                    android:gravity="center"
+                    android:text="关于小绵羊"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_size_4" />
 
-        <TextView
-            android:id="@+id/about_us_app_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_20"
-            app:layout_constraintBottom_toTopOf="@+id/about_us_version_tv"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/about_us_iv" />
+                <ImageView
+                    android:id="@+id/about_us_iv"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:src="@mipmap/icon"
+                    android:layout_marginTop="@dimen/layout_heigh_default"
+                    app:layout_constraintBottom_toTopOf="@+id/about_us_app_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/about_us_version_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="版本：V2.6"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_4"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/about_us_app_tv" />
-    </android.support.constraint.ConstraintLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/about_us_app_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_size_15"
+                    app:layout_constraintBottom_toTopOf="@+id/about_us_version_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/about_us_iv" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                <TextView
+                    android:id="@+id/about_us_version_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="版本：V2.6"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_size_12"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/about_us_app_tv" />
+            </android.support.constraint.ConstraintLayout>
 
-            <TextView
-                style="@style/style_about_us_title"
-                android:text="相关信息" />
+        </android.support.design.widget.AppBarLayout>
 
-            <RelativeLayout style="@style/style_about_us_rl">
+        <android.support.v4.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="false"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <TextView
-                    android:id="@+id/about_us_addr_label_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:text="官方地址" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/about_us_addr_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@+id/about_us_addr_label_tv"
-                    android:gravity="end"
-                    android:text="天府四街天府四街天府四街天府四街天府四街天府四街天府四街天府四街" />
-
-                <View
-                    android:id="@+id/about_us_line_1"
-                    style="@style/style_about_us_line"
-                    android:layout_below="@+id/about_us_addr_tv" />
+                    style="@style/style_about_us_title"
+                    android:text="相关信息" />
 
-                <TextView
-                    android:id="@+id/about_us_platform_label_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentStart="true"
-                    android:layout_below="@id/about_us_line_1"
-                    android:text="官方微信公众平台" />
+                <RelativeLayout style="@style/style_about_us_rl">
 
-                <TextView
-                    android:id="@+id/about_us_platform_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentEnd="true"
-                    android:layout_below="@id/about_us_line_1"
-                    android:layout_toEndOf="@+id/about_us_platform_label_tv"
-                    android:gravity="end"
-                    android:text="好玩之家" />
-            </RelativeLayout>
+                    <TextView
+                        android:id="@+id/about_us_addr_label_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:text="官方地址" />
 
-            <TextView
-                style="@style/style_about_us_title"
-                android:text="投诉与建议" />
+                    <TextView
+                        android:id="@+id/about_us_addr_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_toEndOf="@+id/about_us_addr_label_tv"
+                        android:gravity="end"
+                        android:text="天府四街天府四街天府四街天府四街天府四街天府四街天府四街天府四街" />
 
-            <RelativeLayout style="@style/style_about_us_rl">
+                    <View
+                        android:id="@+id/about_us_line_1"
+                        style="@style/style_about_us_line"
+                        android:layout_below="@+id/about_us_addr_tv" />
 
-                <TextView
-                    android:id="@+id/about_us_qq_back_label_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:text="QQ" />
+                    <TextView
+                        android:id="@+id/about_us_platform_label_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentStart="true"
+                        android:layout_below="@id/about_us_line_1"
+                        android:text="官方微信公众平台" />
+
+                    <TextView
+                        android:id="@+id/about_us_platform_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentEnd="true"
+                        android:layout_below="@id/about_us_line_1"
+                        android:layout_toEndOf="@+id/about_us_platform_label_tv"
+                        android:gravity="end"
+                        android:text="好玩之家" />
+                </RelativeLayout>
 
                 <TextView
-                    android:id="@+id/about_us_qq_back_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@+id/about_us_qq_back_label_tv"
-                    android:gravity="end"
-                    android:text="13888888888" />
-            </RelativeLayout>
+                    style="@style/style_about_us_title"
+                    android:text="投诉与建议" />
 
-            <TextView
-                style="@style/style_about_us_title"
-                android:text="商务合作" />
+                <RelativeLayout style="@style/style_about_us_rl">
 
-            <RelativeLayout style="@style/style_about_us_rl">
+                    <TextView
+                        android:id="@+id/about_us_qq_back_label_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:text="QQ" />
 
-                <TextView
-                    android:id="@+id/about_us_qq_label_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:text="QQ" />
+                    <TextView
+                        android:id="@+id/about_us_qq_back_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_toEndOf="@+id/about_us_qq_back_label_tv"
+                        android:gravity="end"
+                        android:text="13888888888" />
+                </RelativeLayout>
 
                 <TextView
-                    android:id="@+id/about_us_qq_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@+id/about_us_qq_label_tv"
-                    android:gravity="end"
-                    android:text="88888888" />
-
-                <View
-                    android:id="@+id/about_us_line_2"
-                    style="@style/style_about_us_line"
-                    android:layout_below="@+id/about_us_qq_tv" />
+                    style="@style/style_about_us_title"
+                    android:text="商务合作" />
 
-                <TextView
-                    android:id="@+id/about_us_email_label_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentStart="true"
-                    android:layout_below="@id/about_us_line_2"
-                    android:text="邮箱" />
+                <RelativeLayout style="@style/style_about_us_rl">
 
-                <TextView
-                    android:id="@+id/about_us_email_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_alignParentEnd="true"
-                    android:layout_below="@id/about_us_line_2"
-                    android:layout_toEndOf="@+id/about_us_email_label_tv"
-                    android:gravity="end"
-                    android:text="88888888@qq.com" />
-            </RelativeLayout>
-
-            <TextView
-                style="@style/style_about_us_title"
-                android:text="公司简介" />
-
-            <RelativeLayout
-                style="@style/style_about_us_rl"
-                android:layout_marginBottom="@dimen/content_padding_20">
+                    <TextView
+                        android:id="@+id/about_us_qq_label_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:text="QQ" />
+
+                    <TextView
+                        android:id="@+id/about_us_qq_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_toEndOf="@+id/about_us_qq_label_tv"
+                        android:gravity="end"
+                        android:text="88888888" />
+
+                    <View
+                        android:id="@+id/about_us_line_2"
+                        style="@style/style_about_us_line"
+                        android:layout_below="@+id/about_us_qq_tv" />
+
+                    <TextView
+                        android:id="@+id/about_us_email_label_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentStart="true"
+                        android:layout_below="@id/about_us_line_2"
+                        android:text="邮箱" />
+
+                    <TextView
+                        android:id="@+id/about_us_email_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_alignParentEnd="true"
+                        android:layout_below="@id/about_us_line_2"
+                        android:layout_toEndOf="@+id/about_us_email_label_tv"
+                        android:gravity="end"
+                        android:text="88888888@qq.com" />
+                </RelativeLayout>
 
                 <TextView
-                    android:id="@+id/about_us_other_tv"
-                    style="@style/style_about_us_label"
-                    android:layout_width="match_parent"
+                    style="@style/style_about_us_title"
                     android:text="公司简介" />
-                <WebView
-                    android:id="@+id/about_us_other_wv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-            </RelativeLayout>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
+
+                <RelativeLayout
+                    style="@style/style_about_us_rl"
+                    android:layout_marginBottom="@dimen/content_padding_20">
+
+                    <TextView
+                        android:id="@+id/about_us_other_tv"
+                        style="@style/style_about_us_label"
+                        android:layout_width="match_parent"
+                        android:text="公司简介" />
+
+                    <WebView
+                        android:id="@+id/about_us_other_wv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </RelativeLayout>
+            </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+    </android.support.design.widget.CoordinatorLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/layout_heigh_default"
+        android:layout_marginTop="@dimen/status_bar_height">
+        <View
+            android:id="@+id/new_about_us_bar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible"
+            android:background="@color/white_F9F9F9"/>
+        <include layout="@layout/title_bottom_line"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_alignParentBottom="true"/>
+        <ImageView
+            android:id="@+id/img_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/layout_heigh_default"
+            android:paddingStart="@dimen/content_padding_20"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:gravity="center_vertical"
+            android:scaleType="centerInside"
+            android:src="@drawable/level_list_back" />
+
+        <TextView
+            android:id="@+id/txt_baseactivity_title"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/layout_heigh_default"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black_text_deep"
+            android:visibility="invisible"
+            android:textSize="@dimen/text_size_4" />
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -43,9 +43,30 @@
         style="@style/hint_txt_style"
         android:text="@string/bind_weixin_withdrawal_notice_text"
         android:layout_marginTop="@dimen/content_padding_small"
-        android:layout_marginBottom="@dimen/content_padding_30"
         android:layout_marginLeft="@dimen/content_padding_30"
         android:layout_marginRight="@dimen/content_padding_30"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:background="@drawable/shape_ash_solid_rectangle"
+        android:orientation="horizontal"
+        android:padding="@dimen/content_padding_15">
+
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@mipmap/alarm" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="温馨提示：因小绵羊业务调整，服务号主体迁移，请关注新的服务号“小绵羊领头羊”进行验证码接收操作，感谢您的配合"
+            android:textColor="#918F8F"
+            android:textSize="14sp" />
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -1,48 +1,8 @@
 <?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
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.kfzs.duanduan.view.diag.MyListview
+        android:id="@+id/dialog_center_lv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:id="@+id/dialog_center_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:paddingStart="@dimen/content_padding_10"
-            android:paddingEnd="@dimen/content_padding_10"
-            android:paddingTop="@dimen/content_padding_10"
-            android:paddingBottom="@dimen/content_padding_10">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/content_padding_10"
-                android:gravity="center"
-                android:text="新手任务"
-                android:textColor="#232323"
-                android:textSize="17sp" />
-            <com.kfzs.duanduan.view.diag.MyListview
-                android:id="@+id/dialog_center_lv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:divider="@null"/>
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/dialog_close"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_margin="@dimen/content_padding_10"
-            android:layout_alignTop="@+id/dialog_center_ll"
-            android:layout_alignEnd="@+id/dialog_center_ll"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_credit_card_close" />
-    </RelativeLayout>
-</FrameLayout>
+        android:divider="@null" />
+</merge>

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

@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:layout_marginTop="@dimen/content_padding_15"
-    android:layout_marginLeft="@dimen/content_padding_15"
-    android:layout_marginRight="@dimen/content_padding_15">
+    android:layout_marginStart="@dimen/content_padding_13"
+    android:layout_marginEnd="@dimen/content_padding_15">
     <RelativeLayout
         android:id="@+id/account_detail_layout"
         android:layout_width="match_parent"

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

@@ -4,7 +4,10 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:layout_margin="@dimen/content_padding_15">
+    android:layout_marginTop="@dimen/content_padding_13"
+    android:layout_marginBottom="@dimen/content_padding_15"
+    android:layout_marginStart="@dimen/content_padding_15"
+    android:layout_marginEnd="@dimen/content_padding_15">
     <RelativeLayout
         android:id="@+id/abourt_us_layout"
         android:layout_width="match_parent"

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

@@ -10,12 +10,13 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/content_padding_10">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
         <ImageView
             android:id="@+id/newbie_task_iv"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:padding="4dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"

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

@@ -38,8 +38,6 @@
                         style="@style/txt_style_15"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="7dp"
-                        android:paddingLeft="@dimen/content_padding_big"
                         android:text="充值金额（不可提现，只可消费）" />
 
 
@@ -50,6 +48,7 @@
                         android:layout_marginTop="@dimen/content_padding_20"
                         android:gravity="center_horizontal"
                         android:listSelector="@color/transparent"
+                        android:horizontalSpacing="@dimen/content_padding_13"
                         android:numColumns="3"
                         android:scrollbars="none"
                         android:visibility="visible" />
@@ -63,7 +62,6 @@
                         android:hint="请输入充值金额"
                         android:inputType="number"
                         android:maxLength="5"
-                        android:paddingLeft="@dimen/content_padding_big"
                         android:textColor="@color/black_444444"
                         android:textColorHint="@color/disenable_color"
                         android:textSize="@dimen/text_size_3" />
@@ -73,6 +71,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/content_padding_10"
+                    android:layout_marginBottom="10dp"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:orientation="vertical"
                     android:padding="@dimen/content_padding_13">
@@ -81,8 +80,6 @@
                         style="@style/txt_style_15"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="7dp"
-                        android:paddingLeft="@dimen/content_padding_big"
                         android:text="支付方式" />
 
                     <com.sheep.gamegroup.util.MyGridview
@@ -103,13 +100,7 @@
 
             <TextView
                 android:id="@+id/tv_recharge_pay"
-                style="@style/txt_big_btn_style"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20dp"
-                android:clickable="true"
-                android:gravity="center"
+                style="@style/style_button"
                 android:text="立即支付" />
 
         </LinearLayout>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tv_pay"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingBottom="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10"
-    android:text="微信"
-    android:textColor="@color/black" />
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tv_pay"
+        style="@style/style_button"
+        android:layout_height="30dp"
+        android:text="微信" />
+</LinearLayout>

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

@@ -64,6 +64,7 @@
                     android:scrollbars="none"
                     android:numColumns="3"
                     android:layout_marginTop="@dimen/content_padding_20"
+                    android:horizontalSpacing="@dimen/content_padding_13"
                     android:visibility="visible"
                     android:background="@color/white"
                     android:listSelector="@color/transparent"/>

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

@@ -1,18 +1,5 @@
 <?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:src="@mipmap/try_dialog_x"
-        android:layout_gravity="right"
-        />
-
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -44,4 +31,4 @@
         android:layout_marginTop="20dp"
         android:text="保存二维码至手机" />
 
-</LinearLayout>
+</merge>

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

@@ -76,8 +76,8 @@
 
         <ImageView
             android:id="@+id/iv_qr_small"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_centerInParent="true"
             android:src="@drawable/icon" />
 

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

@@ -2,55 +2,51 @@
 <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="@color/white_light"
-    >
-    <include
-        layout="@layout/title"/>
+    android:orientation="vertical">
+
+    <include layout="@layout/title" />
 
     <RelativeLayout
         android:id="@+id/rl_head"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="@dimen/content_padding_15"
+        android:layout_marginStart="@dimen/content_padding_13"
+        android:layout_marginTop="10dp"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
-        >
+        android:padding="15dp">
 
         <TextView
             android:id="@+id/tv_name"
+            style="@style/txt_style_15_black"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/header"
             android:layout_alignParentLeft="true"
-            style="@style/txt_style_15_black"
             android:layout_centerVertical="true"
-            />
+            android:text="@string/header" />
 
 
         <TextView
+            android:id="@+id/tv_more"
+            style="@style/hint_txt_style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/hint_txt_style"
-            android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:drawableRight="@mipmap/x_ic_next"
+            android:layout_centerVertical="true"
             android:drawablePadding="10dp"
-            android:id="@+id/tv_more"
-            />
+            android:drawableRight="@mipmap/x_ic_next" />
 
         <ImageView
             android:id="@+id/iv_head_right"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/tv_more"
             android:background="@null"
-            android:src="@mipmap/x_ic_def_head"
             android:scaleType="centerInside"
-            android:layout_toLeftOf="@id/tv_more"
-            android:layout_centerVertical="true"
+            android:src="@mipmap/x_ic_def_head"
 
 
             />
@@ -60,57 +56,50 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_marginEnd="@dimen/content_padding_15"
+        android:layout_marginStart="@dimen/content_padding_13"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        >
+        android:orientation="vertical">
 
         <RelativeLayout
+            android:id="@+id/layout_more1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp"
-            android:id="@+id/layout_more1"
-            android:layout_margin="10dp"
-            >
+            android:padding="15dp">
 
             <TextView
+                style="@style/txt_style_15_black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/niker"
                 android:layout_alignParentLeft="true"
-                style="@style/txt_style_15_black"
                 android:layout_centerVertical="true"
-                />
+                android:text="@string/niker" />
 
 
             <TextView
+                android:id="@+id/tv_more1"
+                style="@style/hint_txt_style"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/hint_txt_style"
-                android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:drawableRight="@mipmap/x_ic_next"
+                android:layout_centerVertical="true"
                 android:drawablePadding="10dp"
-                android:id="@+id/tv_more1"
-                />
+                android:drawableRight="@mipmap/x_ic_next" />
 
             <TextView
                 android:id="@+id/tv_nike"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/tv_more1"
                 android:background="@null"
                 android:src="@mipmap/icon"
-                android:layout_toLeftOf="@id/tv_more1"
-                android:layout_centerVertical="true"
 
                 />
 
         </RelativeLayout>
 
 
-
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
@@ -121,19 +110,15 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp"
-            android:layout_margin="10dp"
-            >
+            android:padding="15dp">
 
             <TextView
+                style="@style/txt_style_15_black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/sheep_id"
                 android:layout_alignParentLeft="true"
-                style="@style/txt_style_15_black"
                 android:layout_centerVertical="true"
-                />
-
+                android:text="@string/sheep_id" />
 
 
             <TextView
@@ -143,8 +128,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:textCursorDrawable="@null"
-                android:textIsSelectable="true"
-                />
+                android:textIsSelectable="true" />
 
         </RelativeLayout>
 
@@ -156,58 +140,53 @@
             />
 
         <RelativeLayout
+            android:id="@+id/rl_qr"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp"
-
-            android:layout_margin="10dp"
-            android:id="@+id/rl_qr"
-            >
+            android:padding="15dp">
 
             <TextView
+                style="@style/txt_style_15_black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/my_qr"
                 android:layout_alignParentLeft="true"
-                style="@style/txt_style_15_black"
                 android:layout_centerVertical="true"
-                />
+                android:text="@string/my_qr" />
 
 
             <TextView
+                android:id="@+id/tv_more3"
+                style="@style/hint_txt_style"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/hint_txt_style"
-                android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:drawableRight="@mipmap/x_ic_next"
+                android:layout_centerVertical="true"
                 android:drawablePadding="10dp"
-                android:id="@+id/tv_more3"
-                />
+                android:drawableRight="@mipmap/x_ic_next" />
 
             <RelativeLayout
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:layout_toLeftOf="@id/tv_more3"
-                android:layout_centerVertical="true">
-            <ImageView
-                android:id="@+id/tv_qr"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:background="@null"
-                android:src="@mipmap/icon"
-                android:layout_centerInParent="true"
-                />
-            <ImageView
-                android:id="@+id/tv_qr_small"
-                android:layout_width="5dp"
-                android:layout_height="5dp"
-                android:background="@null"
-                android:src="@mipmap/icon"
-                android:layout_centerInParent="true"
-                />
-
-        </RelativeLayout>
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/tv_more3">
+
+                <ImageView
+                    android:id="@+id/tv_qr"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:background="@null"
+                    android:src="@mipmap/icon" />
+
+                <ImageView
+                    android:id="@+id/tv_qr_small"
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+                    android:layout_centerInParent="true"
+                    android:background="@null"
+                    android:src="@mipmap/icon" />
+
+            </RelativeLayout>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -87,11 +87,11 @@
 
     <style name="style_button_small" parent="button">
         <item name="android:layout_width">70dp</item>
-        <item name="android:layout_height">30dp</item>
+        <item name="android:layout_height">26dp</item>
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>
-        <item name="android:textSize">@dimen/text_size_15</item>
+        <item name="android:textSize">@dimen/text_size_12</item>
     </style>
 
     <style name="style_button_small_yellow" parent="button">

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

@@ -6,7 +6,7 @@
     <string name="toast_warning_phone_captcha_image_code_size">短信验证码为6位</string>
     <integer name="size_phone_number">11</integer>
     <string name="toast_warning_phone_number_size">手机号码为11位</string>
-    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号\"好玩服务号\",在公众号中点击验证码或输入\"验证码\"三个字获取验证码并填入下方</string>
+    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号\"小绵羊领头羊\",在公众号中点击验证码或输入\"验证码\"三个字获取验证码并填入下方</string>
     <string name="bind_weixin_withdrawal_notice_text">你的每次收入提现，我们都会通过微信的企业商户入账功能将收入实时入账到绑定微信号的微信零钱上</string>
     <string name="no_bind_wx_notice_text">未绑定微信号，无法入账到你的微信零钱</string>
     <string name="no_bind_tel_notice_text">我们已将你的手机号与该帐号绑定，如有变更，请点击</string>
@@ -23,7 +23,7 @@
 
     <string name="rechargeq_amount">当前绵羊币余额：%s元</string>
 
-    <string name="feedback_notice_hellow">致亲爱的您，\n &#160;&#160;&#160;&#160;&#160;我们会重视您提出的每一个建议。您的批评与意见是我们产品前进的动力，感谢您对小绵羊APP的支持！</string>
+    <string name="feedback_notice_hellow">致亲爱的您：\n &#160;&#160;&#160;&#160;&#160;我们会重视您提出的每一个建议。您的批评与意见是我们产品前进的动力，感谢您对小绵羊APP的支持！</string>
     <string name="feedback_notice_end">小绵羊项目组全体人员</string>
     <string name="feedback_notice_input_advice">请输入您的建议...</string>
     <string name="feedback_notice_input_email_address">请输入您的邮箱地址</string>