Explorar o código

主页添加邀请好友入口

zhaoyi %!s(int64=8) %!d(string=hai) anos
pai
achega
b1b93a17e6
Modificáronse 21 ficheiros con 226 adicións e 79 borrados
  1. 1 0
      app/src/main/AndroidManifest.xml
  2. 6 4
      app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java
  3. 9 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/event/NewUserDialog.java
  4. 1 2
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java
  5. 0 14
      app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatWindow.java
  6. 12 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java
  7. 2 3
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java
  8. 56 32
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
  9. 18 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java
  10. 16 3
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java
  11. 10 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java
  12. 35 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java
  13. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java
  14. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java
  15. 17 10
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java
  16. BIN=BIN
      app/src/main/res/drawable-hdpi/hongbao.png
  17. BIN=BIN
      app/src/main/res/drawable-xhdpi/hongbao.png
  18. BIN=BIN
      app/src/main/res/drawable-xxhdpi/hongbao.png
  19. 11 4
      app/src/main/res/layout/game_detail_activity.xml
  20. 1 2
      app/src/main/res/layout/title.xml
  21. 29 2
      app/src/main/res/layout/usercenter_activity.xml

+ 1 - 0
app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
     <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.PACKAGE_USAGE_STATS"/>
 
     <permission
         android:name="android.permission.PACKAGE_USAGE_STATS"

+ 6 - 4
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -14,12 +14,14 @@ public class Config {
     public static Config instance() {
         return mConfig;
     }
-    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://10.8.220.213:8088";
+//    public String mBaseUrl = "http://10.8.220.130:8088";
+    //    public String mBaseUrl = "http://api.task.bandaimi.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"};
+    public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
 
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;

+ 9 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/event/NewUserDialog.java

@@ -0,0 +1,9 @@
+package com.sheep.jiuyan.samllsheep.event;
+
+/**
+ * Created by kemllor on 2018/1/24.
+ */
+
+public class NewUserDialog {
+   public Boolean isDoneNewTask;  //是否完成新手任务。
+}

+ 1 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java

@@ -182,8 +182,7 @@ public class FloatService extends Service implements View.OnClickListener {
         } else if (i == R.id.img_open_left || i == R.id.img_open_right) {
             mLeft.setVisibility(View.GONE);
             mRight.setVisibility(View.GONE);
-            intent = new Intent();
-            intent.setClassName(FloatService.this, "com.kfzs.duanduan.view.MainActivity");
+            intent = new Intent(getApplicationContext(), MainActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(intent);
 

+ 0 - 14
app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatWindow.java

@@ -16,20 +16,6 @@ public class FloatWindow extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT >= 23){
-            if (Settings.canDrawOverlays(FloatWindow.this)) {
-                Intent intent = new Intent(FloatWindow.this, FloatService.class);
-                startService(intent);
-            } else {
-                //若没有权限,提示获取.
-                Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
-                Toast.makeText(FloatWindow.this, "需要取得权限以使用悬浮窗", Toast.LENGTH_SHORT).show();
-                startActivity(intent);
-            }
-        }else {
-            Intent intent = new Intent(FloatWindow.this, FloatService.class);
-            startService(intent);
-        }
         finish();
     }
 }

+ 12 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -62,6 +62,7 @@ public class GameDetailActivity extends BaseActivity {
     private AlertDialog mDialog;
     private AlertDialog mReDialog;
     private View mPb;
+    private View mBtnStandard;
 
     @Override
     protected int getLayoutId() {
@@ -88,6 +89,7 @@ public class GameDetailActivity extends BaseActivity {
         mWebText = (WebView) findViewById(R.id.web_text);
         mLlInfos = (LinearLayout) findViewById(R.id.ll_infos);
         mPb = findViewById(R.id.pb_commit);
+        mBtnStandard = findViewById(R.id.btn_standard);
 
         TitleBarUtils.getInstance().setTitle(this, "任务详情")
                 .setTitleFinish(this);
@@ -125,6 +127,15 @@ public class GameDetailActivity extends BaseActivity {
                 checkIsRegisterTask();
             }
         });
+        mBtnStandard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(GameDetailActivity.this, WebActivity.class);
+                intent.putExtra(WebActivity.INTENT_URL, Url.REQUEST_HOOK);
+                intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
+                startActivity(intent);
+            }
+        });
     }
 
     private void checkIsRegisterTask() {
@@ -250,7 +261,7 @@ public class GameDetailActivity extends BaseActivity {
         Intent intent = getIntent();
         mTask = (TaskPublish) intent.getSerializableExtra("data");
         if (mTask != null) {
-            mTvTime.setText(String.format("截止日期:%s", mTask.getOverTime()));
+            mTvTime.setText(String.format("截止日期:%s", mTask.getOverTime().split(" ")[0]));
             mTvBouns.setText(mTask.getTask().getBonus());
             mTvMoney.setText(mTask.getTask().getPrice());
             Glide.with(SheepApp.mContext)

+ 2 - 3
app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -87,6 +87,7 @@ public class LoginActivity extends BaseActivity {
         mTvWx.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                mTvWx.setEnabled(false);
                 loginFromHw();
             }
         });
@@ -162,6 +163,7 @@ public class LoginActivity extends BaseActivity {
                     @Override
                     public void failure(IOException e) {
                         Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                        mTvWx.setEnabled(true);
                     }
                 });
             }
@@ -171,8 +173,5 @@ public class LoginActivity extends BaseActivity {
                 Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
             }
         });
-
     }
-
-
 }

+ 56 - 32
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -21,24 +21,20 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.mylhyl.acp.Acp;
-import com.mylhyl.acp.AcpListener;
-import com.mylhyl.acp.AcpOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
+import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.page.adapter.AdpMainPageViewPager;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageOffline;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageTask;
 import com.sheep.jiuyan.samllsheep.page.view.RappTabLayout;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
-import java.util.ArrayList;
-import java.util.List;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
@@ -63,14 +59,17 @@ public class MainActivity extends BaseActivity {
     private AppBarLayout mAppBarLayout;
     private boolean mIsTopest = true;//下滑是否在最顶端
     private boolean mIsLeftest = true;//右滑时是否在最左端
+    private ImageView mImgBag;
+    private AlertDialog mDialog;
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         showNewDialog();
         super.onCreate(savedInstanceState);
-        Intent intent = new Intent(this, FloatWindow.class);
-        startActivity(intent);
+        EventBus.getDefault().register(this);
+       /* Intent intent = new Intent(this, FloatWindow.class);
+        startActivity(intent);*/
     }
 
 
@@ -169,6 +168,13 @@ public class MainActivity extends BaseActivity {
         } else if (mSwipeRefreshLayout.isEnabled() && (!mIsLeftest || !mIsTopest)) {
             mSwipeRefreshLayout.setEnabled(false);
         }
+
+        mImgBag.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showNewDialog();
+            }
+        });
     }
 
     @Override
@@ -185,27 +191,33 @@ public class MainActivity extends BaseActivity {
     }
 
     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) {
-                startActivity(new Intent(MainActivity.this, WebActivity.class));
-            }
-        });
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.show();
+        if (mDialog == null) {
+            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);
+            mDialog = builder.create();
+            view.findViewById(R.id.img_close).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mDialog.dismiss();
+                }
+            });
+            view.findViewById(R.id.img_begin_new).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(MainActivity.this, WebActivity.class);
+                    intent.putExtra(WebActivity.INTENT_URL, "http://10.8.210.190:8080/index.html?count=3");
+                    intent.putExtra(WebActivity.INTENT_TITLE, "新手引导");
+                    intent.putExtra(WebActivity.INTENT_NEW_USER, "1");
+                    startActivity(intent);
+                }
+            });
+            mDialog.setCanceledOnTouchOutside(false);
+        }
+        mDialog.show();
         //        }
     }
 
@@ -225,7 +237,8 @@ public class MainActivity extends BaseActivity {
         });
         btn.setVisibility(View.VISIBLE);
 
-
+        mImgBag = (ImageView) findViewById(R.id.img_baseactivity_title);
+        mImgBag.setImageResource(R.drawable.hongbao);
         mRappTabLayout = (RappTabLayout) findViewById(R.id.tab_main_activity);
         mViewPager = (ViewPager) findViewById(R.id.viewpager_main_activity);
         mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_main_activity);
@@ -244,7 +257,7 @@ public class MainActivity extends BaseActivity {
                 .setLineMargin(0, G.getRealPix(2), 0, 0)
                 .setLineColor(getResources().getColor(R.color.black_text_deep))
                 .setupWithViewPager(mViewPager, R.layout.tab_ripple);
-        TitleBarUtils.getInstance().setTitleFinish(this);
+        //        TitleBarUtils.getInstance().setTitleFinish(this);
         //                .setRightImgBotton(this, R.drawable.set, new View.OnClickListener() {
         //                    @Override
         //                    public void onClick(View view) {
@@ -274,4 +287,15 @@ public class MainActivity extends BaseActivity {
         EventBus.getDefault().post(floatMsg);*/
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(NewUserDialog done) {
+        if (done.isDoneNewTask) {
+            showRedbagDialog();
+        }
+    }
+
+    private void showRedbagDialog() {
+        Toast.makeText(this, "抽奖!!!", Toast.LENGTH_SHORT).show();
+    }
+
 }

+ 18 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java

@@ -2,7 +2,9 @@ package com.sheep.jiuyan.samllsheep.page;
 
 import android.Manifest;
 import android.content.Intent;
+import android.os.Build;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -11,6 +13,8 @@ import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
+import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -67,6 +71,20 @@ public class SplashActivity extends BaseActivity {
         if (!has) {
             PremissUtils.openUsageAccessPage(this);
         }
+        if (Build.VERSION.SDK_INT >= 23){
+            if (Settings.canDrawOverlays(SplashActivity.this)) {
+                Intent intent = new Intent(SplashActivity.this, FloatService.class);
+                startService(intent);
+            } else {
+                //若没有权限,提示获取.
+                Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+                Toast.makeText(SplashActivity.this, "需要取得权限以使用悬浮窗", Toast.LENGTH_SHORT).show();
+                startActivity(intent);
+            }
+        }else {
+            Intent intent = new Intent(SplashActivity.this, FloatService.class);
+            startService(intent);
+        }
         Acp.getInstance(this).request(new AcpOptions.Builder()
                         .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
                                 , Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE

+ 16 - 3
app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -4,6 +4,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
+import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -25,6 +26,7 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -48,9 +50,6 @@ public class TaskRecordActivity extends BaseActivity {
     public void initView() {
         mLvTask = (ListView) findViewById(R.id.lv_task);
         mLvTask.setDividerHeight(0);
-        TitleBarUtils.getInstance()
-                .setTitle(this, "任务记录")
-                .setTitleFinish(this);
     }
 
     @Override
@@ -165,8 +164,22 @@ public class TaskRecordActivity extends BaseActivity {
 
     @Override
     public void initData() {
+        Intent intent = getIntent();
+        String title = intent.getStringExtra("title");
+        String date = "";
+        if (!TextUtils.isEmpty(title)) {
+            TitleBarUtils.getInstance()
+                    .setTitle(this, title)
+                    .setTitleFinish(this);
+            date = DateFormat.format("yyyy-MM-dd", new Date()).toString() + " 00:00:00";
+        } else {
+            TitleBarUtils.getInstance()
+                    .setTitle(this, "任务记录")
+                    .setTitleFinish(this);
+        }
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
+        map.put("date", date);
         NetManager.get(Url.USER_COMMIT, map, getApplicationContext(), new SheepCallback<List<Commit>>(this) {
             @Override
             public void success(List<Commit> commits) {

+ 10 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
@@ -66,6 +67,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvWithdrawHostroy.setOnClickListener(this);
         mLlMoneyHostroy.setOnClickListener(this);
         tv_wx_aacount.setOnClickListener(this);
+        findViewById(R.id.tv_friend).setOnClickListener(this);
     }
 
     @Override
@@ -151,6 +153,14 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
             }
 
 
+        } else if (i == R.id.tv_friend) {
+            if (checkLogin()) {
+                Toast.makeText(this, "我的好友", Toast.LENGTH_SHORT).show();
+                /*intent = new Intent(UserCenterActivity.this, WXAccountActivity.class);
+                startActivity(intent);*/
+            } else {
+                toLogin();
+            }
         }
     }
 

+ 35 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
@@ -21,6 +22,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -35,6 +38,7 @@ public class WebActivity extends BaseActivity {
     public final static String INTENT_URL = "url";
     public final static String INTENT_TITLE = "INTENT_TITLE";
     public final static String INTENT_LOAD_JS = "INTENT_LOAD_JS";//只要此INTENT有就会载入
+    public final static String INTENT_NEW_USER = "INTENT_NEW_USER";//新手引导
 
     @Override
     protected int getLayoutId() {
@@ -68,6 +72,9 @@ public class WebActivity extends BaseActivity {
         if (getIntent().hasExtra(INTENT_LOAD_JS)) {
             mWeb.addJavascriptInterface(new PublicJavaScript(), "PublicJavaScript");
         }
+        if (getIntent().hasExtra(INTENT_NEW_USER)) {
+            mWeb.addJavascriptInterface(new NewUserGuide(), "NewUserGuide");
+        }
     }
 
 
@@ -104,6 +111,34 @@ public class WebActivity extends BaseActivity {
     }
 
 
+    /**
+     * JS调用方法
+     */
+    public class NewUserGuide {
+        @JavascriptInterface
+        public void gotoTaskList(int code) {
+            NewUserDialog userDialog = new NewUserDialog();
+            if (code == 1) {
+                userDialog.isDoneNewTask = true;
+            } else {
+                userDialog.isDoneNewTask = false;
+            }
+            EventBus.getDefault().post(userDialog);
+            finish();
+        }
+
+        @JavascriptInterface
+        public void finish() {
+            WebActivity.this.finish();
+        }
+
+        @JavascriptInterface
+        public void setTitle(String title) {
+            TitleBarUtils.getInstance().setTitle(WebActivity.this, title);
+        }
+    }
+
+
     @Override
     public void initListener() {
     }

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -64,7 +64,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
                 .setText(Html.fromHtml(HTML_FORMAT.replace("当前数量", taskPublish.getSurplusCount() + "")
                         .replace("总数", taskPublish.getTotalCouont() + "")));
         holder.getView(R.id.tv_time, TextView.class)
-                .setText(String.format("截止日期:%s", taskPublish.getOverTime()));
+                .setText(String.format("截止日期:%s", taskPublish.getOverTime().split(" ")[0]));
         holder.getView(R.id.tv_money, TextView.class)
                 .setText(taskPublish.getTask().getPrice());
         holder.getView(R.id.tv_bouns, TextView.class)

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java

@@ -57,7 +57,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
     public void onBindViewHolder(ViewHolder viewHolder, final int position) {
         viewHolder.mTvTitle.setText(datas.get(position).getTask().getTitle());
         viewHolder.mTvCount.setText(datas.get(position).getSurplusCount() + "/" + datas.get(position).getTotalCouont());
-        viewHolder.mTvTime.setText(String.format("截止日期:%s", datas.get(position).getOverTime()));
+        viewHolder.mTvTime.setText(String.format("截止日期:%s", datas.get(position).getOverTime().split(" ")[0]));
         viewHolder.mTvMoney.setText(datas.get(position).getTask().getPrice());
         viewHolder.mTvBouns.setText(datas.get(position).getTask().getBonus());
         Glide.with(mActivity)

+ 17 - 10
app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -112,17 +112,24 @@ public class FgtMainPageTask extends BaseFragment {
                         startActivity(intent);
                     }
                 });
-        View.OnClickListener onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getActivity(), TaskRecordActivity.class);
-                startActivity(intent);
-            }
-        };
         findViewById(R.id.view_complete_today)
-                .setOnClickListener(onClickListener);
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(getActivity(), TaskRecordActivity.class);
+                        intent.putExtra("tag", "today");
+                        intent.putExtra("title", "今日完成");
+                        startActivity(intent);
+                    }
+                });
         findViewById(R.id.view_history_record)
-                .setOnClickListener(onClickListener);
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(getActivity(), TaskRecordActivity.class);
+                        startActivity(intent);
+                    }
+                });
 
     }
 
@@ -285,7 +292,7 @@ public class FgtMainPageTask extends BaseFragment {
                                 .dontAnimate()
                                 .into(mImgIcon);
                     mTvTitle.setText(taskPublish.getTask().getTitle());
-                    mTvTime.setText("截止日期:" + taskPublish.getOverTime());
+                    mTvTime.setText("截止日期:" + taskPublish.getOverTime().split(" ")[0]);
                     mTvCount.setText(taskPublish.getSurplusCount() + "/" + taskPublish.getTotalCouont());
                     mTvMoney.setText(taskPublish.getTask().getPrice());
                     if (!TextUtils.isEmpty(taskPublish.getTask().getPkg())) {

BIN=BIN
app/src/main/res/drawable-hdpi/hongbao.png


BIN=BIN
app/src/main/res/drawable-xhdpi/hongbao.png


BIN=BIN
app/src/main/res/drawable-xxhdpi/hongbao.png


+ 11 - 4
app/src/main/res/layout/game_detail_activity.xml

@@ -136,6 +136,15 @@
 
                 </RelativeLayout>
 
+                <Button
+                    android:id="@+id/btn_standard"
+                    style="@style/style_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_marginBottom="@dimen/content_padding"
+                    android:layout_marginRight="@dimen/content_padding"
+                    android:text="查看截图示意"/>
 
                 <View
                     android:layout_width="match_parent"
@@ -189,7 +198,6 @@
                 style="@style/style_btn"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="right"
                 android:layout_marginLeft="@dimen/content_padding_small"
                 android:layout_marginRight="@dimen/content_padding_small"
                 android:layout_weight="1"
@@ -200,7 +208,6 @@
                 style="@style/style_btn"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="right"
                 android:layout_marginLeft="@dimen/content_padding_small"
                 android:layout_marginRight="@dimen/content_padding_small"
                 android:layout_weight="1"
@@ -210,10 +217,10 @@
 
     <ProgressBar
         android:id="@+id/pb_commit"
-        android:visibility="gone"
         android:layout_width="@dimen/layout_heigh_default"
         android:layout_height="@dimen/layout_heigh_default"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:visibility="gone"/>
 
 
 </FrameLayout>

+ 1 - 2
app/src/main/res/layout/title.xml

@@ -8,10 +8,9 @@
     <ImageView
         android:id="@+id/img_baseactivity_title"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/layout_heigh_small"
+        android:layout_height="match_parent"
         android:layout_centerVertical="true"
         android:gravity="center_vertical"
-        android:padding="@dimen/content_padding_small"
         android:minWidth="@dimen/layout_heigh_default"
         android:scaleType="centerInside"
         android:src="@drawable/narrow_back_black" />

+ 29 - 2
app/src/main/res/layout/usercenter_activity.xml

@@ -75,10 +75,10 @@
             android:layout_centerVertical="true"
             android:background="@drawable/texe_background_round_theme_right"
             android:gravity="center"
-            android:paddingTop="@dimen/content_padding_small"
             android:paddingBottom="@dimen/content_padding_small"
             android:paddingLeft="@dimen/content_padding"
             android:paddingRight="@dimen/content_padding_big"
+            android:paddingTop="@dimen/content_padding_small"
             android:text="立即提现"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_3"/>
@@ -91,10 +91,10 @@
             android:layout_centerVertical="true"
             android:background="@drawable/texe_background_round_theme_left"
             android:gravity="center"
-            android:paddingTop="@dimen/content_padding_small"
             android:paddingBottom="@dimen/content_padding_small"
             android:paddingLeft="@dimen/content_padding_big"
             android:paddingRight="@dimen/content_padding"
+            android:paddingTop="@dimen/content_padding_small"
             android:text="微信账户"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_3"/>
@@ -233,5 +233,32 @@
     <include
         layout="@layout/line_h_1px"/>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="5dp">
+
+        <ImageView
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/invite_code"/>
+
+        <TextView
+            android:id="@+id/tv_friend"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="我的好友"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+    </LinearLayout>
+
+    <include
+        layout="@layout/line_h_1px"/>
+
 
 </LinearLayout>