清理资源

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

@@ -9,17 +9,16 @@ import android.os.Environment;
 import android.os.StatFs;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.WindowManager;
 
 import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
+import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.kfzs.duanduan.KFZSApp;
 
 import java.io.File;
 import java.util.List;
@@ -187,7 +186,7 @@ public class HelperUtils {
                     file.length() > getFreeSpaceB() / 2
                     && file.length() > getSdkFreeSpace() / 2
                     )) {
-                DialogStorageLow.showPopupWindow(context);
+                DialogStorageLow.showDialog(context);
             }
         }catch (Exception e){
             e.printStackTrace();

app/src/main/java/com/kfzs/duanduan/view/DialogStorageLow.java

@@ -2,114 +2,31 @@ package com.kfzs.duanduan.view;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.PixelFormat;
 import android.provider.Settings;
 import android.support.v7.app.AlertDialog;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
 
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 /**
- * @ Created by Dlg
- * @ <p>TiTle:  DialogStorageLow</p>
- * @ <p>Description: 存储不足时的弹窗类</p>
- * @ date:  2017/7/3 17:48
- * @ QQ:    315096953
+ * 空间不足提示框
+ *  @auther realicing
  */
 
 public class DialogStorageLow {
 
-    private static AlertDialog mAlertDialog;
-
-    private static AlertDialog mAlertDialogs;
-
-    public static AlertDialog showDialog(final Context activity) {
-        if (mAlertDialog == null) {
-            View view = View.inflate(activity, R.layout.diag_show_install, null);
-            ViewFindUtils.find(view, R.id.btn_diag_show_install_cancle)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.btn_diag_show_install_manage)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                            Intent intent = new Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
-                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            activity.startActivity(intent);
-                        }
-                    });
-            mAlertDialog = new AlertDialog.Builder(activity)
-                    .setView(view)
-                    .create();
-
-        }
-        //设置弹出全局对话框
-        mAlertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
-//        if (!HelperUtils.isActivityOnTop((Activity) activity)) {
-//            return mAlertDialog;//如果不是顶层窗口，那就不显示了。
-//        }
-
-        mAlertDialog.show();
-        return mAlertDialog;
-    }
-
-    /**
-     * 显示弹出框
-     *
-     * @param context
-     */
-    public static void showPopupWindow(final Context context) {
-        // 获取WindowManager
-        final WindowManager mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-
-
-        final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        // 类型
-        params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        // 设置flag
-        params.flags = WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-        // 如果设置了WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE，弹出的View收不到Back键的事件
-        // 不设置这个弹出框的透明遮罩显示为黑色
-        params.format = PixelFormat.TRANSLUCENT;
-        // FLAG_NOT_TOUCH_MODAL不阻塞事件传递到后面的窗口
-        // 设置 FLAG_NOT_FOCUSABLE 悬浮窗口较小时，后面的应用图标由不可长按变为可长按
-        // 不设置这个flag的话，home页的划屏会有问题
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.CENTER;
-
-        final View mView = LayoutInflater.from(context).inflate(R.layout.diag_show_install, null);
-        Button tv_itemdialog_ok = mView.findViewById(R.id.btn_diag_show_install_manage);
-        Button tv_itemdialog_close = mView.findViewById(R.id.btn_diag_show_install_cancle);
-
-        tv_itemdialog_ok.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // 隐藏弹窗
-                mWindowManager.removeView(mView);
-                Intent intent = new Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-            }
-        });
-
-        tv_itemdialog_close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mWindowManager.removeView(mView);
-            }
-        });
-
-        mWindowManager.addView(mView, params);
+    public static AlertDialog showDialog(Context context) {
+        final Context mContext = context == null ? SheepApp.getInstance() : context;
+        return ViewUtil.showMsgDialog(mContext, new DialogConfig().setTitle("温馨提示").setTitle("存储空间不足").setMsgMore("请释放一些储存空间，并重新尝试!")
+            .setBtnRightText("取消").setBtnLeftText("管理应用").setBtnLeftOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Intent intent = new Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        mContext.startActivity(intent);
+                    }
+                }));
     }
 }

app/src/main/java/com/kfzs/duanduan/view/TimeButton.java

@@ -1,82 +0,0 @@
-package com.kfzs.duanduan.view;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v7.widget.AppCompatButton;
-import android.util.AttributeSet;
-
-import com.sheep.jiuyan.samllsheep.R;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  TimeButton</p>
- * @ <p>Description: 一般用于验证码，计时按钮</p>
- * @ date:  2017/12/7 11:14
- * @ QQ:    315096953
- */
-public class TimeButton extends AppCompatButton {
-    private int mIntSeconds = 60;
-    private int mRemainSeconds = 0;
-    private final static int HANDLE_MSG = 1;
-
-    public TimeButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public void setSeconds(int seconds) {
-        this.mIntSeconds = seconds;
-    }
-
-    /**
-     * 启动记时器
-     */
-    public void star() {
-        setEnabled(false);
-        mRemainSeconds = mIntSeconds;
-        handler.sendEmptyMessage(HANDLE_MSG);
-    }
-
-    /**
-     * 重置记时器
-     */
-    public void reset() {
-        handler.removeMessages(HANDLE_MSG);
-        mRemainSeconds = 0;
-        setEnabled(true);
-        setText(getResources()
-                .getString(R.string.getvalicode));
-    }
-
-    /**
-     * 是否已经初始化可点击状态中
-     *
-     * @return
-     */
-    public boolean isAlready() {
-        return getText().equals(getResources()
-                .getString(R.string.getvalicode));
-    }
-
-    private Handler handler = new Handler() {
-        public void handleMessage(Message msg) {
-            setText(String.format(getResources()
-                    .getString(R.string.delayretry), mRemainSeconds));
-            if (mRemainSeconds <= 0) {
-                setEnabled(true);
-                setText(getResources()
-                        .getString(R.string.getvalicode));
-            } else
-                sendEmptyMessageDelayed(HANDLE_MSG, 1000);
-            mRemainSeconds--;
-        }
-    };
-
-    @Override
-    public void onDetachedFromWindow() {
-        handler.removeMessages(HANDLE_MSG);
-        mRemainSeconds = 0;
-        super.onDetachedFromWindow();
-    }
-}

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

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.ActMain;
+import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.CreditCard;
 import com.sheep.gamegroup.model.entity.DialogConfig;
@@ -271,13 +272,16 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"显示已经安装应用列表","复制token","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试", "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","提交身份认证时的提示", "检查标签", "友盟分享"};
+        final String[] items = {"空间不足提示框","显示已经安装应用列表","复制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 "空间不足提示框":
+                                DialogStorageLow.showDialog(activity);
+                                break;
                             case "显示已经安装应用列表":
                                 showHasInstallApkList(activity);
                                 break;

app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java

@@ -55,7 +55,7 @@ public class DownloadService extends Service{
         //空间不足，弹框提示
         try{
             if (0 <= task.getFileSize() && task.getFileSize() > HelperUtils.getFreeSpaceB()) {
-                DialogStorageLow.showPopupWindow(DownloadService.this);
+                DialogStorageLow.showDialog(DownloadService.this);
             }
         }catch (Exception e){
             e.printStackTrace();

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:startColor="@color/blue_start"
-        android:endColor="@color/blue_end"/>
-
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/blue_start"
-        />
-
-
-    <corners
-        android:radius="7dp"/>
-
-</shape>

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid android:color="#D4D4D4"/>
-</shape>

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

@@ -1,75 +0,0 @@
-<?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"
-    android:background="@color/bg_gray">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/sp_appointment_bg"
-        android:gravity="center_vertical"
-        android:paddingBottom="20dp">
-
-        <ImageView
-            android:id="@+id/img_diag_show_install"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="4dp"
-            android:layout_marginTop="30dp"
-            android:src="@drawable/yuyuetips2" />
-
-        <TextView
-            android:id="@+id/txt_diag_show_install_tips"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/img_diag_show_install"
-            android:layout_centerHorizontal="true"
-            android:text="@string/space_low"
-            android:textColor="@color/theme_app_main"
-            android:textSize="@dimen/app_size_tv_large" />
-
-        <TextView
-            android:id="@+id/txt_diag_show_install_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_diag_show_install_tips"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="无法安装应用\n请释放一些储存空间，并重新尝试"
-            android:textColor="@color/tv_about_text"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_diag_show_install_content"
-            android:layout_marginTop="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/btn_diag_show_install_cancle"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/theme_bg_btn_corner_big_gray"
-                android:text="@string/cancel"
-                android:textColor="@color/color_shenhui"
-                android:textSize="@dimen/app_size_tv_mid" />
-
-            <Button
-                android:id="@+id/btn_diag_show_install_manage"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
-                android:background="@drawable/theme_bg_btn_corner_big"
-                android:text="@string/manage_app"
-                android:textColor="@color/white"
-                android:textSize="@dimen/app_size_tv_mid" />
-        </LinearLayout>
-
-    </RelativeLayout>
-</FrameLayout>

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

@@ -33,7 +33,7 @@
                 android:lineSpacingExtra="5dp"
                 android:paddingEnd="@dimen/content_padding"
                 android:paddingStart="@dimen/content_padding"
-                android:text="@string/user_agreement"
+                android:text="@string/app_name"
                 android:maxHeight="400dp"
                 android:textColor="#4d4d4d"
                 android:textSize="12sp" />

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

@@ -1,107 +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="match_parent"
-    android:background="@color/bg_gray"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <include layout="@layout/title" />
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="none">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="@dimen/content_padding_10">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical"
-                    android:padding="@dimen/content_padding_13">
-
-
-                    <TextView
-                        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="充值金额（不可提现，只可消费）" />
-
-
-
-                    <EditText
-                        android:id="@+id/et_recharge_price"
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        android:layout_marginTop="@dimen/content_padding_10"
-                        android:background="@null"
-                        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" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical"
-                    android:padding="@dimen/content_padding_13">
-
-                    <TextView
-                        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
-                        android:id="@+id/recharge_greidview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/content_padding_65"
-                        android:layout_marginRight="@dimen/content_padding_65"
-                        android:layout_marginTop="@dimen/content_padding_20"
-                        android:background="@color/white"
-                        android:gravity="center_horizontal"
-                        android:listSelector="@color/transparent"
-                        android:numColumns="1"
-                        android:scrollbars="none"
-                        android:visibility="visible" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <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"
-                android:text="立即支付" />
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

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

@@ -52,11 +52,9 @@
     <dimen name="content_padding_18">18dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>
     <dimen name="content_padding_22">22dp</dimen>
-    <dimen name="content_padding_25">25dp</dimen>
     <dimen name="content_padding_30">30dp</dimen>
     <dimen name="content_padding_35">35dp</dimen>
     <dimen name="content_padding_40">40dp</dimen>
-    <dimen name="content_padding_46">46dp</dimen>
     <dimen name="content_padding_54">54dp</dimen>
     <dimen name="content_padding_65">65dp</dimen>
     <dimen name="content_padding_80">80dp</dimen>
@@ -81,13 +79,9 @@
     <dimen name="view_size_80">80dp</dimen>
     <dimen name="view_size_90">90dp</dimen>
     <dimen name="view_size_100">100dp</dimen>
-    <dimen name="view_size_110">110dp</dimen>
     <dimen name="view_size_130">130dp</dimen>
-    <dimen name="view_size_136">136dp</dimen>
-    <dimen name="view_size_140">140dp</dimen>
     <dimen name="view_size_150">150dp</dimen>
     <dimen name="view_size_200">200dp</dimen>
-    <dimen name="view_size_250">250dp</dimen>
 
 
 </resources>

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

@@ -20,7 +20,5 @@
     <color name="main_tab">#AFAFAF</color>
     <color name="color_choose_head_tv_press">#ff2d4b</color>
     <color name="color_choose_head_tv">#444444</color>
-    <color name="my_money_tab">@color/white</color>
-    <color name="my_money_tab_activated">#444444</color>
 
 </resources>

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

@@ -8,7 +8,6 @@
     <color name="black_191919">#191919</color>
     <color name="black_444444">#444444</color>
     <color name="black_666666">#666666</color>
-    <color name="black_E6F3FB">#E6F3FB</color>
     <color name="white_bg_line">#dfdfdf</color>
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>