1. rm unused resources

alipay/.gitignore

@@ -1 +0,0 @@
-/build

alipay/build.gradle

@@ -1,51 +0,0 @@
-apply from: rootProject.file('cc-settings.gradle')
-apply from: rootProject.file('common-build.gradle')
-
-
-android {
-    compileSdkVersion rootProject.compile_sdk_version
-
-    defaultConfig {
-        minSdkVersion rootProject.min_sdk_version
-        targetSdkVersion rootProject.target_sdk_version
-        versionCode rootProject.application_version_code
-        versionName rootProject.application_version_name
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-
-    android.buildFeatures {
-        dataBinding = false
-        viewBinding = false
-    }
-
-}
-
-repositories {
-    flatDir {
-        dirs 'aars'
-    }
-}
-
-dependencies {
-
-    implementation files('aars/alipaySdk-15.7.9-20200727142846.aar')
-    implementation project(':base')
-
-
-}

alipay/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

alipay/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<manifest package="com.ysnows.alipay" >
-
-</manifest >

alipay/src/main/java/com/ysnows/alipay/cc/CpAlipay.kt

@@ -1,26 +0,0 @@
-package com.ysnows.alipay.cc
-
-import android.app.Activity
-import com.alipay.sdk.app.PayTask
-import com.billy.cc.core.component.CC
-import com.billy.cc.core.component.CCResult
-import com.billy.cc.core.component.IComponent
-import com.ysnows.base.ccextension.BIComponent
-
-open class CpAlipay : IComponent, BIComponent() {
-
-    fun pay(cc: CC, orderInfo: String?): Boolean {
-
-        val runnable = Runnable {
-            val alipay = PayTask(cc.context as Activity?)
-            val result = alipay.payV2(orderInfo, true)
-
-            CC.sendCCResult(cc.callId, CCResult.success("result", result))
-        }
-
-        Thread(runnable).start()
-
-        return true
-    }
-
-}

alipay/src/main/java/com/ysnows/alipay/model/PayResult.java

@@ -1 +0,0 @@
-package com.ysnows.alipay.model;

import android.text.TextUtils;

import java.util.Map;

public class PayResult {
    private String resultStatus;
    private String result;
    private String memo;

    public PayResult(Map<String, String> rawResult) {
        if (rawResult == null) {
            return;
        }

        for (String key : rawResult.keySet()) {
            if (TextUtils.equals(key, "resultStatus")) {
                resultStatus = rawResult.get(key);
            } else if (TextUtils.equals(key, "result")) {
                result = rawResult.get(key);
            } else if (TextUtils.equals(key, "memo")) {
                memo = rawResult.get(key);
            }
        }
    }

    @Override
    public String toString() {
        return "resultStatus={" + resultStatus + "};memo={" + memo
                + "};result={" + result + "}";
    }

    /**
     * @return the resultStatus
     */
    public String getResultStatus() {
        return resultStatus;
    }

    /**
     * @return the memo
     */
    public String getMemo() {
        return memo;
    }

    /**
     * @return the result
     */
    public String getResult() {
        return result;
    }
}

app/build.gradle

@@ -43,7 +43,7 @@ android {
             zipAlignEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
         }
 
 
@@ -114,10 +114,7 @@ dependencies {
     implementation 'com.github.promeg:tinypinyin-lexicons-android-cncity:2.0.3'
     implementation 'com.google.android.material:material:1.2.1'
 
-//    implementation(name: 'open_ad_sdk', ext: 'aar')
-    implementation files('libs/open_ad_sdk.aar')
     implementation project(':base')
-    addComponent 'alipay'
     addComponent 'update'
     addComponent 'umeng'
 

app/src/main/AndroidManifest.xml

@@ -195,32 +195,17 @@
         <activity
             android:name="com.ysnows.sultra.activity.PrivateCenterActivity"
             android:launchMode="singleTask" >
-            <!--            <intent-filter >-->
-            <!--                <action android:name="android.intent.action.MAIN" />-->
-            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
-            <!--            </intent-filter >-->
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter >
         </activity >
         <activity android:name=".activity.AboutActivity" />
         <activity android:name=".activity.WebViewActivity" />
         <activity android:name=".activity.VipBuyActivity" />
         <activity
             android:name=".activity.SplashActivity"
-            android:theme="@style/AppTheme.Launcher" ></activity >
-
-        <provider
-            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
-            android:authorities="${applicationId}.TTFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" >
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider >
-
-        <provider
-            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
-            android:authorities="${applicationId}.TTMultiProvider"
-            android:exported="false" />
+            android:theme="@style/AppTheme.Launcher" />
 
     </application >
 

app/src/main/java/com/ysnows/sultra/App.java

@@ -7,9 +7,6 @@ import com.ysnows.base.config.IConfig;
 import com.ysnows.base.route.IUpdate;
 import com.ysnows.sultra.config.Config;
 import com.ysnows.sultra.model.SearchEngine;
-import com.ysnows.sultra.utils.ad.TTAdManagerHolder;
-import com.ysnows.sultra.worker.AppRunnable;
-import com.ysnows.sultra.worker.ConfigRunnable;
 
 public class App extends BApp {
 
@@ -23,11 +20,6 @@ public class App extends BApp {
     @Override
     protected void init() {
         app = this;
-        new Thread(new ConfigRunnable(this)).start();
-        new Thread(new AppRunnable(this)).start();
-
-//        X5WebUtils.init(App.getApp());
-
         CCRetrofit.instance()
                 .create(IUpdate.class)
                 .init()
@@ -38,7 +30,6 @@ public class App extends BApp {
 //                .init()
 //                .subscribe();
 
-        TTAdManagerHolder.init(this);
     }
 
     public static App getApp() {

app/src/main/java/com/ysnows/sultra/activity/MainActivity.kt

@@ -1,143 +1,26 @@
 package com.ysnows.sultra.activity
 
 import android.os.Bundle
-import android.view.View
-import com.bytedance.sdk.openadsdk.TTAdConstant
-import com.bytedance.sdk.openadsdk.TTAppDownloadListener
-import com.bytedance.sdk.openadsdk.TTNativeExpressAd
-import com.qmuiteam.qmui.util.QMUIKeyboardHelper
 import com.ysnows.base.base.BRepository
-import com.ysnows.base.utils.MMKVManager
 import com.ysnows.sultra.base.MBActivity
-import com.ysnows.sultra.config.ConfigMMKV
 import com.ysnows.sultra.databinding.ActivitySearchBinding
 import com.ysnows.sultra.repository.SearchRepository
-import com.ysnows.sultra.utils.ad.AdUtils
-import com.ysnows.sultra.utils.fluid.FluidContentResizer
 import com.ysnows.sultra.vmodel.MainVModel
-import io.reactivex.android.schedulers.AndroidSchedulers
 
 
 class MainActivity : MBActivity<MainVModel, ActivitySearchBinding>() {
 
-    private lateinit var mTTAd: TTNativeExpressAd
     override val isRxbus: Boolean = true
     override fun title(): String? = null
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
 
-        if (MMKVManager.instance().decodeBool(ConfigMMKV.FIRST_OPEN, true)) {
-            single(SplashActivity::class.java)
-
-        } else {
-        }
-
-    }
-
-
-    //绑定广告行为
-    private fun bindAdListener(ad: TTNativeExpressAd) {
-        ad.setExpressInteractionListener(object : TTNativeExpressAd.AdInteractionListener {
-            override fun onAdDismiss() {
-                QMUIKeyboardHelper.showKeyboard(binding.searchBar.binding.edtBar, 100)
-            }
-
-            override fun onAdClicked(view: View?, type: Int) {
-
-            }
-
-            override fun onAdShow(view: View?, type: Int) {
-
-            }
-
-            override fun onRenderFail(view: View?, msg: String, code: Int) {
-
-            }
-
-            override fun onRenderSuccess(view: View?, width: Float, height: Float) {
-                //返回view的宽高 单位 dp
-
-                //在渲染成功回调时展示广告，提升体验
-                mTTAd.showInteractionExpressAd(this@MainActivity)
-//                binding.layContainer.addView(mTTAd.expressAdView)
-            }
-        })
-
-        if (ad.interactionType != TTAdConstant.INTERACTION_TYPE_DOWNLOAD) {
-            return
-        }
-        //可选，下载监听设置
-        ad.setDownloadListener(object : TTAppDownloadListener {
-            override fun onIdle() {
-
-            }
-
-            override fun onDownloadActive(totalBytes: Long, currBytes: Long, fileName: String, appName: String) {
-//                if (!mHasShowDownloadActive) {
-//                    mHasShowDownloadActive = true
-
-//                }
-            }
-
-            override fun onDownloadPaused(totalBytes: Long, currBytes: Long, fileName: String, appName: String) {
-
-            }
-
-            override fun onDownloadFailed(totalBytes: Long, currBytes: Long, fileName: String, appName: String) {
-
-            }
-
-            override fun onInstalled(fileName: String, appName: String) {
-
-            }
-
-            override fun onDownloadFinished(totalBytes: Long, fileName: String, appName: String) {
-
-            }
-        })
-    }
-
-
-    override fun listeners() {
-        super.listeners()
-        FluidContentResizer.listen(this)
     }
 
 
     override fun binding(): ActivitySearchBinding = ActivitySearchBinding.inflate(layoutInflater)
-    override fun transluent(): Boolean = true
-
-    private fun checkAndInit() {
-
-//        Thread {
-//            if (SettingsUtil.clipboard_listener()) {
-//                if (!CheckUtil.isServiceWorked(context(), "ClipBoardListenService")) {
-//                    runOnUiThread { ClipBoardListenService.start(context()) }
-//                }
-
-//                boolean floatPermission = PermissionUtils.checkFloatPermission(getContext());
-//                if (!floatPermission) {
-//                    runOnUiThread(() -> PermissionUtils.openFloatPermission(MainActivity.this));
-//                }
-//            }
-//        }.start()
-
-    }
-
-    override fun onResume() {
-        super.onResume()
-        AdUtils.loadInteractionAd("945450432", this)
-                ?.observeOn(AndroidSchedulers.mainThread())
-                ?.doOnNext() {
-                    mTTAd = it
-                    bindAdListener(it)
-                }
-                ?.subscribe()
-
-        QMUIKeyboardHelper.showKeyboard(binding.searchBar.binding.edtBar, false)
-
-    }
+    override fun transluent(): Boolean = false
 
     override fun createRepository(): BRepository {
         return SearchRepository();

app/src/main/java/com/ysnows/sultra/utils/ad/AdUtils.kt

@@ -1,74 +0,0 @@
-package com.ysnows.sultra.utils.ad
-
-import android.annotation.SuppressLint
-import android.content.Context
-import com.bytedance.sdk.openadsdk.AdSlot
-import com.bytedance.sdk.openadsdk.TTAdNative
-import com.bytedance.sdk.openadsdk.TTNativeExpressAd
-import com.ysnows.base.utils.MMKVManager
-import com.ysnows.sultra.config.ConfigMMKV
-import com.ysnows.sultra.model.User
-import io.reactivex.Observable
-
-object AdUtils {
-
-
-    private var mTTAdNative: TTAdNative? = null
-
-    private fun needShow(codeId: String): Boolean {
-
-        if (!User.isLogin() || User.get()?.vip != 1) {
-            val adTimes = MMKVManager.instance().decodeInt(ConfigMMKV.AD_TIMES + codeId, 0)
-            if (adTimes >= 6) {
-                MMKVManager.instance().encode(ConfigMMKV.AD_TIMES + codeId, 0)
-                return true;
-            } else {
-                MMKVManager.instance().encode(ConfigMMKV.AD_TIMES + codeId, adTimes + 1)
-            }
-        }
-        return false
-    }
-
-
-    /**
-     * 加载插屏广告
-     */
-    @SuppressLint("CheckResult")
-    fun loadInteractionAd(codeId: String, context: Context): Observable<TTNativeExpressAd>? {
-
-        if (!needShow(codeId)) return null
-
-
-        return Observable.create<TTNativeExpressAd> { emitter ->
-
-            //step2:创建TTAdNative对象,用于调用广告请求接口
-            mTTAdNative = TTAdManagerHolder.get().createAdNative(context)
-            //step3:可选，申请部分权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题。
-            TTAdManagerHolder.get().requestPermissionIfNecessary(context)
-
-            //step4:创建广告请求参数AdSlot,注意其中的setNativeAdtype方法，具体参数含义参考文档
-            val adSlot = AdSlot.Builder()
-                    .setCodeId(codeId)
-                    .setSupportDeepLink(true)
-                    .setAdCount(1) //请求广告数量为1到3条
-                    .setExpressViewAcceptedSize(260f, 260f) //期望个性化模板广告view的size,单位dp
-                    .setImageAcceptedSize(640, 320)//这个参数设置即可，不影响个性化模板广告的size                .setNativeAdType(AdSlot.TYPE_INTERACTION_AD) //请求原生广告时候，请务必调用该方法，设置参数为TYPE_BANNER或TYPE_INTERACTION_AD
-                    .build()
-
-            //step5:请求广告，对请求回调的广告作渲染处理
-            mTTAdNative?.loadInteractionExpressAd(adSlot, object : TTAdNative.NativeExpressAdListener {
-                override fun onError(code: Int, message: String) {
-                    emitter.onError(Throwable())
-                }
-
-                override fun onNativeExpressAdLoad(ads: MutableList<TTNativeExpressAd>) {
-                    val mTTAd = ads[0]
-                    emitter.onNext(mTTAd)
-                    mTTAd.render()
-                }
-            })
-        }
-    }
-
-
-}

app/src/main/java/com/ysnows/sultra/utils/ad/TTAdManagerHolder.java

@@ -1,51 +0,0 @@
-package com.ysnows.sultra.utils.ad;
-
-import android.content.Context;
-
-import com.bytedance.sdk.openadsdk.TTAdConfig;
-import com.bytedance.sdk.openadsdk.TTAdConstant;
-import com.bytedance.sdk.openadsdk.TTAdManager;
-import com.bytedance.sdk.openadsdk.TTAdSdk;
-
-/**
- * 可以用一个单例来保存TTAdManager实例，在需要初始化sdk的时候调用
- */
-public class TTAdManagerHolder {
-
-    private static boolean sInit;
-
-
-    public static TTAdManager get() {
-        if (!sInit) {
-            throw new RuntimeException("TTAdSdk is not init, please check.");
-        }
-        return TTAdSdk.getAdManager();
-    }
-
-    public static void init(Context context) {
-        doInit(context);
-    }
-
-    //step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
-    private static void doInit(Context context) {
-        if (!sInit) {
-            TTAdSdk.init(context, buildConfig(context));
-            sInit = true;
-        }
-    }
-
-    private static TTAdConfig buildConfig(Context context) {
-        return new TTAdConfig.Builder()
-                .appId("5102384")
-                .useTextureView(true) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
-                .appName("SULTRA")
-                .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
-                .allowShowNotify(true) //是否允许sdk展示通知栏提示
-                .debug(true) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
-                .supportMultiProcess(true)//是否支持多进程
-                .needClearTaskReset()
-                //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
-                .build();
-    }
-}

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
 
@@ -14,21 +13,5 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
-        <LinearLayout
-            android:id="@+id/lay_container"
-            android:layout_width="260dp"
-            android:layout_height="260dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="100dp"
-            android:orientation="vertical" />
-
-        <com.ysnows.sultra.widget.WidgetSearchBar
-            android:id="@+id/search_bar"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_gravity="bottom"
-            android:background="@color/gray"
-            tools:background="@color/colorPrimary" />
-
     </FrameLayout >
 </layout >

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources >
-    <string name="app_name" >SULTRA</string >
+    <string name="app_name" >黑蜂物流</string >
 
     <string name="abc_action_bar_home_description" >Navigate home</string >
     <string name="abc_action_bar_home_description_format" >%1$s, %2$s</string >

settings.gradle

@@ -1,4 +1,3 @@
 include ':umeng'
 include ':update'
-include ':alipay'
 include ':app',':base'