Procházet zdrojové kódy

修改部分小bug

liujiangyao před 8 roky
rodič
revize
22efd8621f

+ 4 - 3
app/src/main/AndroidManifest.xml

@@ -69,9 +69,10 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name=".page.LoginActivity"
-            android:screenOrientation="portrait">
-
-        </activity>
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.WebviewAct"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".floatwindow.FloatService"

+ 18 - 0
app/src/main/assets/sheep_show.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>成都数字娱乐博览会</title>
+    <style>
+        body {
+            margin:0;
+            padding:0;
+        }
+    </style>
+</head>
+<body>
+    <img style="width:100%;" src="./main.png" alt="">
+</body>
+</html>

+ 2 - 0
app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -33,6 +33,7 @@ import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -452,6 +453,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
         tvProgress.setText(R.string.download_completed);
 
         setTaskStatusByDownloadUrl(task.getKey(), DownloadTaskService.STATUS_FINISH, task.getDownloadPath());
+        PackageUtil.installApk(ActDownloadMgr.this, task.getDownloadPath());
     }
 
 }

+ 5 - 0
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -431,6 +431,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         ArrayList<Drawable> imgURL = new ArrayList<>();
         imgURL.add(getResources().getDrawable(R.mipmap.couple_red_packets));
         imgURL.add(getResources().getDrawable(R.mipmap.home_credit_img));
+        imgURL.add(getResources().getDrawable(R.mipmap.home_sheep_img));
         if (mImageGlarry != null) {
             mImageGlarry.init(imgURL.toArray(new Drawable[]{}), ImageView.ScaleType.CENTER_CROP);
             return;
@@ -450,6 +451,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         Jump2View.getInstance()
                                 .goHomePageView(activity, 3);
                         break;
+                    case 2:
+                        Jump2View.getInstance()
+                                .goWebview(activity, 3);
+                        break;
                 }
             }
         });

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java

@@ -82,7 +82,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        view.failData2View(baseMessage);
+                        view.failReleaseTask2View(baseMessage);
                     }
 
                     @Override

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -35,6 +35,7 @@ import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
 import com.sheep.gamegroup.view.activity.TaskDetailAct;
 import com.sheep.gamegroup.view.activity.TaskListAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
+import com.sheep.gamegroup.view.activity.WebviewAct;
 import com.sheep.gamegroup.view.activity.WithdrawalAct;
 import com.sheep.gamegroup.view.activity.WithdrawalListAct;
 import com.sheep.gamegroup.view.activity.WithdrawalResultAct;
@@ -400,6 +401,14 @@ public class Jump2View {
         context.startActivity(i);
     }
 
+    /**
+     * 跳转到webview
+     */
+    public void goWebview(Context context, Object o){
+        Intent intent = new Intent(context, WebviewAct.class);
+        context.startActivity(intent);
+    }
+
 
 
 }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -426,6 +426,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             //在这里处理任务完成的状态
             start_task_tv.setText("开始安装");
             type = 3;
+            PackageUtil.installApk(activity, task.getDownloadPath());
         }
     }
 }

+ 13 - 12
app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -32,6 +32,7 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -55,15 +56,14 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
     private Activity activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private int position = 0;
+    private  List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
 
     Handler mhandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
 
-//            tryMakeMoneyAdp.notifyItemInserted(tryMakeMoneyAdp.getItemCount());
-//            recyclerview.smoothScrollToPosition(0);//滚动到底部
-            refresh.scrollTo(0,0);
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
             tryMakeMoneyAdp.notifyDataSetChanged();
         }
     };
@@ -129,7 +129,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.addHaveTask(false);
-        presenter.returnTask(null);
+        presenter.releaseTask(null);
     }
 
     @Override
@@ -187,13 +187,12 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
             tryMakeMoneyAdp.addPresenter(presenter);
             tryMakeMoneyAdp.addHaveTask(true);
-            tryMakeMoneyAdp.notifyItemChanged(position);
-//            mhandler.sendEmptyMessage(0);
             position ++;
+//            mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
         }
-        presenter.releaseTask(null);
+        mhandler.sendEmptyMessage(0);
     }
 
     @Override
@@ -213,7 +212,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             e.printStackTrace();
             G.showToast(" 网络错误!");
         }
-        presenter.releaseTask(null);
+        mhandler.sendEmptyMessage(0);
     }
 
     /**
@@ -222,23 +221,25 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
      */
     @Override
     public void releaseTaskTaskUpdataView(Object o) {
-        hideProgress();
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+            releaseEtyLists.clear();
+            if(releaseEtyList != null){
+                releaseEtyLists.addAll(releaseEtyList);
+            }
 
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList),position);
-            tryMakeMoneyAdp.notifyItemChanged(position);
 //            mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
         }
+        presenter.returnTask(null);
     }
 
     @Override
     public void failReleaseTask2View(Object o) {
 
-        hideProgress();
+        presenter.returnTask(null);
     }
 
     @Subscribe

+ 64 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/WebviewAct.java

@@ -0,0 +1,64 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import com.kfzs.android.view.widget.SafeWebView;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by ljy on 2018/4/16.
+ */
+
+public class WebviewAct extends BaseActivity {
+
+    @BindView(R.id.activity_webview)
+    SafeWebView activityWebview;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.webview_act_layout;
+    }
+
+    @Override
+    public void initView() {
+        TitleBarUtils.getInstance()
+                .setTitleFinish(this)
+                .setTitle(this, "专属福利");
+
+        activityWebview.getSettings().setJavaScriptEnabled(true);
+        activityWebview.loadUrl("file:///android_asset/sheep_show.html");
+
+        activityWebview.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+}

+ 94 - 4
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -77,7 +77,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 resId = R.layout.try_mkmy_release_task_list;
                 break;
             case RUN_TASK:
-                resId = R.layout.try_makemoney_item_recommend;
+                resId = R.layout.try_mkmy_release_task_list;
                 break;
         }
         return resId;
@@ -91,7 +91,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
                 break;
             case RUN_TASK:
-                bindRunTask(holder, (TaskAcceptedEty) recyleObj.getDataObj());
+                List<TaskAcceptedEty> etyList = new ArrayList<>();
+                etyList.add((TaskAcceptedEty) recyleObj.getDataObj());
+                bindRunTask(holder, etyList);
                 break;
         }
 
@@ -122,8 +124,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList){
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-                StaggeredGridLayoutManager.VERTICAL));
+//        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
+//                StaggeredGridLayoutManager.VERTICAL));
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
         recyclerView.setAdapter(new RecyclerView.Adapter(){
 
             @Override
@@ -204,6 +207,93 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         });
     }
 
+    /**
+     * 暂时这么处理,也许以后也是列表了
+     * @param holder
+     * @param etyList
+     */
+    private void bindRunTask(ViewHolder holder, final List<TaskAcceptedEty> etyList){
+        RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
+        recyclerView.setHasFixedSize(true);
+//        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
+//                StaggeredGridLayoutManager.VERTICAL));
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+        recyclerView.setAdapter(new RecyclerView.Adapter(){
+
+            @Override
+            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+                LinearLayout view = (LinearLayout) LayoutInflater.from(context)
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
+                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
+                    @Override
+                    public String toString() {
+                        return super.toString();
+                    }
+                };
+                return viewHolder;
+            }
+
+            @Override
+            public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
+                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
+                viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
+
+                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.VISIBLE);
+
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getRelease_task().getName()+"");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getRelease_task().getLast_num()+"份");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getRelease_task().getBonus() +"元");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                        "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
+                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TaskEty taskEty = etyList.get(i).getRelease_task().getTask();
+                        taskEty.setRunTask(1);
+                        taskEty.setBonus(etyList.get(i).getRelease_task().getBonus());
+                        taskEty.setRelease_task_id(etyList.get(i).getRelease_task().getId());
+                        taskEty.setAcceptedTaskId(etyList.get(i).getId());
+                        taskEty.setName(etyList.get(i).getRelease_task().getName());
+                        Jump2View.getInstance().goTaskDetailView(context, taskEty);
+                        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
+                    }
+                });
+                ((TextView)viewHolder.itemView.findViewById(R.id.cancel_task_tv)).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        presenter.giveUpTask(etyList.get(i).getId());
+//                        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
+                    }
+                });
+                Glide.with(context)
+                        .load(etyList.get(i).getRelease_task().getTask().getIcon()+"")
+                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
+                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+                viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                        TaskEty taskEty = etyList.get(i).getRelease_task().getTask();
+                        taskEty.setRunTask(1);
+                        taskEty.setRelease_task_id(etyList.get(i).getRelease_task().getId());
+                        taskEty.setName(etyList.get(i).getRelease_task().getName());
+                        taskEty.setAcceptedTaskId(etyList.get(i).getId());
+                        Jump2View.getInstance().goDialogActivityView(context, taskEty);
+                    }
+                });
+                setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getRelease_task().getTask());
+
+            }
+
+            @Override
+            public int getItemCount() {
+                return etyList.size();
+            }
+        });
+    }
+
 
     /**
      * 获取我正在运行的任务

+ 19 - 0
app/src/main/res/layout/webview_act_layout.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <include
+        layout="@layout/title"/>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/home_sheep_main_img"/>
+    <com.kfzs.android.view.widget.SafeWebView
+        android:id="@+id/activity_webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible"/>
+
+</LinearLayout>

binární
app/src/main/res/mipmap-xhdpi/home_sheep_img.png


binární
app/src/main/res/mipmap-xhdpi/home_sheep_main_img.png


binární
app/src/main/res/mipmap-xxhdpi/home_sheep_img.png