新手引导弹窗

app/src/main/AndroidManifest.xml

@@ -15,9 +15,9 @@
     <uses-permission android:name="android.permission.GET_TASKS"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
 
     <permission
         android:name="android.permission.PACKAGE_USAGE_STATS"

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

@@ -16,7 +16,7 @@ public class Config {
     }
     public String mBaseUrl = "http://10.8.220.213:8088";
 //    public String mBaseUrl = "http://api.task.bandaimi.com";
-    //  public String mBaseUrl = "http://test.ss.shouyouquan.com";
+//      public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";
     public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://test.ss.shouyouquan.com", "http://api.task.bandaimi.com"};

app/src/main/java/com/sheep/jiuyan/samllsheep/net/SheepCallback.java

@@ -67,7 +67,7 @@ public abstract class SheepCallback<T> implements Callback {
     }
 
     public void otherCode(int code, String string) {
-       Toast.makeText(SheepApp.mContext, string, Toast.LENGTH_SHORT).show();
+        //       Toast.makeText(SheepApp.mContext, string, Toast.LENGTH_SHORT).show();
         failure(new IOException(string));
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -163,7 +163,7 @@ public class GameDetailActivity extends BaseActivity {
                     if (installed) {
                         PackageUtil.startApp(getApplicationContext(), pkg);
                     } else {
-                        Intent intent = new Intent(GameDetailActivity.this, DownloadActivity.class);
+                        Intent intent = new Intent(GameDetailActivity.this, XDownLoadActivity.class);
                         intent.putExtra("task", task.getTask());
                         startActivity(intent);
                     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -168,10 +168,14 @@ public class LoginActivity extends BaseActivity {
                     @Override
                     public void failure(IOException e) {
                         Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
-
                     }
                 });
             }
+
+            @Override
+            public void failure(IOException e) {
+                Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+            }
         });
 
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -1,6 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.Manifest;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -11,10 +12,12 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -70,6 +73,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        showNewDialog();
         super.onCreate(savedInstanceState);
         Intent intent = new Intent(this, FloatWindow.class);
         startActivity(intent);
@@ -84,7 +88,7 @@ public class MainActivity extends BaseActivity {
 
         Acp.getInstance(this).request(new AcpOptions.Builder()
                         .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
-                                , Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.READ_PHONE_STATE
+                                , Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE
                         )
                         .build(),
                 new AcpListener() {
@@ -92,36 +96,17 @@ public class MainActivity extends BaseActivity {
                     public void onGranted() {
                         ClassFileHelper.getInstance().createSDDirection();
                     }
+
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(MainActivity.this,"亲！权限拒绝可能会导致某些功能无法使用",Toast.LENGTH_LONG).show();
+                        Toast.makeText(MainActivity.this, "亲！权限拒绝可能会导致某些功能无法使用", Toast.LENGTH_LONG).show();
 
                     }
                 });
 
 
-
-
     }
 
-//    @Override
-//    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-//        if (requestCode == INTENT_GET_PERMISSION) {
-//            boolean isOk = true;
-//            for (int result : grantResults) {
-//                if (result == PackageManager.PERMISSION_DENIED) {
-//                    isOk = false;
-//                    break;//只要有一个拒绝，就退出并提示
-//                }
-//            }
-//            if (!isOk) {
-//                G.showToast("权限获取失败，部分功能可能无法正常工作。");
-//            }
-//        }
-//        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-//    }
-
-
     @Override
     protected int getLayoutId() {
         return R.layout.main_activity;
@@ -208,18 +193,43 @@ public class MainActivity extends BaseActivity {
                 .into((CircleImageView) findViewById(R.id.img_user));
     }
 
+    private void showNewDialog() {
+        Intent intent = getIntent();
+        String tag = intent.getStringExtra("tag");
+        //        if (TextUtils.equals(tag, "once")) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
+        View view = View.inflate(this, R.layout.new_user_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+        view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        view.findViewById(R.id.img_begin_new).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.show();
+        //        }
+    }
+
     @Override
     public void initView() {
         ((TextView) findViewById(R.id.txt_baseactivity_title)).setText("我的奖金");
 
 
-        Button btn= (Button) findViewById(R.id.btn_baseactivity_right);
+        Button btn = (Button) findViewById(R.id.btn_baseactivity_right);
         btn.setBackgroundResource(R.drawable.icon_app);
 
         btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent i=new  Intent(MainActivity.this,XDownLoadActivity.class);
+                Intent i = new Intent(MainActivity.this, XDownLoadActivity.class);
                 startActivity(i);
             }
         });
@@ -243,12 +253,6 @@ public class MainActivity extends BaseActivity {
                 .setLineColor(getResources().getColor(R.color.black_text_deep))
                 .setupWithViewPager(mViewPager, R.layout.tab_ripple);
         TitleBarUtils.getInstance().setTitleFinish(this);
-        //                .setRightImgBotton(this, R.drawable.set, new View.OnClickListener() {
-        //                    @Override
-        //                    public void onClick(View view) {
-        //                        G.showToast("点设置");
-        //                    }
-        //                });
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/RegisterActivity.java

@@ -137,6 +137,7 @@ public class RegisterActivity extends BaseActivity {
             public void success(BindUserEntiey o) {
                 SpUtils.login(RegisterActivity.this, o.getOpenId());
                 Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
+                intent.putExtra("tag", "once");
                 startActivity(intent);
                 finish();
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -110,7 +110,8 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         if (i == R.id.tv_withdraw) {
             if (checkLogin()) {
                 intent = new Intent(UserCenterActivity.this, WithdrawActivity.class);
-                intent.putExtra("money", mUser.getBalance());
+                if (mUser != null)
+                    intent.putExtra("money", mUser.getBalance());
                 startActivity(intent);
             } else {
                 toLogin();

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageOffline.java

@@ -110,7 +110,6 @@ public class FgtMainPageOffline extends BaseFragment {
 
             @Override
             public void failure(IOException e) {
-                super.failure(e);
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
                 reFreshView();
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -71,7 +71,7 @@ public class FgtMainPageTask extends BaseFragment {
     private View mImgComp;
     private TextView mTvMoney;
     private TextView mTvGuide;
-    private Button mBtnTask;
+    private TextView mBtnTask;
 
 
     @Override
@@ -101,6 +101,7 @@ public class FgtMainPageTask extends BaseFragment {
                 initData(true);
             }
         });
+        mRecyclerView.setNestedScrollingEnabled(false);
         initData(false);
 
         findViewById(R.id.view_income_today)
@@ -218,7 +219,7 @@ public class FgtMainPageTask extends BaseFragment {
         mTvBouns = (TextView) findViewById(R.id.tv_bouns);
         mTvMoney = (TextView) findViewById(R.id.tv_money);
         mTvGuide = (TextView) findViewById(R.id.tv_guide);
-        mBtnTask = (Button) findViewById(R.id.btn_task_item);
+        mBtnTask = findViewById(R.id.btn_task_item);
         mTaskSucc = (TextView) findViewById(R.id.txt_fgt_main_page_task_succ);
         mTaskHistory = (TextView) findViewById(R.id.txt_fgt_main_page_task_history);
         mImgComp = findViewById(R.id.img_task_item_iscomplete);
@@ -228,7 +229,7 @@ public class FgtMainPageTask extends BaseFragment {
     public void initData(final boolean isLoadMore) {
         //TODO 这里不知道怎么设计分页，自己添加吧。小刁写
         mIntLastPage = isLoadMore ? mIntLastPage + 1 : 1;
-        requestNewPeopleTask();
+        //        requestNewPeopleTask();
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
         map.put("imei", new DeviceUtils(getContext()).getIMEI());
@@ -291,10 +292,28 @@ public class FgtMainPageTask extends BaseFragment {
                         mTlDoing.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                                if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
+                                    PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                                } else {
+                                    Intent intent = new Intent(getActivity(), XDownLoadActivity.class);
+                                    intent.putExtra("task", taskPublish.getTask());
+                                    startActivity(intent);
+                                }
                             }
                         });
                     }
+                    mBtnTask.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
+                                PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                            } else {
+                                Intent intent = new Intent(getActivity(), XDownLoadActivity.class);
+                                intent.putExtra("task", taskPublish.getTask());
+                                startActivity(intent);
+                            }
+                        }
+                    });
                     mTvBouns.setText(taskPublish.getTask().getBonus());
                     mTvGuide.setOnClickListener(new View.OnClickListener() {
                         @Override

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

@@ -111,7 +111,7 @@
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-           >
+            >
 
             <View
                 android:id="@+id/view_income_today"
@@ -122,8 +122,8 @@
             <View
                 android:layout_width="1px"
                 android:layout_height="25dp"
-                android:visibility="gone"
-                android:background="@color/sheep_red"/>
+                android:background="@color/sheep_red"
+                android:visibility="gone"/>
 
             <View
                 android:layout_width="0dp"
@@ -161,22 +161,36 @@
         android:layout_height="@dimen/content_padding"
         android:background="@color/background_light_gray"/>
 
-    <LinearLayout
-        android:id="@+id/ll_doing"
+    <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone">
+        android:layout_height="match_parent">
 
-        <include
-            layout="@layout/task_item"/>
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
+            <LinearLayout
+                android:id="@+id/ll_doing"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recy_fgt_main_page_task"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+                <include
+                    layout="@layout/task_item"/>
+            </LinearLayout>
+
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recy_fgt_main_page_task"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </android.support.v7.widget.RecyclerView>
+
+        </LinearLayout>
+
+    </android.support.v4.widget.NestedScrollView>
 
-    </android.support.v7.widget.RecyclerView>
 
 </LinearLayout>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+
+    >
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true">
+
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="320dp"
+            android:layout_height="422dp"
+            android:layout_centerInParent="true"
+            android:src="@drawable/dialog_new"/>
+
+        <ImageView
+            android:id="@+id/img_begin_new"
+            android:layout_width="175dp"
+            android:layout_height="40dp"
+            android:layout_alignBottom="@+id/imageView"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="25dp"
+            android:src="@drawable/begin_new"/>
+
+        <ImageView
+            android:id="@+id/img_close"
+            android:layout_width="27dp"
+            android:layout_height="27dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/delete"/>
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -13,6 +13,7 @@
     <color name="yellow_text_light">#edea04</color>
     <!--APP中的主要非白色背景的底色-->
     <color name="background_light_gray">#efefef</color>
+    <color name="background_light_gray_30">#4c4d4d4d</color>
     <!--分割线的统一颜色-->
     <color name="divier">#cdcdcd</color>