优化邀请好友界面;更新检查md5;弹窗广告删除跳过

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

@@ -23,6 +23,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.arialyy.aria.util.CommonUtil;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.kfzs.duanduan.react.ConfigUtil;
@@ -512,7 +513,7 @@ public class SysAppUtil {
                 public void onClick(final View view) {
                     if(view instanceof TextView)
                         UPGRADE_DIALOG_BT.onEvent("action", ((TextView) view).getText());
-                    if(file.exists()){//直接安装
+                    if(file.exists() && CommonUtil.checkMD5(version.getMd5_address(), file)){//文件存在并且md5值相同则直接安装
                         installApk(file);
                     } else if(TextUtils.isEmpty(version.getAddress())){//地址错误
                         G.showToast(R.string.error_download_link);

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

@@ -624,33 +624,33 @@ public class ViewUtil {
                     });
                 }
             }
-            RxjavaCountDownTimer timer = null;
-            if (advertising.getShow_time() > 0) {
-                ad_skip.setVisibility(View.VISIBLE);
-                dialog.setCancelable(false);
-                timer = RxjavaCountDownTimer.getInstance(BuildConfig.DEBUG ? 1 : advertising.getShow_time())
-                        .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
-                            @Override
-                            public void onFinish() {
-                                dialog.setCancelable(true);
-                                dialog_close.setVisibility(View.VISIBLE);
-                                ad_skip.setEnabled(true);
-                                ad_skip.setVisibility(View.GONE);
-                            }
-
-                            @Override
-                            public void onTicker(long time) {
-                                dialog.setCancelable(false);
-                                dialog_close.setVisibility(View.GONE);
-                                ad_skip.setEnabled(false);
-                                ad_skip.setText(activity.getString(R.string.tip_skip, time));
-                            }
-                        }).start();
-            } else {
-                ad_skip.setVisibility(View.GONE);
-            }
-
-            final RxjavaCountDownTimer finalTimer = timer;
+//            RxjavaCountDownTimer timer = null;
+//            if (advertising.getShow_time() > 0) {
+//                ad_skip.setVisibility(View.VISIBLE);
+//                dialog.setCancelable(false);
+//                timer = RxjavaCountDownTimer.getInstance(BuildConfig.DEBUG ? 1 : advertising.getShow_time())
+//                        .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
+//                            @Override
+//                            public void onFinish() {
+//                                dialog.setCancelable(true);
+//                                dialog_close.setVisibility(View.VISIBLE);
+//                                ad_skip.setEnabled(true);
+//                                ad_skip.setVisibility(View.GONE);
+//                            }
+//
+//                            @Override
+//                            public void onTicker(long time) {
+//                                dialog.setCancelable(false);
+//                                dialog_close.setVisibility(View.GONE);
+//                                ad_skip.setEnabled(false);
+//                                ad_skip.setText(activity.getString(R.string.tip_skip, time));
+//                            }
+//                        }).start();
+//            } else {
+//                ad_skip.setVisibility(View.GONE);
+//            }
+//
+//            final RxjavaCountDownTimer finalTimer = timer;
 
             dialog_close.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -670,9 +670,9 @@ public class ViewUtil {
             dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                 @Override
                 public void onDismiss(DialogInterface dialogInterface) {
-                    if (finalTimer != null) {
-                        finalTimer.clear();
-                    }
+//                    if (finalTimer != null) {
+//                        finalTimer.clear();
+//                    }
                     Jump2View.getInstance().tryShowReservation(activity);
                 }
             });

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

@@ -132,7 +132,7 @@ public class SheepApp extends BaseApplication {
         @Override
         public void onActivityCreated(final Activity activity, Bundle savedInstanceState) {
             ActivityManager.getInstance().pushActivity(activity);
-            if(activity instanceof SplashAct || activity instanceof LoginAct || activity instanceof PhoneAct){
+            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>() {

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

@@ -13,7 +13,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginEnd="@dimen/content_padding_10"
-        android:background="#F5F5F5"
+        android:background="#4cF5F5F5"
         android:visibility="invisible" />
 
     <include
@@ -27,7 +27,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginEnd="@dimen/content_padding_10"
-        android:background="#F5F5F5"
+        android:background="#4cF5F5F5"
         android:visibility="invisible" />
 
     <include
@@ -41,7 +41,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginEnd="@dimen/content_padding_10"
-        android:background="#F5F5F5"
+        android:background="#4cF5F5F5"
         android:visibility="invisible" />
 
     <include
@@ -55,7 +55,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginEnd="@dimen/content_padding_10"
-        android:background="#F5F5F5"
+        android:background="#4cF5F5F5"
         android:visibility="invisible" />
 
     <include
@@ -69,7 +69,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginEnd="@dimen/content_padding_10"
-        android:background="#F5F5F5"
+        android:background="#4cF5F5F5"
         android:visibility="invisible" />
 
     <include

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

@@ -6,15 +6,12 @@
     android:layout_height="match_parent"
     tools:context="com.sheep.gamegroup.view.activity.AskGetMoneyAct">
 
-
-    <include layout="@layout/title" />
-
     <android.support.v4.widget.NestedScrollView
         android:id="@+id/ask_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="60dp"
-        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginTop="-13dp"
         android:orientation="vertical"
         android:scrollbars="none">
 
@@ -135,7 +132,9 @@
                     android:layout_marginEnd="@dimen/content_padding_10"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
-                    android:padding="@dimen/content_padding_10">
+                    android:paddingStart="@dimen/content_padding_10"
+                    android:paddingEnd="@dimen/content_padding_10"
+                    android:paddingBottom="@dimen/content_padding_10">
 
                     <TextView
                         android:id="@+id/ask_top5_title"
@@ -332,6 +331,8 @@
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 
+
+    <include layout="@layout/title" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -7,7 +7,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="#E6E6E6" />
+        android:background="#4cE6E6E6" />
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingTop="@dimen/content_padding_10"
     android:paddingBottom="@dimen/content_padding_10"
     android:orientation="horizontal">
     <View