修复关于我们和签到界面中的显示错误

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

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.provider.Settings;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
@@ -27,6 +28,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.service.MonitorAppService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
@@ -268,7 +270,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         G.showToast("这个不是bug，正式版本不会出现该对话框！");
-        final String[] items = {"测试跳转系统设置","任务游戏列表","世界杯活动","交通银行信用卡测试", "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","提交身份认证时的提示", "检查标签", "友盟分享"};
+        final String[] items = {"测试跳转系统设置","启动辅助","任务游戏列表","世界杯活动","交通银行信用卡测试", "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","提交身份认证时的提示", "检查标签", "友盟分享"};
         AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要测试的信用卡")
                 .setItems(items, new DialogInterface.OnClickListener() {
 
@@ -276,20 +278,11 @@ public class TestUtil {
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
                             case "测试跳转系统设置":
-                                try {
-                                    Class<?> classForName = Class.forName("com.android.settingslib.accessibility.AccessibilityUtils");
-                                    Method method = classForName.getMethod("getEnabledServicesFromSettings", Context.class);
-                                    method.invoke(null, SheepApp.getInstance());
-                                } catch (ClassNotFoundException e) {
-                                    e.printStackTrace();
-                                } catch (NoSuchMethodException e) {
-                                    e.printStackTrace();
-                                } catch (IllegalAccessException e) {
-                                    e.printStackTrace();
-                                } catch (InvocationTargetException e) {
-                                    e.printStackTrace();
-                                }
-                                AccessibilityManager am = (AccessibilityManager) SheepApp.getInstance().getSystemService(Context.ACCESSIBILITY_SERVICE);
+                                break;
+                            case "启动辅助":
+                                Intent intent2 = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
+                                intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                SheepApp.getInstance().startActivity(intent2);
                                 break;
                             case "任务游戏列表":
                                 Jump2View.getInstance().goGameMakeMoney(activity);

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

@@ -405,7 +405,7 @@ public class ViewUtil {
             View view = LayoutInflater.from(activity).inflate(R.layout.dialog_half_screen_ad, dialog_center_ll, true);
             setText(dialog_title, advertising.getName());
 
-            dialog_center_ll.setPadding(0,activity.getResources().getDimensionPixelSize(R.dimen.content_padding_54),0,activity.getResources().getDimensionPixelSize(R.dimen.content_padding_10));
+            dialog_center_ll.setPadding(0,activity.getResources().getDimensionPixelSize(R.dimen.content_padding_54),0,activity.getResources().getDimensionPixelSize(R.dimen.content_padding_15));
 
             ImageView ad_iv = view.findViewById(R.id.ad_iv);
             VideoView ad_video_view = view.findViewById(R.id.ad_video_view);

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

@@ -2,37 +2,24 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.webkit.WebView;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.kfzs.duanduan.fragment.FgtMyMoney1;
-import com.kfzs.duanduan.fragment.FgtMyMoney2;
-import com.kfzs.duanduan.fragment.FgtMyMoney3;
-import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewAboutUs;
-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.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -69,6 +56,7 @@ public class ActNewAboutUs extends BaseActivity {
     public void initData() {
         showProgress();
         resetData();
+        ViewUtil.setText(about_us_version_tv, "版本：V"+ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
         SheepApp.getInstance().getNetComponent().getApiService().getNewAboutUs()
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -109,6 +97,8 @@ public class ActNewAboutUs extends BaseActivity {
     TextView about_us_other_tv;//公司简介--内容
     @BindView(R.id.about_us_other_wv)
     WebView about_us_other_wv;//公司简介--内容
+    @BindView(R.id.about_us_version_tv)
+    TextView about_us_version_tv;//版本号
     private void loadData(NewAboutUs newAboutUs) {
         ViewUtil.setText(about_us_qq_back_tv, newAboutUs.getComplaintQq());
         ViewUtil.setH5Text(about_us_other_tv, about_us_other_wv, newAboutUs.getContent());

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

@@ -25,7 +25,6 @@ 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.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -265,7 +264,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
             UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
             presenter.goSignUp();
         } else {
-            ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值再来参与打卡哦！").setBtnLeftText("去充值、好的")
+            ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值再来参与打卡哦！").setBtnRightText("好的").setBtnLeftText("去充值")
                     .setBtnLeftOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {