添加星域互娱的产品

app/build.gradle

@@ -79,6 +79,20 @@ android {
             signingConfig signingConfigs.config
 
         }
+        xyhy {
+            applicationId "com.xin.yu.hu.yu"
+            manifestPlaceholders = [
+                    DUANDUAN_GRAPH    : "xmy_xyhy",
+                    DUANDUAN_DATASHARE: "xmy_xyhy",
+            ]
+            buildConfigField "String", "DUANDUAN_DATASHARE", '"xmy_xyhy"'
+            buildConfigField "String", "DUANDUAN_GRAPH", '"xmy_xyhy"'
+            buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
+            buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
+            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
+            signingConfig signingConfigs.config
+
+        }
     }
 }
 

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -67,14 +67,14 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                 if(throwable.message.startsWith("{")){
                     baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
                 }else if(ViewUtil.isH5Content(throwable.message)){
-                    if(BuildConfig.DEBUG){
-                        StringBuilder title = new StringBuilder("调用接口错误");
-                        if(e instanceof HttpException) {
-                            title.append(";");
-                            title.append(((HttpException) e).response().toString());
-                        }
-                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
-                    }
+//                    if(BuildConfig.DEBUG){
+//                        StringBuilder title = new StringBuilder("调用接口错误");
+//                        if(e instanceof HttpException) {
+//                            title.append(";");
+//                            title.append(((HttpException) e).response().toString());
+//                        }
+//                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
+//                    }
                     baseMessage = new BaseMessage();
                     baseMessage.setMsg("服务器错误");
                 }else {

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

@@ -45,59 +45,18 @@ public enum ConnectAddress {
 
         @Override
         public String getName() {
-            return "正式服";
+            return "闪游";
         }
-    },sheeplishuyang {
+    },xyhy {
 
         @Override
         public String getAppUrl() {
-            return "http://10.8.210.170:8080/";
-        }
-        @Override
-        public String getName() {
-            return "李抒阳";
-        }
-    },
-    sheepzhangweiIOS {
-
-        @Override
-        public String getAppUrl() {
-            return "http://10.8.210.171:8080/";
-        }
-        @Override
-        public String getName() {
-            return "张伟IOS";
-        }
-    },sheeptestIOS {
-
-        @Override
-        public String getAppUrl() {
-            return "http://test.sheep.kfzs.com/";
-        }
-        @Override
-        public String getName() {
-            return "测试服IOS";
-        }
-    },sheepIOS {
-
-        @Override
-        public String getAppUrl() {
-            return "http://ss.kfzs.com/";
-        }
-
-        @Override
-        public String getName() {
-            return "正式服IOS";
+            return "http://sheepapi.lex.9yan.io/";
         }
-    },sheeplishuyangIOS {
 
         @Override
-        public String getAppUrl() {
-            return "http://10.8.210.170:8080/";
-        }
-        @Override
         public String getName() {
-            return "李抒阳IOS";
+            return "星狱互娱";
         }
     };
     public abstract String getAppUrl();

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:topLeftRadius="18dp" android:topRightRadius="18dp" />
-    <solid android:color="#2ebef2" />
+    <solid android:color="@color/dia_title" />
 </shape>

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

@@ -13,9 +13,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-        app:tabIndicatorColor="#4bc1fe"
+        app:tabIndicatorColor="@color/tab_activated"
         app:tabGravity="fill"
-        app:tabSelectedTextColor="#4bc1fe"
+        app:tabSelectedTextColor="@color/tab_activated"
         app:tabTextColor="#444444"
         app:tabMode="fixed" />
 

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

@@ -103,7 +103,7 @@
             android:id="@+id/my_money_withdraw_tv"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:textColor="#34A6E7"
+            android:textColor="@color/ti_xian"
             android:gravity="center"
             android:background="@drawable/shape_white_solid_rectangle"
             android:paddingStart="@dimen/content_padding_30"
@@ -136,10 +136,10 @@
         android:layout_marginTop="-25dp"
         android:background="@drawable/shape_white_solid_rectangle_small"
         app:tabGravity="fill"
-        app:tabIndicatorColor="#4bc1fe"
+        app:tabIndicatorColor="@color/tab_activated"
         app:tabIndicatorHeight="0dp"
         app:tabMode="fixed"
-        app:tabSelectedTextColor="#4bc1fe"
+        app:tabSelectedTextColor="@color/tab_activated"
         app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
         app:tabTextColor="#444444" />
 

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

@@ -99,9 +99,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-        app:tabIndicatorColor="#4bc1fe"
+        app:tabIndicatorColor="@color/tab_activated"
         app:tabGravity="fill"
-        app:tabSelectedTextColor="#4bc1fe"
+        app:tabSelectedTextColor="@color/tab_activated"
         app:tabTextColor="#444444"
         android:background="@color/white"
         app:tabMode="fixed" />

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

@@ -22,5 +22,8 @@
     <color name="color_choose_head_tv">#444444</color>
     <color name="my_money_tab_activated">#2ec0f3</color>
     <color name="my_money_tab">#444444</color>
+    <color name="tab_activated">#4bc1fe</color>
+    <color name="dia_title">#2ebef2</color>
+    <color name="ti_xian">#34A6E7</color>
 
 </resources>

app/src/xyhy/res/values/color_app_theme_colors.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--app theme color-->
+    <color name="btn_color_main">#ffffff</color>
+
+    <color name="theme_app_main">#ffd600</color>
+    <color name="theme_app_mid">#ffa500</color>
+    <color name="theme_app_highlight">#ffd600</color>
+    <color name="theme_app_highlight_more">#ffa500</color>
+    <color name="theme_app_highlight_transparent">#ccffd600</color>
+    <color name="theme_app_highlight_more_transparent">#ccffa500</color>
+
+    <!--app theme info color-->
+    <color name="theme_app_info_dark">#ff9300</color>
+
+    <!--app theme gray color-->
+
+    <!--app theme warning color-->
+    <color name="theme_app_tv_warning">#ff0006</color>
+
+    <!--divider-->
+    <color name="theme_app_divider_color">#f5f5f5</color>
+
+</resources>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--APP的相关主要颜色值-->
+    <color name="colorPrimary">@color/white_DEDEDE</color>
+    <color name="colorPrimaryDark">@color/blue_FF53BBF2</color>
+    <color name="colorAccent">#FF842C</color>
+    <!--APP中的文本颜色主要值-->
+    <color name="black_text_deep">#333333</color>
+    <color name="black_text_gray">#898989</color>
+    <color name="yellow_text_light">#edea04</color>
+    <!--APP中的主要非白色背景的底色-->
+    <color name="background_light_gray">#efefef</color>
+    <!--分割线的统一颜色-->
+
+    <!--所有文本都用标准大小，从来不自己写数值-->
+    <dimen name="text_size_8sp">8sp</dimen>
+    <dimen name="text_size_1">9sp</dimen>
+    <dimen name="text_size_2">11sp</dimen>
+    <dimen name="text_size_3">14sp</dimen>
+    <dimen name="text_size_4">16sp</dimen>
+    <dimen name="text_size_5">18sp</dimen>
+    <dimen name="text_size_10">10sp</dimen>
+    <dimen name="text_size_12">12sp</dimen>
+    <dimen name="text_size_15">15sp</dimen>
+    <dimen name="text_size_16">16sp</dimen>
+    <dimen name="text_size_17">17sp</dimen>
+    <dimen name="text_size_20">20sp</dimen>
+    <dimen name="text_size_25">25sp</dimen>
+    <dimen name="text_size_32">32sp</dimen>
+
+    <!--一般layout的高度-->
+    <dimen name="layout_heigh_default">48dp</dimen>
+    <dimen name="status_bar_height">24dp</dimen>
+    <dimen name="edt_heigh_default">40dp</dimen>
+
+    <!--下载按钮的style-->
+
+
+    <!--APP中的主要内容的各种间距值pading默认值和较大值-->
+    <dimen name="content_padding_3">3dp</dimen>
+    <dimen name="content_padding_2">2dp</dimen>
+    <dimen name="content_padding_small">6dp</dimen>
+    <dimen name="content_padding_8">8dp</dimen>
+    <dimen name="content_padding_big">18dp</dimen>
+    <dimen name="content_padding_10">10dp</dimen>
+    <dimen name="content_padding_13">13dp</dimen>
+    <dimen name="content_padding_15">15dp</dimen>
+    <dimen name="content_padding_18">18dp</dimen>
+    <dimen name="content_padding_20">20dp</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_65">65dp</dimen>
+    <dimen name="content_padding_80">80dp</dimen>
+    <dimen name="content_padding_100">100dp</dimen>
+    <dimen name="content_padding_120">120dp</dimen>
+    <dimen name="content_padding_140">140dp</dimen>
+
+
+    <!--下面的tagid用于设置tag使用-->
+
+    <!--radius size-->
+    <dimen name="radius_25">25dp</dimen>
+    <dimen name="radius_20">20dp</dimen>
+
+    <dimen name="view_size_20">20dp</dimen>
+    <dimen name="view_size_30">30dp</dimen>
+    <dimen name="view_size_45">45dp</dimen>
+    <dimen name="view_size_55">55dp</dimen>
+    <dimen name="view_size_60">60dp</dimen>
+    <dimen name="view_size_65">65dp</dimen>
+    <dimen name="view_size_73">73dp</dimen>
+    <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/xyhy/res/values/dd_colors.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--app item-->
+    <color name="item_shadow">#777777</color>
+    <color name="item_transparent">#00000000</color>
+
+    <color name="button_reset_pressed">#b3b3b3</color>
+
+    <!--app bg-->
+    <color name="app">#f8f8f8</color>
+    <color name="bg_write">#ffffff</color>
+    <color name="bg_tv_half_transparent">#cd333333</color>
+
+    <!--app text view-->
+    <color name="tv_gray">#545454</color>
+    <color name="tv_fail_tip">#595959</color>
+    <color name="tv_about_text">#b2b2b2</color>
+    <color name="B">#000000</color>
+    <color name="main_tab_activated">#ffb200</color>
+    <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_activated">#ffc000</color>
+    <color name="my_money_tab">#444444</color>
+    <color name="tab_activated">#ffc100</color>
+    <color name="dia_title">#ffbe00</color>
+    <color name="ti_xian">#ffA600</color>
+
+</resources>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="txt_black">#010101</color>
+    <color name="white_light">#F8F8F8</color>
+    <color name="white_F9F9F9">#F9F9F9</color>
+    <color name="txt_white">#FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="black_191919">#191919</color>
+    <color name="black_444444">#444444</color>
+    <color name="white_bg_line">#dfdfdf</color>
+    <color name="txt_red">#ff2d4b</color>
+    <color name="txt_bule">#ff8900</color>
+    <color name="bg_gray">#F9F9F9</color>
+    <color name="txt_black_404040">#404040</color>
+    <color name="txt_gray_929292">#929292</color>
+    <color name="txt_gray_e6e4e4">#e6e4e4</color>
+    <color name="red_fd2d54">#fd2d54</color>
+    <color name="txt_black_818181">#818181</color>
+    <color name="txt_black_8e8e8e">#8e8e8e</color>
+    <color name="txt_black_9e9c9c">#9e9c9c</color>
+    <color name="txt_black_cc444444">#cc444444</color>
+    <color name="txt_black_565656">#565656</color>
+    <color name="txt_red_ff4a5f">#ff4a5f</color>
+
+    <color name="yellow2_start">#FCD586</color>
+    <color name="yellow2_end">#FDB812</color>
+    <color name="yellow_start">#f4c76c</color>
+    <color name="yellow_end">#fd9c11</color>
+    <color name="blue_start">#fcd586</color>
+    <color name="blue_end">#fdb811</color>
+    <color name="blue_34a6e7">#ffa600</color>
+    <color name="blue_FF53BBF2">#FFffBB00</color>
+    <color name="blue_36A6E6">#ffA600</color>
+    <color name="blue_2EC2F7">#ffC200</color>
+    <color name="white_DEDEDE">#DEDEDE</color>
+    <color name="white_ededed">#ededed</color>
+    <color name="white_FFF7F7F7">#FFF7F7F7</color>
+    <color name="gray_F2F2F2">#F2F2F2</color>
+    <color name="green_60BE5E">#60BE5E</color>
+
+</resources>

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

@@ -0,0 +1,47 @@
+<resources>
+    <string name="app_name">funplus</string>
+    <string name="sprogress_string">当前进度%.1f%%</string>
+    <string name="get_captcha">获取验证码</string>
+    <string name="input_your_phone">请输入你的手机号</string>
+    <string name="input_your_captcha">请输验证码</string>
+    <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_withdrawal_notice_text">你的每次收入提现，我们都会通过微信的企业商户入账功能将收入实时入账到绑定微信号的微信零钱上</string>
+    <string name="no_bind_wx_notice_text">未绑定微信号，无法入账到你的微信零钱</string>
+    <string name="no_bind_tel_notice_text">我们已将你的手机号与该帐号绑定，如有变更，请点击</string>
+    <string name="coming_soon">敬请期待</string>
+    <string name="loading_data">数据正在加载中，请稍候重试</string>
+    <string name="service_error">服务器错误，请稍候再试</string>
+    <string name="unknown_error">未知错误，请稍候再试</string>
+    <string name="error_download_link">下载地址错误，请联系客服</string>
+    <string name="error_package_link">包名错误，请联系客服</string>
+    <string name="last_page">&#060;</string>
+    <string name="next_page">&#062;</string>
+
+    <string name="total_money">绵羊币总资产：%s元</string>
+    <string name="task_reward">任务奖励：%s元</string>
+    <string name="agent_extract">代理提成：%s元</string>
+    <string name="recharge_amount">充值金额：%s元</string>
+    <string name="available_amount">可提现金额：%s元</string>
+    <string name="rechargeq_amount">当前绵羊币余额：%s元</string>
+
+    <string name="feedback_notice_hellow">致亲爱的您，\n &#160;&#160;&#160;&#160;&#160;我们会重视您提出的每一个建议。您的批评与意见是我们产品前进的动力，感谢您对funplusAPP的支持！</string>
+    <string name="feedback_notice_end">funplus项目组全体人员</string>
+    <string name="feedback_notice_input_advice">请输入您的建议...</string>
+    <string name="feedback_notice_input_email_address">请输入您的邮箱地址</string>
+    <string name="contact_qq_email">联系QQ/邮箱</string>
+    <string name="input_notice_feedback">请留下您的联系方式，我们会不定期地给予优质建议提供丰厚奖励哦!</string>
+    <string name="accessibility_desc">funplus任务</string>
+    <string name="sign_card_text">·每日<font color="red">00:00-23:59:00</font>之间支付<font color="red">1</font>元，即可有机会参与次日打卡活动;\n·次日早晨<font color="red">07:00-09:00</font>时间段参与打卡后，可平分前日奖金池内全部现金,
+    打卡失败则不可参与当日奖金分配;\n·若当日无人参与打卡平分现金活动，则今日奖池金额累加到明日奖池中\n·每日平分金额于早9点后开始结算，系统将于12小时内发放到个人账户,因网络原因,部分用户
+    可能出现不及时到账的情况,可与我们客服联系,感谢您的谅解。\n·本活动最终解释权归橙风有量科技有限公司所有.</string>
+
+    <string name="sign_record_money">%s元</string>
+    <string name="sign_record_item_money">打卡成功，获得奖励%s元</string>
+    <string name="sign_tv_srecord_money">累计成功打卡%1$s天，连续成功打卡%2$s天</string>
+    <string name="sign_number">今日已有%1$s人参与打卡</string>
+    <string name="sign_number1">今日已有%1$s人参与报名</string>
+    <string name="sign_jppj">￥%s</string>
+</resources>