new spring festival

app/build.gradle

@@ -110,19 +110,6 @@ android {
             signingConfig signingConfigs.config
 
         }
-        sheepTheme {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [DUANDUAN_GRAPH    : "sheep",
-                                    DUANDUAN_DATASHARE: "sheep",
-                                    jpush_appkey      : "28b74d520261c6f78e3e0921",
-                                    umeng_app_key     : "5ab0a1da8f4a9d742900035f"
-            ]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
-            resValue "string", "app_name", "小绵羊"
-            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
-            signingConfig signingConfigs.config
-        }
     }
     sourceSets {
         main() {

app/src/main/java/com/kfzs/duanduan/utils/DateFormatUtils.java

@@ -1,8 +1,10 @@
 package com.kfzs.duanduan.utils;
 
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * Created by HooRang on 2017/3/3.
@@ -52,5 +54,18 @@ public class DateFormatUtils {
         return sdf.format(new Date(timestamp * 1000));
     }
 
+    public static long getTimeZoneMillis(String date, String... pattern) {
+        if (date == null || "".equals(date)) return 0l;
+        java.text.DateFormat df = null;
+        if (pattern != null && pattern.length > 0) df = new SimpleDateFormat(pattern[0]);
+        else df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+        try {
+            long time = df.parse(date).getTime();
+            return time;
+        } catch (ParseException e) {
+            return 0l;
+        }
+    }
 
 }

app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -49,8 +49,8 @@ public class NetModule {
     public Retrofit provideRetrofit(OkHttpClient okhttpClient) {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
-                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
-//                .baseUrl("http://ss.17xmy.com/v1/")
+//                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
+                .baseUrl("http://ss.17xmy.com/v1/")
 //                .baseUrl("http://10.8.220.239:8080/v1/")
 //                .baseUrl("http://10.8.240.193:8080/v1/")
                 .addConverterFactory(StringConverterFactory.create())

app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -3,7 +3,9 @@ package com.sheep.gamegroup.module.skin.util;
 import android.app.Activity;
 import android.text.TextUtils;
 
+import com.kfzs.duanduan.utils.DateFormatUtils;
 import com.sheep.gamegroup.absBase.AbsObserver;
+import com.sheep.gamegroup.dateview.DateUtil;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.util.LogUtil;
@@ -29,7 +31,7 @@ import skin.support.utils.SkinPreference;
 /**
  * Created by realicing on 2019/1/15.
  * realicing@sina.com
- *
+ * <p>
  * 换肤工具类
  */
 public class SkinUtil {
@@ -53,13 +55,14 @@ public class SkinUtil {
     }
 
     public static final String KEY_CUR_SKIN_MD5 = "cur_skin";//当前正在使用的皮肤的key
+
     //切换皮肤
     public static void changeSkin(Action1<Object> action1) {
         Plugin willLoadPlugin = getSkinByTime();//需要加载的皮肤
         String curSkinMd5 = PreferenceUtils.getPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, null);
-        if(willLoadPlugin == null){//默认皮肤
+        if (willLoadPlugin == null) {//默认皮肤
             String curSkinName = SkinPreference.getInstance().getSkinName();
-            if(TextUtils.isEmpty(curSkinMd5) || !TextUtils.isEmpty(curSkinName)){
+            if (TextUtils.isEmpty(curSkinMd5) || !TextUtils.isEmpty(curSkinName)) {
                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, "");
                 restoreDefaultTheme();
             }
@@ -74,14 +77,14 @@ public class SkinUtil {
                     @Override
                     public void onNext(Plugin plugin) {
                         File file = SheepPluginUtil.getFile(plugin);
-                        if(!file.exists()){//检查文件是否存在
+                        if (!file.exists()) {//检查文件是否存在
                             action1.call(null);
                             return;
                         }
                         String md5 = Md5Util.getFileMD5(file);
                         String skinName = SheepPluginUtil.getFileName(willLoadPlugin);
                         String curSkinName = SkinPreference.getInstance().getSkinName();
-                        if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5) && TextUtils.equals(skinName, curSkinName)){//已经加载皮肤
+                        if (curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5) && TextUtils.equals(skinName, curSkinName)) {//已经加载皮肤
                             action1.call(null);
                             return;
                         }
@@ -110,44 +113,38 @@ public class SkinUtil {
     }
 
     public static boolean isUserPlugin = true;
+
     //根据时间生成对应的主题
     public static Plugin getSkinByTime() {
-        if(!isUserPlugin){
+        if (!isUserPlugin) {
             return null;
         }
-        java.util.Calendar curCalendar = java.util.Calendar.getInstance();
-        int year = curCalendar.get(java.util.Calendar.YEAR);
-        int month = curCalendar.get(java.util.Calendar.MONTH);
-        int day = curCalendar.get(java.util.Calendar.DAY_OF_MONTH);
-        if(isNewYear(year, month, day)){//春节
+        if (isNewYear()) {//春节
             return Plugin.skin_new_year;
-        } else if(isChristmas(year, month, day)){//元旦
-            return Plugin.skin_christmas;
         }
         return null;
     }
 
-    private static boolean isChristmas(int year, int month, int day) {
-        return year == 2019 && month == 1 && day == 1;
-    }
-
-    private static boolean isNewYear(int year, int month, int day) {
-        return false;//year == 2019 && month < 4 ;//&& day < 20 && day < 3;
+    private static boolean isNewYear() {
+        long time = DateFormatUtils.getTimeZoneMillis("2020-02-11", "yyyy-MM-dd");
+        return System.currentTimeMillis() < time;
     }
 
     public static String getSkinPath(String skinName) {
         return SheepPluginUtil.getFileByName(skinName, getSkinByTime()).getAbsolutePath();
     }
+
     //获取应用图标
-    public static int getAppIcon(){
+    public static int getAppIcon() {
         return R.mipmap.icon;
     }
 
     /**
      * 是否加载的是春节皮肤
+     *
      * @return
      */
-    public static boolean isLoadNewYearSkin(){
+    public static boolean isLoadNewYearSkin() {
         return getSkinByTime() == Plugin.skin_new_year;
     }
 }

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

@@ -1154,7 +1154,7 @@ public class Jump2View {
      * @param o
      */
     public void goMyMoney(Context context, Object o) {
-        Intent intent = new Intent(context, SkinUtil.isLoadNewYearSkin() ? NewYearActMyMoney.class : ActMyMoney.class);
+        Intent intent = new Intent(context, ActMyMoney.class);
         context.startActivity(intent);
         USER_MY_MONEY.onEvent();
     }

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

@@ -110,7 +110,6 @@ public class ActMyMoney extends BaseActivity {
                 .setTitle(this, "我的资产")
                 .setTitleFinish(this);
         //顶部背景添加弧度
-        GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
         mAdapter.add(new FgtRechargeLog(), tabNames[0]);
         mAdapter.add(new FgtRechargeBalanceLog(), tabNames[1]);

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

@@ -115,8 +115,8 @@ public class Config {
         initSMALL_STATION_URL();
     }
     public static void initSMALL_STATION_URL(){
-        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
-//        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
+//        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
+        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
     }
     public static String getUrlByPath(String path, Object...query){
         String url = SMALL_STATION_URL + path;

app/src/sheepTheme/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -1,58 +0,0 @@
-package com.sheep.jiuyan.samllsheep.wxapi;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.sheep.gamegroup.event.WXLoginAuthEvent;
-import com.sheep.jiuyan.samllsheep.Config;
-import com.tencent.mm.opensdk.modelbase.BaseReq;
-import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.modelmsg.SendAuth;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.umeng.socialize.weixin.view.WXCallbackActivity;
-
-import org.greenrobot.eventbus.EventBus;
-
-public class WXEntryActivity extends WXCallbackActivity {//implements IWXAPIEventHandler
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        IWXAPI wxapi = WXAPIFactory.createWXAPI(this, Config.WX_AUTH_APP_ID, true);
-        wxapi.registerApp(Config.WX_AUTH_APP_ID);
-        wxapi.handleIntent(getIntent(), this);
-        finish();
-    }
-
-    @Override
-    public void onNewIntent(Intent newIntent) {
-        IWXAPI wxapi = WXAPIFactory.createWXAPI(this, Config.WX_AUTH_APP_ID, true);
-        wxapi.registerApp(Config.WX_AUTH_APP_ID);
-        wxapi.handleIntent(getIntent(), this);
-        finish();
-    }
-
-    @Override
-    public void onReq(BaseReq baseReq) {
-        if(!(baseReq instanceof SendAuth.Req)){
-            super.onReq(baseReq);
-        }
-    }
-
-    @Override
-    public void onResp(BaseResp resp) {
-        if (resp instanceof SendAuth.Resp) {
-            if (resp.errCode == BaseResp.ErrCode.ERR_OK) {
-                String code = ((SendAuth.Resp) resp).code;
-                EventBus.getDefault().post(new WXLoginAuthEvent(code));
-            } else{
-                EventBus.getDefault().post(new WXLoginAuthEvent(null));
-            }
-        } else {
-            super.onResp(resp);
-        }
-    }
-
-}

app/src/sheepTheme/java/com/sheep/jiuyan/samllsheep/wxapi/WXPayEntryActivity.java

@@ -1,7 +0,0 @@
-package com.sheep.jiuyan.samllsheep.wxapi;
-
-
-import com.sheep.gamegroup.module.pay.activity.SheepWXPayEntryActivity;
-
-public class WXPayEntryActivity extends SheepWXPayEntryActivity {
-}

skin_newYear/src/main/res/color/selector_color_tab2.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="#2ebef2" />
-    <item android:state_activated="true" android:color="#2ebef2" />
-    <item android:state_focused="true" android:color="#2ebef2" />
-    <item android:state_checked="true" android:color="#2ebef2"/>
-    <item android:state_selected="true" android:color="#2ebef2"/>
-    <item android:state_pressed="true" android:color="#2ebef2"/>
-    <item android:color="@color/color_tab_nor"/>
-</selector>

skin_newYear/src/main/res/drawable/bg_h_dgtg1.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="70dp" android:width="1dp"/>
-</shape>

skin_newYear/src/main/res/drawable/bg_h_dgtg2.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="15dp" android:width="1dp"/>
-</shape>

skin_newYear/src/main/res/drawable/button_full_normal_gray.xml

@@ -1,10 +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="30dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/gray_6" />
-    <solid android:color="@color/gray_6" />
-</shape>

skin_newYear/src/main/res/drawable/drawable_selector_askgetmoney.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/tab_click_yaoqing" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_click_yaoqing" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_yaoqing"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_bg_home_search.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/skin_drawable_selector_bg_home_search"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_find.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/homepage_faxian_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/homepage_faxian_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/homepage_faxian"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_game_center.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/tab_game_blue" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_game_blue" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_game"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_ic_home_download.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/index_download_white"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_ic_home_search.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/search_white_img"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_personalcenter.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/homepage_wode_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/homepage_wode_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/homepage_wode"/>
-
-</selector>

skin_newYear/src/main/res/drawable/drawable_selector_task.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/homepage_zhuanqian"/>
-
-</selector>

skin_newYear/src/main/res/drawable/selector_btn_blue.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
-  <item android:state_focused="true" android:drawable="@mipmap/huanyig" />
-  <item android:state_checked="true" android:drawable="@mipmap/huanyig"/>
-  <item android:state_selected="true" android:drawable="@mipmap/huanyig"/>
-  <item android:state_pressed="true" android:drawable="@mipmap/huanyig"/>
-  <item android:drawable="@mipmap/huanyig"/>
-</selector>

skin_newYear/src/main/res/drawable/selector_btn_purple.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
-  <item android:state_focused="true" android:drawable="@mipmap/huanyig" />
-  <item android:state_checked="true" android:drawable="@mipmap/huanyig"/>
-  <item android:state_selected="true" android:drawable="@mipmap/huanyig"/>
-  <item android:state_pressed="true" android:drawable="@mipmap/huanyig"/>
-  <item android:drawable="@mipmap/huanyig"/>
-</selector>

skin_newYear/src/main/res/drawable/shape_f81b5f_rec_7.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="7dp"/>
-    <solid android:color="#1FC351" />
-</shape>

skin_newYear/src/main/res/drawable/shape_gradient_main.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/skin_drawable_selector_bg_home_search"/>
-
-</selector>

skin_newYear/src/main/res/drawable/shape_red_stroke_rectangle_no_lb.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="10dp"
-        android:topRightRadius="10dp"
-        android:bottomRightRadius="10dp"/>
-    <stroke
-        android:width="1px"
-        android:color="#FDDD36" />
-
-</shape>

skin_newYear/src/main/res/values/colors.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="tc_dialog_gtg_name">#ffffff</color>
-    <color name="tc_dialog_gtg_amout">#ffffff</color>
-    <color name="red_FD2D54">#FDDD36</color>
-    <color name="bg_home_color">#CB0404</color>
-    <color name="color_bg_line_home">#EDEAEA</color>
-    <color name="tc_home_search_1">#66ffffff</color>
-    <color name="tc_home_search_2">#ffffff</color>
-    <color name="color_tab_nor">#ffffff</color>
-</resources>

skin_newYear/src/main/res/values/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="ts_dialog_gtg_name">12sp</dimen>
-</resources>

skin_newYear/src/main/res/values/view_colors.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="gray_6">#D9D9D9</color>
-</resources>