合并错误很多

app/build.gradle

@@ -233,7 +233,6 @@ dependencies {
     compile 'com.kf.framework:volleyplus:1.4.5@aar'
     compile "com.android.support:support-annotations:$supportLibVersion"
     compile "com.android.support:recyclerview-v7:$supportLibVersion"
-    compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')
     compile 'io.reactivex:rxandroid:1.2.1'

app/src/main/AndroidManifest.xml

@@ -249,17 +249,7 @@
             android:hardwareAccelerated="false"
             android:screenOrientation="portrait" />
 
-<<<<<<< HEAD
-        <receiver android:name="com.kfzs.duanduan.oem.AppAddOrdelReceiver">
-=======
-        <provider
-            android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider"
-            android:authorities="com.kfzs.duanduan.data.graph.provider.${DUANDUAN_GRAPH}"
-            android:exported="true" />
-
-
         <receiver android:name="com.sheep.gamegroup.receiver.AppAddOrDelReceiver">
->>>>>>> sheep_develop
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />

app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -27,22 +27,9 @@ import com.kfzs.android.view.tag.FlowLayout;
 import com.kfzs.android.view.tag.TagAdapter;
 import com.kfzs.android.view.tag.TagFlowLayout;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.adp.AdpSearchGame;
-import com.kfzs.duanduan.adp.AdpSearchRecord;
-import com.kfzs.duanduan.adp.AdpSearchViewPager;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.HotWordsOuterClass;
-import com.kfzs.duanduan.proto.MistinessNamesOuterClass;
 import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.download.KFZSDDContentSession;
 import com.sheep.gamegroup.util.UMConfigUtils;

app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -37,8 +37,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
-
 /**
  * all web view
  * Created by HooRang on 2017/2/17.

app/src/main/java/com/sheep/gamegroup/event/EventDownloadHandler.java

@@ -2,17 +2,10 @@ package com.sheep.gamegroup.event;
 
 import android.content.Context;
 
-<<<<<<< HEAD:app/src/main/java/com/kfzs/duanduan/event/EventDownloadHandler.java
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
 import com.sheep.gamegroup.model.entity.DownloadStatus;
 import com.sheep.gamegroup.util.DownloadUtil;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.jiuyan.samllsheep.utils.G;
->>>>>>> sheep_develop:app/src/main/java/com/sheep/gamegroup/event/EventDownloadHandler.java
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/sheep/gamegroup/helper/DownloadHelper.java

@@ -8,16 +8,9 @@ import android.widget.TextView;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.util.DownloadUtil;
->>>>>>> sheep_develop
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
 import com.sheep.gamegroup.model.api.IDownload;

app/src/main/java/com/sheep/gamegroup/model/entity/DialogEntity.java

@@ -1,12 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.EventTypes;
->>>>>>> sheep_develop
 
 import java.io.Serializable;
 

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -28,14 +28,8 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
->>>>>>> sheep_develop
 import com.mdad.sdk.mdsdk.AdManager;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;

app/src/main/java/com/sheep/gamegroup/util/DownloadUtil.java

@@ -6,14 +6,8 @@ import android.text.TextUtils;
 
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
-<<<<<<< HEAD:app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java
-import com.kfzs.duanduan.KFZSApp;
 import com.sheep.gamegroup.download.DDProviderHelper;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
-import com.kfzs.duanduan.datashare.DDProviderHelper;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
->>>>>>> sheep_develop:app/src/main/java/com/sheep/gamegroup/util/DownloadUtil.java
 import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;

app/src/main/java/com/sheep/gamegroup/util/WebviewJs.java

@@ -10,16 +10,9 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
->>>>>>> sheep_develop
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;

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

@@ -14,30 +14,16 @@ import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.kfzs.appstore.utils.adapter.OnMDLItemChildClickListener;
-<<<<<<< HEAD:app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java
-import com.kfzs.duanduan.adp.DownloadMgrAdapter;
-import com.kfzs.duanduan.bean.CompareResult;
-import com.kfzs.duanduan.bean.DownloadStatus;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventDownloadHandler;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-=======
 import com.sheep.gamegroup.model.entity.DownloadStatus;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventDownloadHandler;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.util.DownloadUtil;
->>>>>>> sheep_develop:app/src/main/java/com/sheep/gamegroup/view/activity/ActDownloadMgr.java
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.KFProgressButton;
-<<<<<<< HEAD:app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
 import com.sheep.gamegroup.absBase.BaseActivity;
->>>>>>> sheep_develop:app/src/main/java/com/sheep/gamegroup/view/activity/ActDownloadMgr.java
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.view.adapter.DownloadMgrAdapter;
 import com.sheep.jiuyan.samllsheep.R;

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

@@ -7,7 +7,6 @@ import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-<<<<<<< HEAD
 
 import com.sheep.gamegroup.download.download.DownLoadInfo;
 import com.sheep.gamegroup.util.TestUtil;
@@ -15,8 +14,6 @@ import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
-=======
->>>>>>> sheep_develop
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -29,19 +26,11 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.util.DownloadUtil;
->>>>>>> sheep_develop
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
-import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
 import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.model.api.ICallBack;
@@ -72,7 +61,6 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.PngUtil;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -85,10 +73,6 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
-import com.tencent.smtt.sdk.WebChromeClient;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;

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

@@ -11,12 +11,7 @@ import com.kfzs.appstore.utils.adapter.MDLViewHolderHelper;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.utils.InstallButtonUtils;
-<<<<<<< HEAD:app/src/main/java/com/kfzs/duanduan/adp/DownloadMgrAdapter.java
-import com.kfzs.duanduan.services.DownloadTaskService;
-=======
 import com.sheep.gamegroup.util.DownloadUtil;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
->>>>>>> sheep_develop:app/src/main/java/com/sheep/gamegroup/view/adapter/DownloadMgrAdapter.java
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.view.activity.ActDownloadMgr;
 

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

@@ -15,18 +15,9 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-<<<<<<< HEAD
-import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
-import com.kfzs.duanduan.adp.AdpCommonRecy;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-=======
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.util.DownloadUtil;
->>>>>>> sheep_develop
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
 import com.sheep.gamegroup.helper.TaskHelper;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -6,19 +6,10 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-<<<<<<< HEAD
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.download.download.DownLoadInfo;
-=======
-
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.util.DownloadUtil;
->>>>>>> sheep_develop
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;