新增安装监听

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -427,7 +427,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 switch (position) {
                     case 0:
-
+                        Jump2View.getInstance()
+                                .goTryplayView(activity, null);
                         break;
                     case 1:
                         Jump2View.getInstance()

app/src/main/java/com/kfzs/duanduan/oem/AppAddOrdelReceiver.java

@@ -8,7 +8,21 @@ import android.os.Looper;
 import android.util.Log;
 
 import com.kfzs.duanduan.datashare.AppDownloadDatabaseHelper;
+import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.appdownload.AppdownloadBean;
+import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.util.DeviceUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import java.io.IOException;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 
 /**
@@ -27,29 +41,44 @@ public class AppAddOrdelReceiver extends BroadcastReceiver {
                         String packages = intent.getDataString().replace("package:","");
 
                         String packageName = intent.getPackage();
-                        final AppdownloadBean appdownloadBean = AppDownloadDatabaseHelper.getInstance().getApps(context, packages);
-                        if(appdownloadBean == null){
+                        final DownLoadInfo downLoadInfo = DDProviderHelper.getInstance()
+                                .getDownloadTaskToPackname(context, packages);
+                        if(downLoadInfo == null){
                             return;
                         }
-                        appdownloadBean.setStaus(2);
-//                        final String packageNames = appdownloadBean.getPkgName(),
-//                                interfaceName = appdownloadBean.getInterfaceName(),
-//                                staus = 2 +"";
-//                                MainActivity.mWebView.loadUrl("javascript:finishDownload(packageName,interfaceName,staus)");
                         new Thread(){
                             @Override
                             public void run() {
                                 super.run();
                                 try {
-//                                        String url_data = "http://testten.kuaifazs.com:7777/recall?packageName="+ URLEncoder.encode(packageNames,"utf8")+"&interfaceName="+interfaceName+"&status="+staus+ UtilParamsWebview.getInstance().getParams(context);
-                                    UtilParamsWebview.getInstance().returnBitMap(AppDownloadUtil.getInstance().accessInterfaceNetwork(context, AppDownloadUtil.URL, appdownloadBean));
-                                    Log.e("--------",appdownloadBean.getPkgName()+"");
+//                                    UtilParamsWebview.getInstance().returnBitMap(AppDownloadUtil.getInstance().accessInterfaceNetwork(context, AppDownloadUtil.URL, appdownloadBean));
+                                    OkHttpClient client = new OkHttpClient();
+                                    FormBody.Builder formBody = new FormBody.Builder();
+                                    formBody.add("device_id",DeviceUtil.getDeviceId(SheepApp.mContext)+"");
+                                    formBody.add("id",downLoadInfo.getMGameID()+"");
+                                    Request request = new Request.Builder()
+                                            .url("http://10.8.220.5:8080/v1/app/accepted_task/download_task_notify/")
+                                            .addHeader("Authorization", SpUtils.getOpenId(SheepApp.mContext)+"")
+                                            .addHeader("X-Device-Id", DeviceUtil.getDeviceId(SheepApp.mContext)+"")
+                                            .put(formBody.build())
+                                            .build();
+                                    client.newCall(request)
+                                            .enqueue(new Callback() {
+                                                @Override
+                                                public void onFailure(Call call, IOException e) {
+
+                                                }
+
+                                                @Override
+                                                public void onResponse(Call call, Response response) throws IOException {
+
+                                                }
+                                            });
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
                             }
                         }.start();
-                        AppDownloadDatabaseHelper.getInstance().setApps(context ,appdownloadBean);
                     }
                 }, 0);
             } catch (Exception e1) {

app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -240,8 +240,6 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 UMConfigUtils.onEvent(UMConfigUtils.Event.USER_BIND_PHONE);
                 break;
             case R.id.sure_change_tv:
-                oldOrNew = 1;
-                handler.sendEmptyMessage(CHANGGE_CLICK);
                 sec_code = phone_et_code_old.getText().toString()+"";
                 if(!checkCodeInput(sec_code)){
                     return;
@@ -321,6 +319,9 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 //                changeTelSuccess
 //            }
             if(step == 2){
+                oldOrNew = 1;
+
+//                handler.sendEmptyMessage(CHANGGE_CLICK);
                 refreshData();
                 phoneBtnCode.setText(getString(R.string.get_captcha));
                 canGetCaptchaPhone = true;

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -312,7 +312,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         if(downLoadInfo == null){
             CommonUtil.getInstance()
                 .addNewDownloadTask(mDownloadTaskService, task_entity.getTask_name(), task_entity.getDownload_link(), task_entity.getPackage_names(),
-                        Build.VERSION.SDK_INT, task_entity.getIcon(), task_entity.getPackage_size(),task_entity.getId(), 1);
+                        Build.VERSION.SDK_INT, task_entity.getIcon(), task_entity.getPackage_size(),task_entity.getAcceptedTaskId(), 1);
 
         }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -59,7 +59,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;
+                resId = R.layout.try_makemoney_item_recommend;
                 break;
         }
         return resId;
@@ -135,6 +135,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
+                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
@@ -192,6 +193,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         TextView item_money = holder.getView(R.id.item_money);
         TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
         TextView detail_task_tv = holder.getView(R.id.detail_task_tv);
+        cancel_task_tv.setVisibility(View.VISIBLE);
         Glide.with(context)
                 .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
                 .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head).dontAnimate())

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

@@ -35,6 +35,7 @@
             android:gravity="center"
             android:layout_marginBottom="13dp"
             android:padding="@dimen/content_padding_3"
+            android:visibility="gone"
             android:background="@drawable/sp_bg_gradient_rectangle_blue"/>
     </LinearLayout>
 
@@ -51,10 +52,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=""
+            android:lines="2"
             android:layout_alignTop="@+id/item_icon_iv"
             android:layout_toEndOf="@+id/item_icon_iv"
             android:layout_marginTop="6dp"
             android:layout_marginStart="15dp"
+            android:layout_toLeftOf="@+id/item_money"
             android:layout_above="@+id/item_num_tv"
             style="@style/txt_style_15"/>
         <TextView

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

@@ -23,6 +23,18 @@
             android:textColor="@color/black"
             android:textSize="15dp"
             android:layout_marginBottom="13dp"/>
+        <TextView
+            android:id="@+id/cancel_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="取消任务"
+            android:minWidth="@dimen/view_size_80"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_12"
+            android:gravity="center"
+            android:layout_marginBottom="13dp"
+            android:padding="@dimen/content_padding_3"
+            android:background="@drawable/sp_bg_gradient_rectangle_blue"/>
     </LinearLayout>
 
     <android.support.constraint.ConstraintLayout
@@ -50,6 +62,7 @@
             android:text=""
             android:lines="2"
             android:gravity="start|center"
+            android:ellipsize="end"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
             app:layout_constraintRight_toLeftOf="@+id/item_money"

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

@@ -133,6 +133,16 @@
                 style="@style/txt_big_btn_style"
                 android:text="确 定"
                 android:background="@drawable/selector_button_full_main"/>
+            <TextView
+                android:id="@+id/notice_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="正常工作时间2小时内到账"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:textColor="@color/txt_gray_929292"
+                android:textSize="@dimen/text_size_1"
+                android:layout_gravity="center_horizontal"/>
         </LinearLayout>
     </ScrollView>
 

datashare/src/main/java/com/kfzs/duanduan/datashare/DDProviderHelper.java

@@ -496,6 +496,22 @@ public class DDProviderHelper {
     }
 
     /**
+     * 获取指定下载任务
+     *
+     * @param packName
+     */
+    public DownLoadInfo getDownloadTaskToPackname(Context context, String packName) {
+        DownLoadInfo downLoadInfo = getDaossion(context)
+                .getDownLoadInfoDao()
+                .queryBuilder()
+                .where(DownLoadInfoDao.Properties.MPackageName.eq(packName))
+                .limit(1)
+                .build()
+                .unique();
+        return downLoadInfo;
+    }
+
+    /**
      * 下载任务完成
      *
      * @param ctx