root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除推送

This commit is contained in:
jia 2024-12-13 02:12:30 +08:00
parent 9efb5ce796
commit 7907e47f0c
24 changed files with 204 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iFish7/build.gradle
View File

@ -132,10 +132,10 @@ dependencies {
implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.1.6' implementation 'io.reactivex:rxjava:1.1.6'
//阿里云推送相关 //阿里云推送相关
api "com.aliyun.ams:alicloud-android-push:${gradle.pushVersion}" // api "com.aliyun.ams:alicloud-android-push:${gradle.pushVersion}"
api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}" // api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}"
api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1" // api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1"
api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}" // api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}"
implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.24'//微信官方依赖库 implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.24'//微信官方依赖库
implementation 'androidx.appcompat:appcompat:1.6.1'//1.3.0 implementation 'androidx.appcompat:appcompat:1.6.1'//1.3.0
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'//2.0.4 implementation 'androidx.constraintlayout:constraintlayout:2.1.4'//2.0.4

10
iFish7/src/main/AndroidManifest.xml
View File

@ -2,16 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.ifish.activity"> package="com.ifish.activity">
<!--
android:versionCode="6"
android:versionName="3.1"
-->
<!--
<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="21" />
-->
<supports-screens <supports-screens
android:anyDensity="true" android:anyDensity="true"
android:largeScreens="true" android:largeScreens="true"

5
iFish7/src/main/java/com/ifish/activity/BindPhoneActivity.java
View File

@ -12,8 +12,6 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.ifish.activity.R.drawable; import com.ifish.activity.R.drawable;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
import com.ifish.basebean.CountryCode; import com.ifish.basebean.CountryCode;
@ -26,6 +24,7 @@ import com.ifish.geewe.DeviceCamera;
import com.ifish.utils.AnimationUtil; import com.ifish.utils.AnimationUtil;
import com.ifish.utils.Commons; import com.ifish.utils.Commons;
import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.NetWork;
import com.ifish.utils.Config;
import com.ifish.utils.HttpListener; import com.ifish.utils.HttpListener;
import com.ifish.utils.HttpManager; import com.ifish.utils.HttpManager;
import com.ifish.utils.MD5Util; import com.ifish.utils.MD5Util;
@ -374,7 +373,7 @@ public class BindPhoneActivity extends BaseActivity {
public void finish() { public void finish() {
} }
}, Commons.USER.getUserId(), PushServiceFactory.getCloudPushService().getDeviceId()); }, Commons.USER.getUserId(), Config.deviceId);
} }
}); });
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_0F_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -124,7 +123,7 @@ public class ChangeDeviceName_0F_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2A_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -122,7 +121,7 @@ public class ChangeDeviceName_2A_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2B_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -120,7 +119,7 @@ public class ChangeDeviceName_2B_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -132,7 +131,7 @@ public class ChangeDeviceName_2F_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_3F_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -116,7 +115,7 @@ public class ChangeDeviceName_3F_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_Eight_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -128,7 +127,7 @@ public class ChangeDeviceName_Eight_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_Four_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -115,7 +114,7 @@ public class ChangeDeviceName_Four_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_Three1C_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -115,7 +114,7 @@ public class ChangeDeviceName_Three1C_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_Three_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -112,7 +111,7 @@ public class ChangeDeviceName_Three_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

3
iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_Two_Activity.java
View File

@ -15,7 +15,6 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.alibaba.sdk.android.ams.common.util.StringUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -110,7 +109,7 @@ public class ChangeDeviceName_Two_Activity extends BaseActivity {
for(int i = 0 ; i < iconNameList.size() ; i++){ for(int i = 0 ; i < iconNameList.size() ; i++){
String s = iconNameList.get(i); String s = iconNameList.get(i);
for(int j = i + 1 ; j < iconNameList.size();j++){ for(int j = i + 1 ; j < iconNameList.size();j++){
if(s.equals(iconNameList.get(j)) && !StringUtil.isEmpty(s)){ if(s.equals(iconNameList.get(j)) && !TextUtils.isEmpty(s)){
return true; return true;
} }
} }

85
iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
View File

@ -30,12 +30,6 @@ import androidx.annotation.NonNull;
import com.alibaba.sdk.android.httpdns.HttpDns; import com.alibaba.sdk.android.httpdns.HttpDns;
import com.alibaba.sdk.android.httpdns.HttpDnsService; import com.alibaba.sdk.android.httpdns.HttpDnsService;
import com.alibaba.sdk.android.push.CloudPushService;
import com.alibaba.sdk.android.push.CommonCallback;
import com.alibaba.sdk.android.push.PushControlService;
import com.alibaba.sdk.android.push.huawei.HuaWeiRegister;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.alibaba.sdk.android.push.register.MiPushRegister;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.ifish.basebean.AdInfos; import com.ifish.basebean.AdInfos;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
@ -52,6 +46,7 @@ import com.ifish.utils.AnimationUtil;
import com.ifish.utils.Commons; import com.ifish.utils.Commons;
import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.Commons.LoginSPKey;
import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.NetWork;
import com.ifish.utils.Config;
import com.ifish.utils.ConfigUtil; import com.ifish.utils.ConfigUtil;
import com.ifish.utils.HttpListener; import com.ifish.utils.HttpListener;
import com.ifish.utils.HttpManager; import com.ifish.utils.HttpManager;
@ -649,7 +644,7 @@ public class LoadingActivity extends BaseActivityNotAnim {
public void finish() { public void finish() {
} }
}, Commons.USER.getUserId(), PushServiceFactory.getCloudPushService().getDeviceId()); }, Commons.USER.getUserId(), Config.deviceId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -738,7 +733,7 @@ public class LoadingActivity extends BaseActivityNotAnim {
public void finish() { public void finish() {
} }
}, Commons.USER.getUserId(), PushServiceFactory.getCloudPushService().getDeviceId()); }, Commons.USER.getUserId(), Config.deviceId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -895,7 +890,7 @@ public class LoadingActivity extends BaseActivityNotAnim {
alertDialog.cancel(); alertDialog.cancel();
SPUtil.getInstance(getApplicationContext()).putBoolean(firstShowPrivacy,true); SPUtil.getInstance(getApplicationContext()).putBoolean(firstShowPrivacy,true);
// getPermission(); // getPermission();
pushInit(); // pushInit();
initapp(); initapp();
} }
}); });
@ -904,40 +899,40 @@ public class LoadingActivity extends BaseActivityNotAnim {
} }
private void pushInit(){ // private void pushInit(){
PushServiceFactory.getPushControlService().setConnectionChangeListener(new PushControlService.ConnectionChangeListener() { // PushServiceFactory.getPushControlService().setConnectionChangeListener(new PushControlService.ConnectionChangeListener() {
@Override // @Override
public void onConnect() { // public void onConnect() {
Log.d("AliyunPush", "Aliyun Push connected"); // Log.d("AliyunPush", "Aliyun Push connected");
} // }
//
@Override // @Override
public void onDisconnect(String s, String s1) { // public void onDisconnect(String s, String s1) {
Log.d("AliyunPush", "Aliyun Push disconnect, errorCode:" + s + " msg = " + s1); // Log.d("AliyunPush", "Aliyun Push disconnect, errorCode:" + s + " msg = " + s1);
} // }
}); // });
//
//
final CloudPushService pushService = PushServiceFactory.getCloudPushService(); // final CloudPushService pushService = PushServiceFactory.getCloudPushService();
//
//仅适用于Debug包，正式包不需要此行 // //仅适用于Debug包，正式包不需要此行
pushService.setLogLevel(CloudPushService.LOG_DEBUG); // pushService.setLogLevel(CloudPushService.LOG_DEBUG);
//
pushService.register(this, new CommonCallback() { // pushService.register(this, new CommonCallback() {
@Override // @Override
public void onSuccess(String response) { // public void onSuccess(String response) {
Log.d("Init", "init cloudchannel success"); // Log.d("Init", "init cloudchannel success");
Log.d("Initpushid", pushService.getDeviceId()); // Log.d("Initpushid", pushService.getDeviceId());
} // }
//
@Override // @Override
public void onFailed(String errorCode, String errorMessage) { // public void onFailed(String errorCode, String errorMessage) {
Log.d("Init", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage); // Log.d("Init", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
} // }
}); // });
// 注册方法会自动判断是否支持小米系统推送，如不支持会跳过注册。 // // 注册方法会自动判断是否支持小米系统推送，如不支持会跳过注册。
MiPushRegister.register(this, "2882303761517421890", "5491742138890"); // MiPushRegister.register(this, "2882303761517421890", "5491742138890");
// 注册方法会自动判断是否支持华为系统推送，如不支持会跳过注册。 // // 注册方法会自动判断是否支持华为系统推送，如不支持会跳过注册。
HuaWeiRegister.register(BaseApplication.app); // HuaWeiRegister.register(BaseApplication.app);
} // }
} }

6
iFish7/src/main/java/com/ifish/activity/LoginActivity.java
View File

@ -22,7 +22,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.ifish.basebean.BaseBean; import com.ifish.basebean.BaseBean;
import com.ifish.basebean.Device; import com.ifish.basebean.Device;
import com.ifish.basebean.MyData; import com.ifish.basebean.MyData;
@ -37,6 +36,7 @@ import com.ifish.utils.Commons;
import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.Commons.LoginSPKey;
import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.NetWork;
import com.ifish.utils.Commons.Text; import com.ifish.utils.Commons.Text;
import com.ifish.utils.Config;
import com.ifish.utils.ConfigUtil; import com.ifish.utils.ConfigUtil;
import com.ifish.utils.HttpListener; import com.ifish.utils.HttpListener;
import com.ifish.utils.HttpManager; import com.ifish.utils.HttpManager;
@ -249,7 +249,7 @@ public class LoginActivity extends BaseActivity {
public void finish() { public void finish() {
} }
}, Commons.USER.getUserId(), PushServiceFactory.getCloudPushService().getDeviceId()); }, Commons.USER.getUserId(), Config.deviceId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -458,7 +458,7 @@ public class LoginActivity extends BaseActivity {
public void finish() { public void finish() {
} }
}, Commons.USER.getUserId(), PushServiceFactory.getCloudPushService().getDeviceId()); }, Commons.USER.getUserId(), Config.deviceId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

2
iFish7/src/main/java/com/ifish/activity/MainTabActivity.java
View File

@ -381,7 +381,7 @@ public class MainTabActivity extends BaseFragmentActivity {
mViewPager.setOffscreenPageLimit(3);//缓存页面的个数 mViewPager.setOffscreenPageLimit(3);//缓存页面的个数
TabAdapter adapter = new TabAdapter(this, tabHost, mViewPager); TabAdapter adapter = new TabAdapter(this, tabHost, mViewPager);
adapter.addTab(tabHost.newTabSpec("device").setIndicator(getIndicator(Commons.Text.TAB_Home, R.drawable.tab_icon_device_select)), DeviceFragment.class); adapter.addTab(tabHost.newTabSpec("device").setIndicator(getIndicator(Commons.Text.TAB_Home, R.drawable.tab_icon_device_select)), DeviceFragment.class);
adapter.addTab(tabHost.newTabSpec("message").setIndicator(getIndicator(Commons.Text.TAB_LookFish, R.drawable.tab_icon_message_select)), LookFishListFragment.class); // adapter.addTab(tabHost.newTabSpec("message").setIndicator(getIndicator(Commons.Text.TAB_LookFish, R.drawable.tab_icon_message_select)), LookFishListFragment.class);
adapter.addTab(tabHost.newTabSpec("discove").setIndicator(getIndicator(Commons.Text.TAB_Discove, R.drawable.tab_icon_discove_select)), DiscoveFragment.class); adapter.addTab(tabHost.newTabSpec("discove").setIndicator(getIndicator(Commons.Text.TAB_Discove, R.drawable.tab_icon_discove_select)), DiscoveFragment.class);
adapter.addTab(tabHost.newTabSpec("mine").setIndicator(getTaskBageIndicator(Commons.Text.TAB_Mine, R.drawable.tab_icon_mine_select)), MineFragment.class); adapter.addTab(tabHost.newTabSpec("mine").setIndicator(getTaskBageIndicator(Commons.Text.TAB_Mine, R.drawable.tab_icon_mine_select)), MineFragment.class);
tabHost.getTabWidget().setShowDividers(0); tabHost.getTabWidget().setShowDividers(0);

1
iFish7/src/main/java/com/ifish/activity/MineActivity.java
View File

@ -107,7 +107,6 @@ public class MineActivity extends BaseActivity {
String[] permission; String[] permission;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.mine_activity); setContentView(R.layout.mine_activity);
initTitle("我的信息"); initTitle("我的信息");

1
iFish7/src/main/java/com/ifish/activity/MySettingActivity.java
View File

@ -93,7 +93,6 @@ public class MySettingActivity extends BaseActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startActivity(new Intent(MySettingActivity.this,PhoneInfoActivity.class)); startActivity(new Intent(MySettingActivity.this,PhoneInfoActivity.class));
// ToastUtil.show(MySettingActivity.this,"跳转到debug页面");
} }
}); });
} }

1
iFish7/src/main/java/com/ifish/activity/SettingActivity.java
View File

@ -77,7 +77,6 @@ public class SettingActivity extends BaseActivity {
NotificationManager mNotificationManager; NotificationManager mNotificationManager;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
String stringExtra = getIntent().getStringExtra("value"); String stringExtra = getIntent().getStringExtra("value");
if (!"value".equals(stringExtra)) {//友盟微社区bug 会自动跳转到SettingActivity，所以用值判断，如果不是从侧滑菜单进入此activity，则马上销毁。 if (!"value".equals(stringExtra)) {//友盟微社区bug 会自动跳转到SettingActivity，所以用值判断，如果不是从侧滑菜单进入此activity，则马上销毁。

65
iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java
View File

@ -24,13 +24,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
import com.alibaba.sdk.android.push.CloudPushService;
import com.alibaba.sdk.android.push.CommonCallback;
import com.alibaba.sdk.android.push.PushControlService;
import com.alibaba.sdk.android.push.huawei.HuaWeiRegister;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.alibaba.sdk.android.push.register.MiPushRegister;
//import com.clj.fastble.BleManager; //import com.clj.fastble.BleManager;
//import com.clj.fastble.scan.BleScanRuleConfig; //import com.clj.fastble.scan.BleScanRuleConfig;
import com.ifish.activity.BuildConfig; import com.ifish.activity.BuildConfig;
@ -92,7 +85,7 @@ public class BaseApplication extends MultiDexApplication {
// initShareSDK(); // initShareSDK();
// initSMSSDK(); // initSMSSDK();
// initAlibcTradeSDK(); // initAlibcTradeSDK();
initalipushSDK(); // initalipushSDK();
P2PSpecial.getInstance().init(app, APPID, APPToken, APPVersion); P2PSpecial.getInstance().init(app, APPID, APPToken, APPVersion);
initLog(); initLog();
//初始化MMKV //初始化MMKV
@ -238,34 +231,34 @@ public class BaseApplication extends MultiDexApplication {
}); });
} }
private void initalipushSDK() { // private void initalipushSDK() {
PushServiceFactory.init(this); // PushServiceFactory.init(this);
//
//创建渠道 // //创建渠道
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); // NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
// 通知渠道的id。 // // 通知渠道的id。
String id = "1"; // String id = "1";
// 用户可以看到的通知渠道的名字。 // // 用户可以看到的通知渠道的名字。
CharSequence name = "爱鱼奇"; // CharSequence name = "爱鱼奇";
// 用户可以看到的通知渠道的描述。 // // 用户可以看到的通知渠道的描述。
// String description = "通知"; //// String description = "通知";
int importance = NotificationManager.IMPORTANCE_HIGH; // int importance = NotificationManager.IMPORTANCE_HIGH;
NotificationChannel mChannel = new NotificationChannel(id, name, importance); // NotificationChannel mChannel = new NotificationChannel(id, name, importance);
// 配置通知渠道的属性。 // // 配置通知渠道的属性。
// mChannel.setDescription(description); //// mChannel.setDescription(description);
// 设置通知出现时的闪灯（如果Android设备支持的话）。 // // 设置通知出现时的闪灯（如果Android设备支持的话）。
mChannel.enableLights(true); // mChannel.enableLights(true);
mChannel.setLightColor(Color.RED); // mChannel.setLightColor(Color.RED);
// 设置通知出现时的震动（如果Android设备支持的话）。 // // 设置通知出现时的震动（如果Android设备支持的话）。
mChannel.enableVibration(true); // mChannel.enableVibration(true);
mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400}); // mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400});
// 最后在notificationmanager中创建该通知渠道。 // // 最后在notificationmanager中创建该通知渠道。
mNotificationManager.createNotificationChannel(mChannel); // mNotificationManager.createNotificationChannel(mChannel);
} // }
//
//
} // }
// private void initSMSSDK() {//初始化MOB短信 SDK // private void initSMSSDK() {//初始化MOB短信 SDK
// SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92"); // SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92");

118
iFish7/src/main/java/com/ifish/push/AlipushReceiver.java
View File

@ -1,60 +1,58 @@
package com.ifish.push; //package com.ifish.push;
//
import android.content.Context; //import android.content.Context;
import android.content.Intent; //import android.content.Intent;
import android.util.Log; //import android.util.Log;
//
import com.alibaba.sdk.android.push.MessageReceiver; //import com.ifish.activity.RecentContactsActivity;
import com.alibaba.sdk.android.push.notification.CPushMessage; //
import com.ifish.activity.RecentContactsActivity; //import java.util.Map;
//
import java.util.Map; ///**
// * Created by Administrator on 2019/5/22.
/** // */
* Created by Administrator on 2019/5/22. //
*/ //public class AlipushReceiver extends MessageReceiver {
// // 消息接收部分的LOG_TAG
public class AlipushReceiver extends MessageReceiver { // public static final String REC_TAG = "receiver";
// 消息接收部分的LOG_TAG //
public static final String REC_TAG = "receiver"; // @Override
// public void onNotification(Context context, String title, String summary, Map<String, String> extraMap) {
@Override // // TODO 处理推送通知
public void onNotification(Context context, String title, String summary, Map<String, String> extraMap) { // Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap);
// TODO 处理推送通知 // }
Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap); //
} // @Override
// public void onMessage(Context context, CPushMessage cPushMessage) {
@Override // Log.e("MyMessageReceiver", "onMessage, messageId: " + cPushMessage.getMessageId() + ", title: " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent());
public void onMessage(Context context, CPushMessage cPushMessage) { // }
Log.e("MyMessageReceiver", "onMessage, messageId: " + cPushMessage.getMessageId() + ", title: " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); //
} // @Override
// public void onNotificationOpened(Context context, String title, String summary, String extraMap) {
@Override // Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap);
public void onNotificationOpened(Context context, String title, String summary, String extraMap) { // Intent intent = new Intent();
Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); // intent.setClass(context, RecentContactsActivity.class);
Intent intent = new Intent(); // intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(context, RecentContactsActivity.class); // context.startActivity(intent);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // }
context.startActivity(intent); //
} // @Override
// protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) {
@Override // Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap);
protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { // Intent intent = new Intent();
Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); // intent.setClass(context, RecentContactsActivity.class);
Intent intent = new Intent(); // intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(context, RecentContactsActivity.class); // context.startActivity(intent);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // }
context.startActivity(intent); //
} // @Override
// protected void onNotificationReceivedInApp(Context context, String title, String summary, Map<String, String> extraMap, int openType, String openActivity, String openUrl) {
@Override // Log.e("MyMessageReceiver", "onNotificationReceivedInApp, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap + ", openType:" + openType + ", openActivity:" + openActivity + ", openUrl:" + openUrl);
protected void onNotificationReceivedInApp(Context context, String title, String summary, Map<String, String> extraMap, int openType, String openActivity, String openUrl) { // }
Log.e("MyMessageReceiver", "onNotificationReceivedInApp, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap + ", openType:" + openType + ", openActivity:" + openActivity + ", openUrl:" + openUrl); //
} // @Override
// protected void onNotificationRemoved(Context context, String messageId) {
@Override // Log.e("MyMessageReceiver", "onNotificationRemoved");
protected void onNotificationRemoved(Context context, String messageId) { // }
Log.e("MyMessageReceiver", "onNotificationRemoved"); //
} //}
}

78
iFish7/src/main/java/com/ifish/push/PopupPushActivity.java
View File

@ -1,39 +1,39 @@
package com.ifish.push; //package com.ifish.push;
//
import android.content.Intent; //import android.content.Intent;
import android.os.Bundle; //import android.os.Bundle;
import android.util.Log; //import android.util.Log;
//
import com.alibaba.sdk.android.push.AndroidPopupActivity; //import com.alibaba.sdk.android.push.AndroidPopupActivity;
import com.ifish.activity.RecentContactsActivity; //import com.ifish.activity.RecentContactsActivity;
//
import java.util.Map; //import java.util.Map;
//
/** ///**
* Created by Administrator on 2019/6/2. // * Created by Administrator on 2019/6/2.
*/ // */
//
public class PopupPushActivity extends AndroidPopupActivity { //public class PopupPushActivity extends AndroidPopupActivity {
static final String TAG = "PopupPushActivity"; // static final String TAG = "PopupPushActivity";
//
@Override // @Override
protected void onCreate(Bundle savedInstanceState) { // protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); // super.onCreate(savedInstanceState);
} // }
//
/** // /**
* 实现通知打开回调方法，获取通知相关信息 // * 实现通知打开回调方法，获取通知相关信息
* // *
* @param title 标题 // * @param title 标题
* @param summary 内容 // * @param summary 内容
* @param extMap 额外参数 // * @param extMap 额外参数
*/ // */
@Override // @Override
protected void onSysNoticeOpened(String title, String summary, Map<String, String> extMap) { // protected void onSysNoticeOpened(String title, String summary, Map<String, String> extMap) {
Intent intent = new Intent(); // Intent intent = new Intent();
intent.setClass(this, RecentContactsActivity.class); // intent.setClass(this, RecentContactsActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
this.startActivity(intent); // this.startActivity(intent);
Log.d(TAG, "OnMiPushSysNoticeOpened, title: " + title + ", content: " + summary + ", extMap: " + extMap); // Log.d(TAG, "OnMiPushSysNoticeOpened, title: " + title + ", content: " + summary + ", extMap: " + extMap);
} // }
} //}

8
iFish7/src/main/java/com/ifish/utils/Config.kt Normal file
View File

@ -0,0 +1,8 @@
package com.ifish.utils
class Config {
companion object{
const val deviceId= ""
}
}

11
iFish7/src/main/res/layout/mysetting_activity.xml
View File

@ -281,7 +281,16 @@
android:layout_marginRight="@dimen/mine_fragment_ic_right" android:layout_marginRight="@dimen/mine_fragment_ic_right"
android:src="@drawable/ic_back_right_black" /> android:src="@drawable/ic_back_right_black" />
</RelativeLayout> </RelativeLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_exit"
android:layout_width="fill_parent"
android:layout_height="@dimen/mine_fragment_item"
android:layout_marginTop="@dimen/mine_fragment_gray_size"
android:text="注销账号"
android:textSize="17sp"
android:gravity="center"
android:textColor="@color/red"
android:background="@drawable/minefragment_bg_select"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_debug" android:id="@+id/tv_debug"
android:layout_width="fill_parent" android:layout_width="fill_parent"