Browse Source

1、分离基础库
2、删除本地调试代码提交
3、代码优化

fluty 4 years ago
parent
commit
8601e12627
100 changed files with 47 additions and 983 deletions
  1. 1 0
      .gitignore
  2. 1 1
      app/src/main/java/com/funcheer/channel/sdk/MainActivity.java
  3. 0 47
      app_dev/build.gradle
  4. BIN
      app_dev/fq_bytjz_gdt.jks
  5. BIN
      app_dev/fqgamesdkkeystore.jks
  6. 0 32
      app_dev/src/main/AndroidManifest.xml
  7. 0 353
      app_dev/src/main/java/com/funcheer/channel/sdk/MainActivity.java
  8. 0 19
      app_dev/src/main/java/com/funcheer/channel/sdk/MainApp.java
  9. 0 11
      app_dev/src/main/java/com/tencent/tmgp/xzsjjby/wxapi/WXEntryActivity.java
  10. 0 170
      app_dev/src/main/res/drawable/ic_launcher_background.xml
  11. 0 176
      app_dev/src/main/res/layout/fq_activity_main.xml
  12. BIN
      app_dev/src/main/res/mipmap-hdpi/ic_launcher.png
  13. BIN
      app_dev/src/main/res/mipmap-hdpi/ic_launcher_round.png
  14. BIN
      app_dev/src/main/res/mipmap-mdpi/ic_launcher.png
  15. BIN
      app_dev/src/main/res/mipmap-mdpi/ic_launcher_round.png
  16. BIN
      app_dev/src/main/res/mipmap-xhdpi/ic_launcher.png
  17. BIN
      app_dev/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  18. BIN
      app_dev/src/main/res/mipmap-xxhdpi/ic_launcher.png
  19. BIN
      app_dev/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  20. BIN
      app_dev/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  21. BIN
      app_dev/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  22. 0 11
      app_dev/src/main/res/values/colors.xml
  23. 0 25
      app_dev/src/main/res/values/strings.xml
  24. 0 8
      app_dev/src/main/res/values/styles.xml
  25. 0 1
      app_dev_lib/.gitignore
  26. 0 21
      app_dev_lib/proguard-rules.pro
  27. 0 27
      app_dev_lib/src/androidTest/java/com/example/app_dev_lib/ExampleInstrumentedTest.java
  28. 0 3
      app_dev_lib/src/main/res/values/strings.xml
  29. 0 17
      app_dev_lib/src/test/java/com/example/app_dev_lib/ExampleUnitTest.java
  30. 0 3
      fq_channel_mubao/src/main/java/com/fq/channel/sdk/SdkPluginDemo.java
  31. 0 3
      fq_channel_oppo/src/main/java/com/fq/channel/sdk/FQApplication.java
  32. 0 3
      fq_channel_oppo/src/main/java/com/fq/channel/sdk/SdkPluginOppo.java
  33. 1 2
      fq_channel_ysdk/src/main/java/com/fq/channel/sdk/FQApplication.java
  34. 3 5
      fq_channel_ysdk/src/main/java/com/fq/channel/sdk/SdkPluginYsdk.java
  35. 1 1
      fq_channel_ysdk/src/main/java/com/fq/channel/sdk/WXCallBackActivity.java
  36. 1 1
      fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGame.java
  37. 5 5
      fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGameHander.java
  38. 1 0
      fq_plugin_base/build.gradle
  39. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/config/FqConfig.java
  40. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/config/ResourceCfg.java
  41. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/FqLog.java
  42. 5 4
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/FqNetRequest.java
  43. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/callback/BaseCallback.java
  44. 8 9
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/req/ParamsUtils.java
  45. 1 0
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/result/ResultContent.java
  46. 0 0
      fq_plugin_base_lib/.gitignore
  47. 1 5
      app_dev_lib/build.gradle
  48. 0 0
      fq_plugin_base_lib/consumer-rules.pro
  49. 0 0
      fq_plugin_base_lib/libs/android-support-v4.jar
  50. 0 0
      fq_plugin_base_lib/libs/conscrypt-openjdk-uber-2.4.0.jar
  51. 0 0
      fq_plugin_base_lib/libs/jsr305.jar
  52. 0 0
      fq_plugin_base_lib/proguard-rules.pro
  53. 1 1
      app_dev_lib/src/main/AndroidManifest.xml
  54. 6 6
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/HttpManager.java
  55. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/interfaces/IPermissionRequestCallback.java
  56. 1 3
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/permission/PermissionManager.java
  57. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Base64.java
  58. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/DES.java
  59. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/DeviceUtils.java
  60. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/EncryptUtils.java
  61. 1 1
      fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Utils.java
  62. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/animal_sniffer/IgnoreJRERequirement.java
  63. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/DefaultDateTypeAdapter.java
  64. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/ExclusionStrategy.java
  65. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldAttributes.java
  66. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldNamingPolicy.java
  67. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldNamingStrategy.java
  68. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/Gson.java
  69. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/GsonBuilder.java
  70. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/InstanceCreator.java
  71. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonArray.java
  72. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonDeserializationContext.java
  73. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonDeserializer.java
  74. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonElement.java
  75. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonIOException.java
  76. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonNull.java
  77. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonObject.java
  78. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonParseException.java
  79. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonParser.java
  80. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonPrimitive.java
  81. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSerializationContext.java
  82. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSerializer.java
  83. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonStreamParser.java
  84. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSyntaxException.java
  85. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/LongSerializationPolicy.java
  86. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/TypeAdapter.java
  87. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/TypeAdapterFactory.java
  88. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Expose.java
  89. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/JsonAdapter.java
  90. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/SerializedName.java
  91. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Since.java
  92. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Until.java
  93. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/package-info.java
  94. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/$Gson$Preconditions.java
  95. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/$Gson$Types.java
  96. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/ConstructorConstructor.java
  97. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/Excluder.java
  98. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/GsonBuildConfig.java
  99. 0 0
      fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/JavaVersion.java
  100. 0 0
      fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/JsonReaderInternalAccess.java

+ 1 - 0
.gitignore

@@ -8,3 +8,4 @@
 .externalNativeBuild
 .cxx
 
+

+ 1 - 1
app/src/main/java/com/funcheer/channel/sdk/MainActivity.java

@@ -19,7 +19,7 @@ import com.fq.channel.sdk.api.IResult;
 import com.fq.channel.sdk.base.bean.LoginInfo;
 import com.fq.channel.sdk.base.bean.PaymentInfo;
 import com.fq.channel.sdk.base.constants.ConstSet;
-import com.fq.channel.sdk.base.utils.FqLog;
+import com.fq.channel.sdk.base.log.FqLog;
 
 /**
  * @Description: 描述

+ 0 - 47
app_dev/build.gradle

@@ -1,47 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 29
-    defaultConfig {
-        applicationId "com.tencent.tmgp.xzsjjby"
-        minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        signingConfig signingConfigs.debug
-    }
-
-    signingConfigs {
-
-//        debug {
-//            storeFile file("./fqgamesdkkeystore.jks")
-//            storePassword '201868'
-//            keyPassword '201868'
-//            keyAlias 'fqgamesdkkeystore.jks'
-//        }
-//        ysdk
-        debug{
-            storeFile file('./fq_bytjz_gdt.jks')
-            storePassword '201999'
-            keyPassword '201999'
-            keyAlias 'fq_bytjz_gdt.jks'
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            signingConfig signingConfigs.debug
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug{
-            signingConfig signingConfigs.debug
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':fq_plugin_api')
-}

BIN
app_dev/fq_bytjz_gdt.jks


BIN
app_dev/fqgamesdkkeystore.jks


+ 0 - 32
app_dev/src/main/AndroidManifest.xml

@@ -1,32 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fqchannelsdk">
-    <!-- 访问网络 -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:name="com.funcheer.channel.sdk.MainApp"
-        android:theme="@style/fq_AppTheme" >
-
-
-    <activity android:name="com.funcheer.channel.sdk.MainActivity"
-        android:configChanges="orientation|keyboardHidden|screenSize"
-        android:launchMode="singleTop"
-        android:screenOrientation="portrait"
-        android:theme="@style/fq_AppTheme"
-        >
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-    </activity>
-
-
-    </application>
-</manifest>

+ 0 - 353
app_dev/src/main/java/com/funcheer/channel/sdk/MainActivity.java

@@ -1,353 +0,0 @@
-package com.funcheer.channel.sdk;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.example.fqchannelsdk.R;
-import com.fq.channel.sdk.api.FqGame;
-import com.fq.channel.sdk.api.IExit;
-import com.fq.channel.sdk.api.ILogout;
-import com.fq.channel.sdk.api.IResult;
-import com.fq.channel.sdk.base.bean.LoginInfo;
-import com.fq.channel.sdk.base.bean.PaymentInfo;
-import com.fq.channel.sdk.base.constants.ConstSet;
-import com.fq.channel.sdk.base.utils.FqLog;
-
-/**
- * @Description: 描述
- * @Author: FLuty
- * @CreateDate: 2020/3/24 09:49
- */
-public class MainActivity extends Activity implements View.OnClickListener {
-    private static final String TAG = MainActivity.class.getSimpleName();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fq_activity_main);
-        FqLog.i(TAG, "onCreate: ");
-        initUI();
-        initSDK();
-        FqGame.onCreate(this,savedInstanceState);
-    }
-
-    //跟游戏的主Activity走
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        FqGame.onSaveInstanceState(outState);
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        FqGame.onNewIntent(intent);
-        super.onNewIntent(intent);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        FqGame.onActivityResult(requestCode, resultCode, data);
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    protected void onRestart() {
-        super.onRestart();
-        FqLog.i(TAG, "onRestart: ");
-        FqGame.onRestart(this);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        FqLog.i(TAG, "onStart: ");
-        FqGame.onStart(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        FqLog.i(TAG, "onResume: ");
-        FqGame.onResume(this);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        FqLog.i(TAG, "onPause: ");
-        FqGame.onPause(this);
-
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        FqLog.i(TAG, "onStop: ");
-        FqGame.onStop(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        FqLog.i(TAG, "onDestroy: ");
-        FqGame.onDestroy(this);
-    }
-
-    private void initUI() {
-        findViewById(getResourceId("fq_login", "id")).setOnClickListener(this);
-        findViewById(getResourceId("fq_logout", "id")).setOnClickListener(this);
-        findViewById(getResourceId("fq_change_account", "id")).setOnClickListener(this);
-        findViewById(getResourceId("fq_charge", "id")).setOnClickListener(this);
-        findViewById(getResourceId("fq_report_data", "id")).setOnClickListener(this);
-        findViewById(getResourceId("fq_exit", "id")).setOnClickListener(this);
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        switch (id) {
-            case R.id.fq_login:
-                login();
-                break;
-
-            case R.id.fq_logout:
-                logout();
-                break;
-
-            case R.id.fq_change_account:
-                changeAccount();
-                break;
-
-            case R.id.fq_report_data:
-                dataReport();
-                break;
-
-            case R.id.fq_charge:
-                charge();
-                break;
-
-            case R.id.fq_exit:
-                exit();
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    private int getResourceId(String name, String defType) {
-        return this.getResources().getIdentifier(name, defType, this.getPackageName());
-    }
-
-    private void initSDK() {
-        FqGame.init(MainActivity.this, new IResult<String>() {
-            @Override
-            public void onSuccess(String s) {
-                FqLog.i(TAG, "init success: " + s);
-            }
-
-            @Override
-            public void onFail(String failMsg) {
-                FqLog.i(TAG, "init fail:" + failMsg);
-            }
-        });
-    }
-
-    private void login() {
-        FqGame.login(MainActivity.this, new IResult<LoginInfo>() {
-            @Override
-            public void onSuccess(LoginInfo s) {
-                FqLog.i(TAG, "login success: " + s.getUid());
-            }
-
-            @Override
-            public void onFail(String failMsg) {
-                FqLog.i(TAG, "login fail:" + failMsg);
-            }
-        });
-    }
-
-    public void charge() {
-
-        //get price
-        String priceString = ((EditText)findViewById(getResourceId("fq_charge_price",
-                "id"))).getText().toString();
-        if (TextUtils.isEmpty(priceString)){
-            showResult("请先填入价格");
-            return;
-        }
-        priceString = "0.1";
-        FqLog.i(TAG,"price : "+priceString);
-//        priceString = "0.01";
-        PaymentInfo paymentInfo = new PaymentInfo();
-        paymentInfo.setPrice(priceString);//订单金额
-        paymentInfo.setCpOrderId("cp"+System.currentTimeMillis());  //CP订单号
-        paymentInfo.setServerId("1");   //区服ID String的形式带入,值为int类型字符串
-        paymentInfo.setExtralInfo("FqGameSdk");  //扩展信息
-        paymentInfo.setRemark("remark");  //订单备注 透传信息
-        paymentInfo.setProductId("1");//商品ID,String类型
-        paymentInfo.setProductName("60金币"); //商品名称
-        paymentInfo.setProductDes("Fq"); //商品描述,值为String类型
-        paymentInfo.setProductUnit("金币"); //货币单位,值为String类型, 例:金币/钻石等且不可带量词
-        paymentInfo.setRate("10"); //兑换比例,String的形式带入,值为int类型,默认值为1
-        paymentInfo.setChargeId("pay123");  //计费ID 没有可不传
-        FqGame.pay(MainActivity.this,paymentInfo, new IResult<String>() {
-            @Override
-            public void onSuccess(String s) {
-                FqLog.i(TAG,"pay success: "+s);
-            }
-
-            @Override
-            public void onFail(String failMsg) {
-                FqLog.i(TAG,"pay fail:"+failMsg);
-            }
-        });
-    }
-
-    private void exit() {// 退出接口
-        FqGame.exit(MainActivity.this, new IExit() {
-            @Override
-            public void onExit() {
-                //退出游戏
-                System.exit(0);
-            }
-
-            @Override
-            public void onNoConfirmDialogExit() {
-                //渠道不存在退出界面,此处游戏必须弹出自己的退出确认框。
-                showGameExitView();
-            }
-        });
-    }
-
-    private void showGameExitView() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-        builder.setTitle("游戏自带退出界面");
-        builder.setCancelable(false);
-        builder.setPositiveButton("退出",
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog,
-                                        int which) {
-
-
-                        exitAppProcess(MainActivity.this);
-                    }
-                });
-        builder.show();
-    }
-
-    private void dataReport() {
-        //get report data type
-        String dataReportTypeString = ((EditText) findViewById(getResourceId("fq_report_type",
-                "id"))).getText().toString();
-        if (TextUtils.isEmpty(dataReportTypeString)) {
-            showResult("请先填入上报类型");
-            return;
-        }
-
-        int dataReportType = Integer.parseInt(dataReportTypeString);
-
-        /**设置统计参数的方法,游戏在参数发出变化时都需要调用接口设置参数*/
-        /**====================================================
-         * ConstSet.DATA_KEY_ROLE_ID 当前登录的玩家角色ID
-         * ConstSet.DATA_KEY_ROLE_NAME 当前登录的玩家角色名
-         * ConstSet.DATA_KEY_ROLE_LEVEL 当前登录的玩家角色等级
-         * ConstSet.DATA_KEY_ROLE_TYPE 角色类型,例如:战士,魔法师,弓箭手
-         * ConstSet.DATA_KEY_SERVER_ID 当前登录的游戏区服ID
-         * ConstSet.DATA_KEY_SERVER_NAME 当前登录的游戏区服名称
-         * ConstSet.DATA_KEY_BALANCE 当前用户游戏币余额
-         * ConstSet.DATA_KEY_VIP_LEVEL 当前用户VIP等级
-         * ConstSet.DATA_KEY_PARTY_NAME 当前用户所属帮派
-         * ConstSet.DATA_KEY_ROLE_CREATE_TIME 角色创建时间(单位:秒),该时间请务必传入服务端真实角色创建时间。
-         * ConstSet.DATA_KEY_ROLE_LEVEL_TIME 角色等级变化时间(单位:秒),该时间请务必传入服务端真实角色升级时间。
-         *
-         * ConstSet.DATA_KEY_DATA_TYPE 数据统计类型,以下所有统计点必接):
-         * 1、创建角色,data type为0;
-         * 2、角色升级,data type为1;
-         * 3、上传区服信息,data type为2;
-         * 4、登录,data type为3;
-         * 5、进入游戏,data type为4;
-         * 6、支付,data type为5;
-         * 7、选择服务器,data type为6;
-         * 8、退出游戏,data type为7;
-         =======================================================*/
-        Bundle staticsData = new Bundle();
-        staticsData.putString(ConstSet.DATA_KEY_ROLE_ID, "111");
-        staticsData.putString(ConstSet.DATA_KEY_ROLE_NAME, "战士");
-        staticsData.putString(ConstSet.DATA_KEY_ROLE_TYPE, "战士");
-        staticsData.putString(ConstSet.DATA_KEY_ROLE_LEVEL, "65");
-        staticsData.putString(ConstSet.DATA_KEY_SERVER_ID, "11");
-        staticsData.putString(ConstSet.DATA_KEY_SERVER_NAME, "服务器");
-        staticsData.putString(ConstSet.DATA_KEY_BALANCE, "102");
-        staticsData.putString(ConstSet.DATA_KEY_VIP_LEVEL, "2");
-        staticsData.putString(ConstSet.DATA_KEY_PARTY_NAME, "水果派");
-        staticsData.putLong(ConstSet.DATA_KEY_ROLE_CREATE_TIME, System.currentTimeMillis() / 1000);
-        staticsData.putLong(ConstSet.DATA_KEY_ROLE_LEVEL_TIME, System.currentTimeMillis() / 1000);
-        staticsData.putString(ConstSet.DATA_KEY_ZONE_ID, "1");
-        staticsData.putString(ConstSet.DATA_KEY_ZONE_NAME, "阿狸一区");
-        staticsData.putInt(ConstSet.DATA_KEY_DATA_TYPE, dataReportType);
-        FqGame.setRoleInfo(staticsData);
-    }
-
-    private void logout() {
-        FqGame.logout(this, new ILogout() {
-            @Override
-            public void onLogout() {
-                // 重新登录
-                FqLog.i(TAG,"onLogout");
-            }
-        });
-    }
-
-    private void changeAccount() {
-        FqLog.i(TAG,"changeAccount");
-        FqGame.changeAccount(this);
-    }
-
-    private void showResult(String message) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
-    }
-
-    private void exitAppProcess(Activity activity) {
-        if (!activity.isFinishing()) {
-            activity.finish();
-        }
-        android.os.Process.killProcess(android.os.Process.myPid());
-        System.exit(0);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        boolean isConsume = super.onKeyDown(keyCode, event);
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                isConsume = true;
-                exit();
-                break;
-        }
-
-        return isConsume;
-    }
-
-    @Override
-    public void onBackPressed() {
-        exit();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[]
-            grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        FqGame.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-}

+ 0 - 19
app_dev/src/main/java/com/funcheer/channel/sdk/MainApp.java

@@ -1,19 +0,0 @@
-package com.funcheer.channel.sdk;
-
-import android.content.Context;
-
-import com.fq.channel.sdk.FQApplication;
-
-
-public class MainApp extends FQApplication {
-
-    @Override
-    public void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-    }
-
-    @Override
-    public void onCreate(){
-        super.onCreate();
-    }
-}

+ 0 - 11
app_dev/src/main/java/com/tencent/tmgp/xzsjjby/wxapi/WXEntryActivity.java

@@ -1,11 +0,0 @@
-package com.tencent.tmgp.xzsjjby.wxapi;
-
-import com.fq.channel.sdk.WXCallBackActivity;
-
-/**
- * @Description: 描述
- * @Author: FLuty
- * @CreateDate: 2020/4/21 15:58
- */
-public class WXEntryActivity extends WXCallBackActivity {
-}

+ 0 - 170
app_dev/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#008577"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

+ 0 - 176
app_dev/src/main/res/layout/fq_activity_main.xml

@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="20dp"
-    android:background="@color/fq_gray"
-    tools:context="com.funcheer.channel.sdk.MainActivity"    >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/fq_user_module"
-                android:layout_alignParentTop="true"
-                android:layout_centerInParent="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/fq_white"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/fq_user_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/fq_white"
-                    android:gravity="center"
-                    android:text="@string/fq_user" />
-
-                <Button
-                    android:id="@+id/fq_login"
-                    android:layout_marginTop="5dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/fq_login" />
-
-                <Button
-                    android:id="@+id/fq_logout"
-                    android:layout_marginTop="5dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/fq_logout" />
-                <Button
-                    android:id="@+id/fq_change_account"
-                    android:layout_marginTop="5dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/fq_change_account" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/fq_charge_module"
-                android:layout_width="match_parent"
-                android:layout_marginTop="20dp"
-                android:layout_centerInParent="true"
-                android:background="@color/fq_white"
-                android:layout_below="@+id/fq_user_module"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/fq_charge_module_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/fq_white"
-                    android:gravity="center"
-                    android:text="@string/fq_charge_module" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/fq_input_price"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/fq_white"
-                        android:gravity="center"
-                        android:text="@string/fq_input_price" />
-
-                    <EditText
-                        android:id="@+id/fq_charge_price"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="1"
-                        />
-
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/fq_charge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_below="@+id/fq_charge_module"
-                    android:layout_centerInParent="true"
-                    android:text="@string/fq_charge" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/fq_data_report_module"
-                android:layout_width="match_parent"
-                android:layout_marginTop="20dp"
-                android:layout_centerInParent="true"
-                android:background="@color/fq_white"
-                android:layout_below="@+id/fq_user_module"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/fq_data_report_module_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/fq_white"
-                    android:gravity="center"
-                    android:text="@string/fq_data_report_module_tv" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/fq_input_report_type"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/fq_white"
-                        android:gravity="center"
-                        android:text="@string/fq_input_report_type" />
-
-                    <EditText
-                        android:id="@+id/fq_report_type"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="4"
-                        />
-
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/fq_report_data"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_below="@+id/fq_charge_module"
-                    android:layout_centerInParent="true"
-                    android:text="@string/fq_report_data" />
-
-            </LinearLayout>
-
-
-            <Button
-                android:id="@+id/fq_exit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_centerInParent="true"
-                android:text="@string/fq_exit" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</RelativeLayout>

BIN
app_dev/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
app_dev/src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
app_dev/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
app_dev/src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
app_dev/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
app_dev/src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
app_dev/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
app_dev/src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
app_dev/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
app_dev/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


+ 0 - 11
app_dev/src/main/res/values/colors.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-    <color name="fq_colorPrimary">#3F51B5</color>
-    <color name="fq_colorPrimaryDark">#303F9F</color>
-    <color name="fq_colorAccent">#FF4081</color>
-    <color name="fq_white">#FFFFFF</color>
-    <color name="fq_gray">#F1F1F1</color>
-</resources>

+ 0 - 25
app_dev/src/main/res/values/strings.xml

@@ -1,25 +0,0 @@
-<resources>
-    <string name="app_name">FQChannel-YSDK</string>
-    <string name="fq_result">result...</string>
-
-    <string name="fq_user">用户</string>
-    <string name="fq_login">登录</string>
-    <string name="fq_logout">注销</string>
-    <string name="fq_change_account">切换账号</string>
-
-    <string name="fq_charge_module">支付</string>
-    <string name="fq_input_price">输入价格:</string>
-    <string name="fq_charge">支付</string>
-
-    <string name="fq_data_report_module_tv">数据上报</string>
-    <string name="fq_input_report_type">输入数据上报类型:</string>
-    <string name="fq_report_data">上报数据</string>
-
-    <string name="fq_show_float_view">显示浮层</string>
-    <string name="fq_hide_float_view">隐藏浮层</string>
-
-    <string name="fq_get_channel_id">获取渠道号</string>
-    <string name="fq_share">分享</string>
-
-    <string name="fq_exit">退出</string>
-</resources>

+ 0 - 8
app_dev/src/main/res/values/styles.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="fq_AppTheme" parent="@android:style/Theme.NoTitleBar">
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowDisablePreview">true</item>
-    </style>
-</resources>

+ 0 - 1
app_dev_lib/.gitignore

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

+ 0 - 21
app_dev_lib/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

+ 0 - 27
app_dev_lib/src/androidTest/java/com/example/app_dev_lib/ExampleInstrumentedTest.java

@@ -1,27 +0,0 @@
-package com.example.app_dev_lib;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("com.example.app_dev_lib.test", appContext.getPackageName());
-    }
-}

+ 0 - 3
app_dev_lib/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">app_dev_lib</string>
-</resources>

+ 0 - 17
app_dev_lib/src/test/java/com/example/app_dev_lib/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.example.app_dev_lib;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

+ 0 - 3
fq_channel_mubao/src/main/java/com/fq/channel/sdk/SdkPluginDemo.java

@@ -12,9 +12,6 @@ import android.os.Looper;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import com.fq.channel.sdk.base.interfaces.FQPluginApi;
-import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
-import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.threelib.gson.JsonObject;
 
 import java.util.Map;

+ 0 - 3
fq_channel_oppo/src/main/java/com/fq/channel/sdk/FQApplication.java

@@ -1,9 +1,6 @@
 package com.fq.channel.sdk;
 
 import android.app.Application;
-import android.util.Log;
-
-import com.fq.channel.sdk.base.utils.FqLog;
 
 public class FQApplication extends Application{
 

+ 0 - 3
fq_channel_oppo/src/main/java/com/fq/channel/sdk/SdkPluginOppo.java

@@ -9,9 +9,6 @@ import android.widget.Toast;
 
 import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.constants.ConstSet;
-import com.fq.channel.sdk.base.interfaces.FQPluginApi;
-import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
-import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.threelib.gson.Gson;
 import com.fq.threelib.gson.JsonObject;
 import com.nearme.game.sdk.GameCenterSDK;

+ 1 - 2
fq_channel_ysdk/src/main/java/com/fq/channel/sdk/FQApplication.java

@@ -1,9 +1,8 @@
 package com.fq.channel.sdk;
 
 import android.app.Application;
-import android.util.Log;
 
-import com.fq.channel.sdk.base.utils.FqLog;
+import com.fq.channel.sdk.base.log.FqLog;
 
 public class FQApplication extends Application{
 

+ 3 - 5
fq_channel_ysdk/src/main/java/com/fq/channel/sdk/SdkPluginYsdk.java

@@ -5,7 +5,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -19,17 +18,16 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.fq.base.net.HttpManager;
+import com.fq.base.utils.Utils;
 import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.constants.ConstSet;
 import com.fq.channel.sdk.base.exception.BaseException;
 import com.fq.channel.sdk.base.interfaces.FQPluginApi;
 import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
-import com.fq.channel.sdk.base.net.HttpManager;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.channel.sdk.base.net.callback.BaseCallback;
 import com.fq.channel.sdk.base.net.req.ParamsUtils;
-import com.fq.channel.sdk.base.net.req.RepOrderBody;
-import com.fq.channel.sdk.base.utils.FqLog;
-import com.fq.channel.sdk.base.utils.Utils;
 import com.fq.threelib.gson.JsonObject;
 import com.tencent.ysdk.api.YSDKApi;
 import com.tencent.ysdk.framework.common.BaseRet;

+ 1 - 1
fq_channel_ysdk/src/main/java/com/fq/channel/sdk/WXCallBackActivity.java

@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.fq.channel.sdk.base.utils.FqLog;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;

+ 1 - 1
fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGame.java

@@ -7,7 +7,7 @@ import android.os.Bundle;
 
 import com.fq.channel.sdk.base.bean.LoginInfo;
 import com.fq.channel.sdk.base.bean.PaymentInfo;
-import com.fq.channel.sdk.base.utils.FqLog;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.channel.sdk.core.JointManager;
 import com.fq.channel.sdk.core.invoke.ApiPlugin;
 

+ 5 - 5
fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGameHander.java

@@ -2,16 +2,16 @@ package com.fq.channel.sdk.api;
 
 import android.app.Activity;
 
+import com.fq.base.utils.Utils;
 import com.fq.channel.sdk.base.bean.LoginInfo;
 import com.fq.channel.sdk.base.bean.PaymentInfo;
 import com.fq.channel.sdk.base.config.FqConfig;
-import com.fq.channel.sdk.base.interfaces.IPermissionRequestCallback;
+import com.fq.base.net.HttpManager;
+import com.fq.base.permission.IPermissionRequestCallback;
+import com.fq.base.permission.PermissionManager;
 import com.fq.channel.sdk.base.interfaces.PluginResult;
 import com.fq.channel.sdk.base.interfaces.PluginResultHandler;
-import com.fq.channel.sdk.base.net.HttpManager;
-import com.fq.channel.sdk.base.permission.PermissionManager;
-import com.fq.channel.sdk.base.utils.FqLog;
-import com.fq.channel.sdk.base.utils.Utils;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.channel.sdk.core.JointManager;
 
 import org.json.JSONException;

+ 1 - 0
fq_plugin_base/build.gradle

@@ -25,5 +25,6 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':fq_plugin_base_lib')
 
 }

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/config/FqConfig.java

@@ -3,7 +3,7 @@ package com.fq.channel.sdk.base.config;
 import android.app.Activity;
 import android.content.Context;
 
-import com.fq.channel.sdk.base.utils.Utils;
+import com.fq.base.utils.Utils;
 
 import org.json.JSONObject;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/config/ResourceCfg.java

@@ -3,7 +3,7 @@ package com.fq.channel.sdk.base.config;
 import android.content.Context;
 
 
-import com.fq.channel.sdk.base.utils.Utils;
+import com.fq.base.utils.Utils;
 
 import org.json.JSONObject;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/FqLog.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.channel.sdk.base.log;
 
 import android.util.Log;
 

+ 5 - 4
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/FqNetRequest.java

@@ -1,11 +1,12 @@
 package com.fq.channel.sdk.base.net;
 
+import com.fq.base.net.HttpManager;
+import com.fq.base.utils.Utils;
 import com.fq.channel.sdk.base.config.FqConfig;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.channel.sdk.base.net.callback.BaseCallback;
 import com.fq.channel.sdk.base.net.req.ParamsUtils;
 import com.fq.channel.sdk.base.net.req.RepOrderBody;
-import com.fq.channel.sdk.base.utils.FqLog;
-import com.fq.channel.sdk.base.utils.Utils;
 
 import java.util.HashMap;
 
@@ -25,7 +26,7 @@ public class FqNetRequest {
     public static void init(BaseCallback callback) {
         String request = ParamsUtils.getInstance().generateInitParams();
         FqLog.i(TAG, "init:" + request);
-        HttpManager.getInstance().post(FqConfig.KEY_URL_INT, Utils.decodeText(request), callback);
+        com.fq.base.net.HttpManager.getInstance().post(FqConfig.KEY_URL_INT, Utils.decodeText(request), callback);
     }
 
     /**
@@ -37,7 +38,7 @@ public class FqNetRequest {
     public static void login(HashMap<String, String> channelInfo, BaseCallback callback) {
         String request = ParamsUtils.getInstance().generateLoginParams(channelInfo);
         FqLog.i(TAG, "login:" + request);
-        HttpManager.getInstance().post(FqConfig.KEY_URL_LOGIN, request, callback);
+        com.fq.base.net.HttpManager.getInstance().post(FqConfig.KEY_URL_LOGIN, request, callback);
     }
 
     /**

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/callback/BaseCallback.java

@@ -3,9 +3,9 @@ package com.fq.channel.sdk.base.net.callback;
 import android.text.TextUtils;
 
 import com.fq.channel.sdk.base.exception.BaseException;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.channel.sdk.base.net.HttpConstant;
 import com.fq.channel.sdk.base.net.result.ResultHeader;
-import com.fq.channel.sdk.base.utils.FqLog;
 import com.fq.threelib.gson.Gson;
 import com.fq.threelib.okhttp3.Call;
 import com.fq.threelib.okhttp3.Callback;

+ 8 - 9
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/req/ParamsUtils.java

@@ -1,12 +1,12 @@
 package com.fq.channel.sdk.base.net.req;
 
+import com.fq.base.utils.DES;
+import com.fq.base.utils.DeviceUtils;
+import com.fq.base.utils.EncryptUtils;
+import com.fq.base.utils.Utils;
 import com.fq.channel.sdk.base.config.FqConfig;
 import com.fq.channel.sdk.base.exception.NullStringToEmptyAdapterFactory;
-import com.fq.channel.sdk.base.utils.DES;
-import com.fq.channel.sdk.base.utils.DeviceUtils;
-import com.fq.channel.sdk.base.utils.EncryptUtils;
-import com.fq.channel.sdk.base.utils.FqLog;
-import com.fq.channel.sdk.base.utils.Utils;
+import com.fq.channel.sdk.base.log.FqLog;
 import com.fq.threelib.gson.Gson;
 import com.fq.threelib.gson.GsonBuilder;
 import com.fq.threelib.gson.JsonObject;
@@ -21,10 +21,10 @@ import static com.fq.channel.sdk.base.config.FqConfig.KEY_CHANNEL_TYPE;
 import static com.fq.channel.sdk.base.config.FqConfig.KEY_TOKEN;
 
 /**
- * Created by Ethan on 2017/7/5.
- * 生成请求参数的单例工具类
+ * @Description: 生成请求参数的单例工具类
+ * @Author: FLuty
+ * @CreateDate: 2020/4/26 16:15
  */
-
 public class ParamsUtils {
 
     private static final String TAG = "ParamsUtils";
@@ -212,5 +212,4 @@ public class ParamsUtils {
                 .create();
         return gson.toJson(reqContent);
     }
-
 }

+ 1 - 0
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/result/ResultContent.java

@@ -1,5 +1,6 @@
 package com.fq.channel.sdk.base.net.result;
 
+
 /**
  * Created by Ethan on 2017/7/5.
  * 请求返回的JSON

app_dev/.gitignore → fq_plugin_base_lib/.gitignore


+ 1 - 5
app_dev_lib/build.gradle

@@ -24,10 +24,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

app_dev_lib/consumer-rules.pro → fq_plugin_base_lib/consumer-rules.pro


fq_plugin_base/libs/android-support-v4.jar → fq_plugin_base_lib/libs/android-support-v4.jar


fq_plugin_base/libs/conscrypt-openjdk-uber-2.4.0.jar → fq_plugin_base_lib/libs/conscrypt-openjdk-uber-2.4.0.jar


fq_plugin_base/libs/jsr305.jar → fq_plugin_base_lib/libs/jsr305.jar


app_dev/proguard-rules.pro → fq_plugin_base_lib/proguard-rules.pro


+ 1 - 1
app_dev_lib/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.app_dev_lib" />
+    package="com.fq.base" />

+ 6 - 6
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/net/HttpManager.java

@@ -1,6 +1,6 @@
-package com.fq.channel.sdk.base.net;
+package com.fq.base.net;
 
-import com.fq.channel.sdk.base.net.callback.BaseCallback;
+import com.fq.threelib.okhttp3.Callback;
 import com.fq.threelib.okhttp3.FormBody;
 import com.fq.threelib.okhttp3.MediaType;
 import com.fq.threelib.okhttp3.OkHttpClient;
@@ -45,7 +45,7 @@ public class HttpManager {
                 .build();
     }
 
-    public void request(final Request request, final BaseCallback callback) {
+    public void request(final Request request, final Callback callback) {
         client.newCall(request).enqueue(callback);
     }
 
@@ -55,7 +55,7 @@ public class HttpManager {
      * @param url
      * @param callback
      */
-    public void get(String url, BaseCallback callback) {
+    public void get(String url, Callback callback) {
         Request request = buildRequest(url, null,null, HttpMethodType.GET);
         request(request, callback);
     }
@@ -67,7 +67,7 @@ public class HttpManager {
      * @param params
      * @param callback
      */
-    public void post(String url, Map<String, String> params, BaseCallback callback) {
+    public void post(String url, Map<String, String> params, Callback callback) {
         Request request = buildRequest(url,null, params, HttpMethodType.POST);
         request(request, callback);
     }
@@ -79,7 +79,7 @@ public class HttpManager {
      * @param requestStr
      * @param callback
      */
-    public void post(String url, String requestStr, BaseCallback callback) {
+    public void post(String url, String requestStr, Callback callback) {
         RequestBody requestBody = RequestBody
                 .create(MediaType.parse("application/json; charset=utf-8"), requestStr);
         Request.Builder builder = new Request.Builder();

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/interfaces/IPermissionRequestCallback.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.interfaces;
+package com.fq.base.permission;
 
 /**
  * @Description: 权限回调

+ 1 - 3
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/permission/PermissionManager.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.permission;
+package com.fq.base.permission;
 
 import android.Manifest;
 import android.app.Activity;
@@ -8,8 +8,6 @@ import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 
-import com.fq.channel.sdk.base.interfaces.IPermissionRequestCallback;
-
 
 /**
  * @Description: 权限处理

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Base64.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.base.utils;
 
 public class Base64 {
     private static final char[] legalChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/DES.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.base.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/DeviceUtils.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.base.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/EncryptUtils.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.base.utils;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Utils.java

@@ -1,4 +1,4 @@
-package com.fq.channel.sdk.base.utils;
+package com.fq.base.utils;
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;

fq_plugin_base/src/main/java/com/fq/threelib/animal_sniffer/IgnoreJRERequirement.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/animal_sniffer/IgnoreJRERequirement.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/DefaultDateTypeAdapter.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/DefaultDateTypeAdapter.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/ExclusionStrategy.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/ExclusionStrategy.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/FieldAttributes.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldAttributes.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/FieldNamingPolicy.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldNamingPolicy.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/FieldNamingStrategy.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/FieldNamingStrategy.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/Gson.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/Gson.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/GsonBuilder.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/GsonBuilder.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/InstanceCreator.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/InstanceCreator.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonArray.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonArray.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonDeserializationContext.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonDeserializationContext.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonDeserializer.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonDeserializer.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonElement.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonElement.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonIOException.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonIOException.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonNull.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonNull.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonObject.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonObject.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonParseException.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonParseException.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonParser.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonParser.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonPrimitive.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonPrimitive.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonSerializationContext.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSerializationContext.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonSerializer.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSerializer.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonStreamParser.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonStreamParser.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/JsonSyntaxException.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/JsonSyntaxException.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/LongSerializationPolicy.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/LongSerializationPolicy.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/TypeAdapter.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/TypeAdapter.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/TypeAdapterFactory.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/TypeAdapterFactory.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/Expose.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Expose.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/JsonAdapter.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/JsonAdapter.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/SerializedName.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/SerializedName.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/Since.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Since.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/Until.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/Until.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/annotations/package-info.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/annotations/package-info.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/$Gson$Preconditions.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/$Gson$Preconditions.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/$Gson$Types.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/$Gson$Types.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/ConstructorConstructor.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/ConstructorConstructor.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/Excluder.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/Excluder.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/GsonBuildConfig.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/GsonBuildConfig.java


fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/JavaVersion.java → fq_plugin_base_lib/src/main/java/com/fq/threelib/gson/internal/JavaVersion.java


+ 0 - 0
fq_plugin_base/src/main/java/com/fq/threelib/gson/internal/JsonReaderInternalAccess.java


Some files were not shown because too many files changed in this diff