Просмотр исходного кода

删除多余文件,修改启动时间

zengjiebin лет назад: 8
Родитель
Сommit
4880a63575
25 измененных файлов с 9 добавлено и 163 удалено
  1. 4 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  2. 0 16
      app/src/main/java/com/sheep/gamegroup/di/components/SplashComponent.java
  3. 0 24
      app/src/main/java/com/sheep/gamegroup/di/modules/SplashModule.java
  4. 0 14
      app/src/main/java/com/sheep/gamegroup/presenter/SplashContract.java
  5. 0 20
      app/src/main/java/com/sheep/gamegroup/presenter/SplashPresenter.java
  6. 5 46
      app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java
  7. BIN
      app/src/main/res/drawable-xhdpi/tab_personalcenter.png
  8. BIN
      app/src/main/res/drawable-xhdpi/tab_personalcenter.webp
  9. BIN
      app/src/main/res/drawable-xhdpi/tab_personalcenter_click.png
  10. BIN
      app/src/main/res/drawable-xhdpi/tab_personalcenter_click.webp
  11. 0 30
      app/src/main/res/layout/act_understand_sheep.xml
  12. 0 1
      app/src/main/res/layout/adp_homelist_listview.xml
  13. 0 3
      app/src/main/res/layout/fgt_credit_card_task_list.xml
  14. 0 1
      app/src/main/res/layout/fgt_personacenter_item_top.xml
  15. 0 1
      app/src/main/res/layout/homepage_item_liy_q.xml
  16. 0 1
      app/src/main/res/layout/recharge_act_layout.xml
  17. 0 2
      app/src/main/res/layout/withdrawal_layout.xml
  18. BIN
      app/src/main/res/mipmap-xhdpi/personalc_ic_task_history.webp
  19. BIN
      app/src/main/res/mipmap-xhdpi/task_daily_check.webp
  20. BIN
      app/src/main/res/mipmap-xhdpi/task_log_in.webp
  21. BIN
      app/src/main/res/mipmap-xhdpi/task_online_time.webp
  22. BIN
      app/src/main/res/mipmap-xhdpi/x_ic_withdrawal.webp
  23. 0 1
      app/src/main/res/values/common.xml
  24. 0 1
      app/src/main/res/values/gamegroup_color.xml
  25. 0 1
      app/src/main/res/values/str_appstore_strings.xml

+ 4 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -431,7 +431,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 Jump2View.getInstance().tryGoWxfz(activity,null);
                 break;
             case R.id.icon_layout://
-                Jump2View.getInstance().goUnderstandSheep(activity, null);
+                if(BuildConfig.DEBUG)
+                    Jump2View.getInstance().goUnderstandSheep(activity, null);
+                else
+                    Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
             case R.id.info_layout://其它信息
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);

+ 0 - 16
app/src/main/java/com/sheep/gamegroup/di/components/SplashComponent.java

@@ -1,16 +0,0 @@
-package com.sheep.gamegroup.di.components;
-
-import com.sheep.gamegroup.di.modules.SplashModule;
-import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.SplashAct;
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/3/9.
- */
-@UserScope
-@Component(modules = SplashModule.class, dependencies = NetComponent.class)
-public interface SplashComponent {
-    void inject(SplashAct splashAct);
-}

+ 0 - 24
app/src/main/java/com/sheep/gamegroup/di/modules/SplashModule.java

@@ -1,24 +0,0 @@
-package com.sheep.gamegroup.di.modules;
-
-import com.sheep.gamegroup.presenter.SplashContract;
-
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Created by ljy on 2018/3/9.
- */
-
-@Module
-public class SplashModule {
-
-    private SplashContract.View view;
-
-    public SplashModule(SplashContract.View view) {
-        this.view = view;
-    }
-    @Provides
-    public SplashContract.View provideView(){
-        return view;
-    }
-}

+ 0 - 14
app/src/main/java/com/sheep/gamegroup/presenter/SplashContract.java

@@ -1,14 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-/**
- * Created by Administrator on 2018/3/9.
- */
-
-public interface SplashContract {
-    interface Presenter{
-
-    }
-    interface View{
-
-    }
-}

+ 0 - 20
app/src/main/java/com/sheep/gamegroup/presenter/SplashPresenter.java

@@ -1,20 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-import com.sheep.gamegroup.model.api.ApiService;
-
-import javax.inject.Inject;
-
-/**
- * Created by ljy on 2018/3/9.
- */
-
-public class SplashPresenter implements SplashContract.Presenter {
-    private SplashContract.View view;
-    private ApiService apiService;
-
-    @Inject
-    public SplashPresenter(SplashContract.View view, ApiService apiService) {
-        this.view = view;
-        this.apiService = apiService;
-    }
-}

+ 5 - 46
app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -1,14 +1,13 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.Manifest;
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
@@ -19,18 +18,12 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.di.components.DaggerSplashComponent;
-import com.sheep.gamegroup.di.modules.SplashModule;
-import com.sheep.gamegroup.presenter.SplashContract;
-import com.sheep.gamegroup.presenter.SplashPresenter;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.OnClick;
 import pub.devrel.easypermissions.AfterPermissionGranted;
@@ -40,14 +33,11 @@ import pub.devrel.easypermissions.EasyPermissions;
  * Created by ljy on 2018/3/9.
  */
 
-public class SplashAct extends BaseActivity implements SplashContract.View, EasyPermissions.PermissionCallbacks {
+public class SplashAct extends BaseActivity implements EasyPermissions.PermissionCallbacks {
     @BindView(R.id.btn_join)
     TextView btnJoin;
     private Activity activity;
 
-    @Inject
-    SplashPresenter presenter;
-
     private boolean isClick;
 
     private static final int PERMISSON_REQUESTCODE = 1;
@@ -84,11 +74,11 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
 //
 //            }else {
 //            }
-            mHandler.sendEmptyMessageDelayed(0, 5000);
+            mHandler.sendEmptyMessageDelayed(0, BuildConfig.DEBUG ? 100 : 1000);
         }
     }
 
-    Handler mHandler = new Handler(){
+    Handler mHandler = new Handler(Looper.getMainLooper()){
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
@@ -107,11 +97,6 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
 
     @Override
     public void initView() {
-
-        DaggerSplashComponent.builder()
-                .netComponent(SheepApp.get(this).getNetComponent())
-                .splashModule(new SplashModule(this))
-                .build().inject(this);
         activity = this;
     }
 
@@ -186,32 +171,6 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
 
     }
 
-    private void animWelcomeImage() {
-        ObjectAnimator animator = ObjectAnimator.ofFloat(null, "translationX", -100F);
-        animator.setDuration(1500L).start();
-        animator.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                goMain();
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

BIN
app/src/main/res/drawable-xhdpi/tab_personalcenter.png


BIN
app/src/main/res/drawable-xhdpi/tab_personalcenter.webp


BIN
app/src/main/res/drawable-xhdpi/tab_personalcenter_click.png


BIN
app/src/main/res/drawable-xhdpi/tab_personalcenter_click.webp


+ 0 - 30
app/src/main/res/layout/act_understand_sheep.xml

@@ -232,7 +232,6 @@
                 android:layout_marginTop="1660dp">
 
                 <ImageView
-                    android:id="@+id/understand_sheep_a_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -244,7 +243,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_a_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -254,7 +252,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:id="@+id/understand_sheep_b_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -266,7 +263,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_b_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -302,7 +298,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_a_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -315,7 +310,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_b_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -328,7 +322,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_a_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -341,7 +334,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_b_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -354,7 +346,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_a_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"
@@ -367,7 +358,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_b_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"
@@ -386,7 +376,6 @@
                 android:layout_marginTop="1890dp">
 
                 <ImageView
-                    android:id="@+id/understand_sheep_c_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -398,7 +387,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_c_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -408,7 +396,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:id="@+id/understand_sheep_d_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -420,7 +407,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_d_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -456,7 +442,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_c_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -469,7 +454,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_d_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -482,7 +466,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_c_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -495,7 +478,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_d_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -508,7 +490,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_c_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"
@@ -521,7 +502,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_d_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"
@@ -541,7 +521,6 @@
                 android:layout_marginTop="2126dp">
 
                 <ImageView
-                    android:id="@+id/understand_sheep_e_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -553,7 +532,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_e_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -563,7 +541,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:id="@+id/understand_sheep_f_iv"
                     android:layout_width="49dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -575,7 +552,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
-                    android:id="@+id/understand_sheep_f_v"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="24dp"
@@ -611,7 +587,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_e_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -624,7 +599,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_f_tv_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="150dp"
@@ -637,7 +611,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_e_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -650,7 +623,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_f_tv_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="170dp"
@@ -663,7 +635,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_e_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"
@@ -676,7 +647,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/understand_sheep_f_tv_4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="190dp"

+ 0 - 1
app/src/main/res/layout/adp_homelist_listview.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/lying_qb_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"

+ 0 - 3
app/src/main/res/layout/fgt_credit_card_task_list.xml

@@ -55,19 +55,16 @@
             app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_1"
             app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_1"/>
         <View
-            android:id="@+id/credit_card_task_list_tip_circle_2"
             style="@style/style_circle_main_v"
             app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
             app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_2"
             app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_2"/>
         <View
-            android:id="@+id/credit_card_task_list_tip_circle_3"
             style="@style/style_circle_main_v"
             app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
             app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_3"
             app:layout_constraintEnd_toEndOf="@+id/credit_card_task_list_tip_tv_3"/>
         <View
-            android:id="@+id/credit_card_task_list_tip_circle_4"
             style="@style/style_circle_main_v"
             app:layout_constraintBaseline_toBaselineOf="@+id/credit_card_task_list_tip_circle_1"
             app:layout_constraintStart_toStartOf="@+id/credit_card_task_list_tip_tv_4"

+ 0 - 1
app/src/main/res/layout/fgt_personacenter_item_top.xml

@@ -55,7 +55,6 @@
         android:padding="@dimen/content_padding_15">
 
         <ImageView
-            android:id="@+id/personalcenter_item_price_iv"
             android:layout_width="@dimen/content_padding_20"
             android:layout_height="@dimen/content_padding_20"
             android:src="@mipmap/personalc_ic_my_price"

+ 0 - 1
app/src/main/res/layout/homepage_item_liy_q.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/lying_qb_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"

+ 0 - 1
app/src/main/res/layout/recharge_act_layout.xml

@@ -55,7 +55,6 @@
                         android:visibility="visible" />
 
                     <EditText
-                        android:id="@+id/et_charge_price"
                         android:layout_width="match_parent"
                         android:layout_height="40dp"
                         android:layout_marginTop="@dimen/content_padding_10"

+ 0 - 2
app/src/main/res/layout/withdrawal_layout.xml

@@ -26,7 +26,6 @@
                 android:padding="@dimen/content_padding_20"
                 android:layout_margin="@dimen/content_padding_15">
                 <TextView
-                    android:id="@+id/withdrawal_wx_pre_notice_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="当前的提现绑定微信号为"
@@ -44,7 +43,6 @@
                     android:ellipsize="end"
                     android:maxWidth="@dimen/content_padding_120"/>
                 <TextView
-                    android:id="@+id/line_one"
                     android:layout_width="0dp"
                     android:layout_height="0.5dp"
                     android:background="@color/white_bg_line"

BIN
app/src/main/res/mipmap-xhdpi/personalc_ic_task_history.webp


BIN
app/src/main/res/mipmap-xhdpi/task_daily_check.webp


BIN
app/src/main/res/mipmap-xhdpi/task_log_in.webp


BIN
app/src/main/res/mipmap-xhdpi/task_online_time.webp


BIN
app/src/main/res/mipmap-xhdpi/x_ic_withdrawal.webp


+ 0 - 1
app/src/main/res/values/common.xml

@@ -64,7 +64,6 @@
 
     <dimen name="view_size_20">20dp</dimen>
     <dimen name="view_size_30">30dp</dimen>
-    <dimen name="view_size_35">35dp</dimen>
     <dimen name="view_size_45">45dp</dimen>
     <dimen name="view_size_55">55dp</dimen>
     <dimen name="view_size_60">60dp</dimen>

+ 0 - 1
app/src/main/res/values/gamegroup_color.xml

@@ -35,7 +35,6 @@
     <color name="white_DEDEDE">#DEDEDE</color>
     <color name="white_ededed">#ededed</color>
     <color name="white_FFF7F7F7">#FFF7F7F7</color>
-    <color name="green_FF2EF77B">#FF2EF77B</color>
     <color name="gray_F2F2F2">#F2F2F2</color>
 
 </resources>

+ 0 - 1
app/src/main/res/values/str_appstore_strings.xml

@@ -49,7 +49,6 @@
 
     <string name="toast_init_data_fail">加载数据失败</string>
     <string name="toast_init_tag_fail">加载标签失败</string>
-    <string name="toast_file_not_found">安装文件不存在!</string>
     <string name="toast_download_task_out_of_rang">请稍候,最多可同时下载%s款游戏哦</string>
 
     <string name="download">下载</string>