diff --git a/gradle.properties b/gradle.properties index 4f7e90344..334992c02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,4 @@ android.useAndroidX=true android.useDeprecatedNdk=true versionCode=45 -versionName=4.11.17 \ No newline at end of file +versionName=4.11.5 \ No newline at end of file diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 39d973183..1d76b82fb 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -90,8 +90,6 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1'//2.8.9 //bugly implementation files('libs/commons-io-1.4.jar') - implementation files('libs/TalkingDataAnalytics_V2.1.37.jar') - implementation 'de.greenrobot:eventbus:2.4.0' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.squareup.okhttp3:okhttp:3.9.0' //3.9.0 @@ -179,8 +177,8 @@ dependencies { implementation 'com.github.Jasonchenlijian:FastBle:2.4.0' // // annotationProcessor 'com.github.bumptech.glide:compiler:3.7.0' - implementation 'com.getui:gtsdk:3.3.7.0' //个推SDK - implementation 'com.getui:gtc:3.2.16.0' //个推核心组件 +// implementation 'com.getui:gtsdk:3.3.7.0' //个推SDK +// implementation 'com.getui:gtc:3.2.16.0' //个推核心组件 implementation 'io.github.lucksiege:pictureselector:v3.11.2' // 图片压缩 (按需引入) diff --git a/iFish7/libs/TalkingDataAnalytics_V2.1.37.jar b/iFish7/libs/TalkingDataAnalytics_V2.1.37.jar deleted file mode 100644 index 3007c5d21..000000000 Binary files a/iFish7/libs/TalkingDataAnalytics_V2.1.37.jar and /dev/null differ diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index 67171b793..74ddde4e8 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -207,13 +207,13 @@ android:usesCleartextTraffic="true" tools:replace="android:icon,android:theme,android:allowBackup"> - - - + + + + + + + L.i("jjia--------"+s)); + // jjia-push + // IPushService + // IIntentService +// PushManager.getInstance().preInit(this); +// PushManager.getInstance().initialize(this); +// PushManager.getInstance().setDebugLogger(this, s -> L.i("jjia--------"+s)); } @@ -310,11 +305,6 @@ public class BaseApplication extends MultiDexApplication { // SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92"); // } - //talkingdata应用留存统计 - private void initTalkingDataSDK() { - TCAgent.init(getApplicationContext()); - } - //初始化腾讯bugly SDK&全局捕获Crash private void initCrashSDK() { // CrashReport.initCrashReport(getApplicationContext(), "4c8cf75014", true);//注册bugly上报 diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java b/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java index 245041a2d..ffba294f9 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java @@ -27,7 +27,6 @@ import com.ifish.utils.HttpManager; import com.ifish.utils.L; import com.ifish.utils.ToastGradeUtil; import com.ifish.view.CustomProgressDialog; -import com.tendcloud.tenddata.TCAgent; /** * * @ClassName: BaseFragmentActivity @@ -160,13 +159,11 @@ public class BaseFragmentActivity extends FragmentActivity implements OnClickL @Override protected void onResume() { super.onResume(); - TCAgent.onResume(this); L.i(this.getClass().getName()+"----------------onResume"); } @Override protected void onPause() { super.onPause(); - TCAgent.onPause(this); L.i(this.getClass().getName()+"----------------onPause"); } @Override diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseSingleActivity.java b/iFish7/src/main/java/com/ifish/baseclass/BaseSingleActivity.java index 87e283016..faa5dae96 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseSingleActivity.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseSingleActivity.java @@ -18,7 +18,6 @@ import android.widget.Toast; import com.ifish.activity.R; import com.ifish.utils.ActivityManager; import com.ifish.utils.L; -import com.tendcloud.tenddata.TCAgent; /** * * @ClassName: BaseActivity 无标题点击效果 点两下返回退出应用 @@ -40,7 +39,7 @@ public class BaseSingleActivity extends Activity implements OnClickListener { this.requestWindowFeature(Window.FEATURE_NO_TITLE);//取消标题栏 super.onCreate(savedInstanceState); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//锁定竖屏 - toast = Toast.makeText(this, "", 0); + toast = Toast.makeText(this, "", Toast.LENGTH_SHORT); } /** * @@ -62,13 +61,11 @@ public class BaseSingleActivity extends Activity implements OnClickListener { @Override protected void onResume() { super.onResume(); - TCAgent.onResume(this); L.i(this.getClass().getName()+"----------------onResume"); } @Override protected void onPause() { super.onPause(); - TCAgent.onPause(this); L.i(this.getClass().getName()+"----------------onPause"); } @Override diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseSwipeBackActivity.java b/iFish7/src/main/java/com/ifish/baseclass/BaseSwipeBackActivity.java index 7ca0ab0de..118810013 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseSwipeBackActivity.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseSwipeBackActivity.java @@ -20,7 +20,6 @@ import com.ifish.utils.AnimationUtil; import com.ifish.utils.L; import com.ifish.view.CustomProgressDialog; import com.ifish.view.SwipeBackActivity; -import com.tendcloud.tenddata.TCAgent; /** * * @ClassName: BaseSwipeBackActivity @@ -40,7 +39,7 @@ public class BaseSwipeBackActivity extends SwipeBackActivity implements OnClic this.requestWindowFeature(Window.FEATURE_NO_TITLE);//取消标题栏 super.onCreate(savedInstanceState); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//锁定竖屏 - toast = Toast.makeText(this, "", 0); + toast = Toast.makeText(this, "", Toast.LENGTH_SHORT); } /** * 初始化控件 @@ -81,13 +80,11 @@ public class BaseSwipeBackActivity extends SwipeBackActivity implements OnClic @Override protected void onResume() { super.onResume(); - TCAgent.onResume(this); L.i(this.getClass().getName()+"----------------onResume"); } @Override protected void onPause() { super.onPause(); - TCAgent.onPause(this); L.i(this.getClass().getName()+"----------------onPause"); } @Override diff --git a/iFish7/src/main/java/com/ifish/push/IIntentService.java b/iFish7/src/main/java/com/ifish/push/IIntentService.java index 3449efa0d..ce8e771a6 100644 --- a/iFish7/src/main/java/com/ifish/push/IIntentService.java +++ b/iFish7/src/main/java/com/ifish/push/IIntentService.java @@ -1,51 +1,51 @@ -package com.ifish.push; - -import android.content.Context; -import android.content.Intent; - -import com.ifish.activity.PushActivity; -import com.ifish.activity.RecentContactsActivity; -import com.ifish.baseclass.BaseApplication; -import com.ifish.utils.L; -import com.igexin.sdk.GTIntentService; -import com.igexin.sdk.message.GTNotificationMessage; -import com.igexin.sdk.message.GTTransmitMessage; - -public class IIntentService extends GTIntentService { - - @Override - public void onReceiveClientId(Context context, String s) { - super.onReceiveClientId(context, s); - L.i("jjia----------push--cid--"+s); - } - - @Override - public void onReceiveMessageData(Context context, GTTransmitMessage gtTransmitMessage) { - super.onReceiveMessageData(context, gtTransmitMessage); - } - - // cid离线上线通知 - @Override - public void onReceiveOnlineState(Context context, boolean b) { - super.onReceiveOnlineState(context, b); - } - - // 通知到达 - @Override - public void onNotificationMessageArrived(Context context, GTNotificationMessage gtNotificationMessage) { - super.onNotificationMessageArrived(context, gtNotificationMessage); - - L.i("jjia---------通知到达---"); - } - - //通知点击 - @Override - public void onNotificationMessageClicked(Context context, GTNotificationMessage gtNotificationMessage) { - super.onNotificationMessageClicked(context, gtNotificationMessage); - L.i("jjia---------通知点击---"); - Intent intent = new Intent(); - intent.setClass(context, PushActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } -} +//package com.ifish.push; +// +//import android.content.Context; +//import android.content.Intent; +// +//import com.ifish.activity.PushActivity; +//import com.ifish.activity.RecentContactsActivity; +//import com.ifish.baseclass.BaseApplication; +//import com.ifish.utils.L; +//import com.igexin.sdk.GTIntentService; +//import com.igexin.sdk.message.GTNotificationMessage; +//import com.igexin.sdk.message.GTTransmitMessage; +// +//public class IIntentService extends GTIntentService { +// +// @Override +// public void onReceiveClientId(Context context, String s) { +// super.onReceiveClientId(context, s); +// L.i("jjia----------push--cid--"+s); +// } +// +// @Override +// public void onReceiveMessageData(Context context, GTTransmitMessage gtTransmitMessage) { +// super.onReceiveMessageData(context, gtTransmitMessage); +// } +// +// // cid离线上线通知 +// @Override +// public void onReceiveOnlineState(Context context, boolean b) { +// super.onReceiveOnlineState(context, b); +// } +// +// // 通知到达 +// @Override +// public void onNotificationMessageArrived(Context context, GTNotificationMessage gtNotificationMessage) { +// super.onNotificationMessageArrived(context, gtNotificationMessage); +// +// L.i("jjia---------通知到达---"); +// } +// +// //通知点击 +// @Override +// public void onNotificationMessageClicked(Context context, GTNotificationMessage gtNotificationMessage) { +// super.onNotificationMessageClicked(context, gtNotificationMessage); +// L.i("jjia---------通知点击---"); +// Intent intent = new Intent(); +// intent.setClass(context, PushActivity.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// context.startActivity(intent); +// } +//} diff --git a/iFish7/src/main/java/com/ifish/push/IPushService.java b/iFish7/src/main/java/com/ifish/push/IPushService.java index 0328ad218..e375389b8 100644 --- a/iFish7/src/main/java/com/ifish/push/IPushService.java +++ b/iFish7/src/main/java/com/ifish/push/IPushService.java @@ -1,6 +1,6 @@ package com.ifish.push; -import com.igexin.sdk.PushService; - -public class IPushService extends PushService { -} +//import com.igexin.sdk.PushService; +// +//public class IPushService extends PushService { +//}