diff --git a/app/build.gradle b/app/build.gradle index ace5a02c8f..29943c9309 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,7 +68,6 @@ android { buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\"" buildConfigField "String", "TD_APPID", "\"${TD_APPID}\"" buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\"" - buildConfigField "String", "QIYU_SERVICE_APPKEY", "\"${QIYU_SERVICE_APPKEY}\"" } @@ -252,8 +251,6 @@ dependencies { implementation "top.zibin:Luban:${luban}" - implementation "com.qiyukf.unicorn:unicorn:${qiyukf}" - implementation project(':libraries:LGLibrary') implementation project(':libraries:MTA') implementation project(':libraries:QQShare') diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 7898206d47..3d0ffcad82 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -136,10 +136,6 @@ -dontwarn android.webkit.WebView -dontwarn android.webkit.WebViewClient -# 网易七鱼 --dontwarn com.qiyukf.** --keep class com.qiyukf.** {*;} - # app models -keep class com.gh.common.view.** {*;} -keep class com.gh.gamecenter.db.info.** {*;} diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index a17361afe4..b970635372 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -42,7 +42,6 @@ public class Config { public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET; public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID; public static final String PATCH_VERSION_NAME = BuildConfig.PATCH_VERSION_NAME; // 补丁包版本 对应关于->版本号 - public static final String QIYU_SERVICE_APPKEY = BuildConfig.QIYU_SERVICE_APPKEY; // http://www.ghzs666.com/article/${articleId}.html public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // TODO ghzs/ghzs666 统一 public static final String PATCHES = "patches"; diff --git a/app/src/main/java/com/gh/common/util/QiYuImageLoader.java b/app/src/main/java/com/gh/common/util/QiYuImageLoader.java deleted file mode 100644 index d012420190..0000000000 --- a/app/src/main/java/com/gh/common/util/QiYuImageLoader.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gh.common.util; - -import android.content.Context; -import android.graphics.Bitmap; -import android.net.Uri; -import android.os.AsyncTask; -import android.support.annotation.Nullable; - -import com.facebook.common.executors.UiThreadImmediateExecutorService; -import com.facebook.common.references.CloseableReference; -import com.facebook.datasource.DataSource; -import com.facebook.drawee.backends.pipeline.Fresco; -import com.facebook.imagepipeline.common.ResizeOptions; -import com.facebook.imagepipeline.core.ImagePipeline; -import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber; -import com.facebook.imagepipeline.image.CloseableBitmap; -import com.facebook.imagepipeline.image.CloseableImage; -import com.facebook.imagepipeline.request.ImageRequest; -import com.facebook.imagepipeline.request.ImageRequestBuilder; -import com.qiyukf.unicorn.api.ImageLoaderListener; -import com.qiyukf.unicorn.api.UnicornImageLoader; - -public class QiYuImageLoader implements UnicornImageLoader { - private Context context; - - public QiYuImageLoader(Context context) { - this.context = context.getApplicationContext(); - } - - @Override - public Bitmap loadImageSync(String uri, int width, int height) { - Bitmap resultBitmap = null; - ImagePipeline imagePipeline = Fresco.getImagePipeline(); - boolean inMemoryCache = imagePipeline.isInBitmapMemoryCache(ImageRequest.fromUri(uri)); - if (inMemoryCache) { - ImageRequestBuilder builder = ImageRequestBuilder.newBuilderWithSource(Uri.parse(uri)); - if (width > 0 && height > 0) { - builder.setResizeOptions(new ResizeOptions(width, height)); - } - ImageRequest imageRequest = builder.build(); - DataSource> dataSource = - imagePipeline.fetchImageFromBitmapCache(imageRequest, context); - CloseableReference imageReference = dataSource.getResult(); - try { - if (imageReference != null) { - CloseableImage closeableImage = imageReference.get(); - if (closeableImage != null && closeableImage instanceof CloseableBitmap) { - Bitmap underlyingBitmap = ((CloseableBitmap) closeableImage).getUnderlyingBitmap(); - if (underlyingBitmap != null && !underlyingBitmap.isRecycled()) { - resultBitmap = underlyingBitmap.copy(Bitmap.Config.RGB_565, false); - } - } - } - } finally { - dataSource.close(); - CloseableReference.closeSafely(imageReference); - } - } - return resultBitmap; - } - - @Override - public void loadImage(String uri, int width, int height, final ImageLoaderListener listener) { - ImageRequestBuilder builder = ImageRequestBuilder.newBuilderWithSource(Uri.parse(uri)); - if (width > 0 && height > 0) { - builder.setResizeOptions(new ResizeOptions(width, height)); - } - ImageRequest imageRequest = builder.build(); - - ImagePipeline imagePipeline = Fresco.getImagePipeline(); - DataSource> dataSource = imagePipeline.fetchDecodedImage(imageRequest, context); - - BaseBitmapDataSubscriber subscriber = new BaseBitmapDataSubscriber() { - @Override - public void onNewResultImpl(@Nullable Bitmap bitmap) { - if (listener != null) { - new AsyncTask() { - @Override - protected Bitmap doInBackground(Bitmap... params) { - Bitmap bitmap = params[0]; - Bitmap result = null; - if (bitmap != null && !bitmap.isRecycled()) { - result = bitmap.copy(Bitmap.Config.RGB_565, false); - } - return result; - } - - @Override - protected void onPostExecute(Bitmap bitmap) { - if (bitmap != null) { - listener.onLoadComplete(bitmap); - } else { - listener.onLoadFailed(null); - } - } - }.execute(bitmap); - } - } - - @Override - public void onFailureImpl(DataSource dataSource) { - if (listener != null) { - listener.onLoadFailed(dataSource.getFailureCause()); - } - } - }; - - dataSource.subscribe(subscriber, UiThreadImmediateExecutorService.getInstance()); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 98098929ef..d683e834fa 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -86,9 +86,6 @@ import com.lightgame.download.DownloadStatus; import com.lightgame.download.FileUtils; import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; -import com.qiyukf.nimlib.sdk.NimIntent; -import com.qiyukf.unicorn.api.ConsultSource; -import com.qiyukf.unicorn.api.Unicorn; import com.tencent.bugly.beta.tinker.TinkerManager; import com.tencent.bugly.crashreport.CrashReport; @@ -749,31 +746,11 @@ public class MainActivity extends BaseActivity { // 执行跳转事件 handler.postDelayed(skipRun, 500); - - skipQiYuService(getIntent()); - } - - // 跳转客服回话页面 - private void skipQiYuService(Intent intent) { - if (intent.hasExtra(NimIntent.EXTRA_NOTIFY_CONTENT)) { - startServiceActivity(this); - setIntent(new Intent()); // 最好将intent清掉，以免从堆栈恢复时又打开客服窗口 - } - } - - // 打开客服窗口 - public static void startServiceActivity(Context context) { - String title = "聊天窗口的标题"; - ConsultSource source = new ConsultSource("source--Url", "source--Title", "custom--information--string"); - Unicorn.openServiceActivity(context, title, source); - - Unicorn.queryLastMessage(); // 刷新未读消息 } @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - skipQiYuService(intent); } private void getGhzsSettings() { diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index afb82592fe..16abdbdf5e 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -61,8 +61,6 @@ import com.halo.assistant.HaloApp; import com.jakewharton.rxbinding2.view.RxView; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; -import com.qiyukf.unicorn.api.Unicorn; -import com.qiyukf.unicorn.api.UnreadCountChangeListener; import com.tencent.connect.common.Constants; import org.greenrobot.eventbus.EventBus; @@ -120,8 +118,6 @@ public class PersonalFragment extends BaseFragment implements Observer startActivity(MyAskActivity.getIntent(getContext()))); break; - case R.id.personal_service: - MainActivity.startServiceActivity(getContext()); - break; case R.id.personal_home: CheckLoginUtils.checkLogin(getContext(), () -> { PersonalHomeActivity.startTargetActivity(getContext(), UserManager.getInstance().getUserId()); @@ -333,39 +324,14 @@ public class PersonalFragment extends BaseFragment implements Observer 0) { - mServiceUnread.setVisibility(View.VISIBLE); - mServiceUnread.setText(String.valueOf(unreadCount)); - } else { - mServiceUnread.setVisibility(View.GONE); - } - } - - private void addUnreadCountChangeListener(boolean add) { - Unicorn.addUnreadCountChangeListener(listener, add); - } - @Override public void onPause() { super.onPause(); - addUnreadCountChangeListener(false); } @Override public void onResume() { super.onResume(); - addUnreadCountChangeListener(true); } private boolean isCanSign(long time) { diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 1088349eb7..97ec3ac66e 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -9,16 +9,10 @@ import android.util.Log; import com.facebook.drawee.backends.pipeline.Fresco; import com.gh.base.GHActivityLifecycleCallbacksImpl; import com.gh.common.PushManager; -import com.gh.common.constant.Config; import com.gh.common.exposure.ExposureManager; import com.gh.common.util.DataUtils; -import com.gh.common.util.QiYuImageLoader; import com.gh.gamecenter.Injection; -import com.gh.gamecenter.MainActivity; import com.leon.channel.helper.ChannelReaderUtil; -import com.qiyukf.unicorn.api.StatusBarNotificationConfig; -import com.qiyukf.unicorn.api.Unicorn; -import com.qiyukf.unicorn.api.YSFOptions; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -103,14 +97,6 @@ public class HaloApp extends TinkerAppLike { e.printStackTrace(); } - // 网易七鱼 - Unicorn.init(getApplication(), Config.QIYU_SERVICE_APPKEY, options(), new QiYuImageLoader(getApplication())); } - private YSFOptions options() { - YSFOptions options = new YSFOptions(); - options.statusBarNotificationConfig = new StatusBarNotificationConfig(); - options.statusBarNotificationConfig.notificationEntrance = MainActivity.class; - return options; - } } diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 200ff5f57f..002782b1b8 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -387,50 +387,6 @@ android:visibility = "gone" /> - - - - - - - - - - diff --git a/dependencies.gradle b/dependencies.gradle index 7d97d1e0b4..798a2ecc43 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -66,6 +66,4 @@ ext { smartRefreshLayout = "1.1.0-alpha-7" luban = "1.1.7" - - qiyukf = "4.2.1" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8e7325aff4..46c60d4392 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,6 @@ WEIBO_APPKEY=1723629218 UMENG_APPKEY=585a29fa8f4a9d327600023e UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9 BUGLY_APPID=d5de44c594 -QIYU_SERVICE_APPKEY=0831a158bb7c0e1785a7088738705c2b # hosts DEV_API_HOST=https\://dev.api.ghzs666.com/v3d4/