diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java index f3c50cd3e..e77e7acd5 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java @@ -31,12 +31,6 @@ import com.ifish.utils.TrustAllCerts; //import com.igexin.sdk.PushManager; import com.igexin.sdk.PushManager; import com.p2p.core.P2PSpecial.P2PSpecial; -<<<<<<< HEAD -//import com.tencent.bugly.crashreport.CrashReport; -import com.tendcloud.tenddata.TCAgent; -import com.umeng.commonsdk.UMConfigure; -import com.umeng.socialize.PlatformConfig; -======= import com.squareup.picasso.Picasso; import java.security.SecureRandom; @@ -51,7 +45,6 @@ import javax.net.ssl.TrustManager; import de.greenrobot.event.EventBus; import okhttp3.OkHttpClient; ->>>>>>> release /** * @author Jacky dada @@ -225,100 +218,6 @@ public class BaseApplication extends MultiDexApplication { }); } -<<<<<<< HEAD - private void initalipushSDK() { - PushServiceFactory.init(this); - - //创建渠道 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - // 通知渠道的id。 - String id = "1"; - // 用户可以看到的通知渠道的名字。 - CharSequence name = "爱鱼奇"; - // 用户可以看到的通知渠道的描述。 -// String description = "通知"; - int importance = NotificationManager.IMPORTANCE_HIGH; - NotificationChannel mChannel = new NotificationChannel(id, name, importance); - // 配置通知渠道的属性。 -// mChannel.setDescription(description); - // 设置通知出现时的闪灯（如果Android设备支持的话）。 - mChannel.enableLights(true); - mChannel.setLightColor(Color.RED); - // 设置通知出现时的震动（如果Android设备支持的话）。 - mChannel.enableVibration(true); - mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400}); - // 最后在notificationmanager中创建该通知渠道。 - mNotificationManager.createNotificationChannel(mChannel); - } - - PushServiceFactory.getPushControlService().setConnectionChangeListener(new PushControlService.ConnectionChangeListener() { - @Override - public void onConnect() { - Log.d("AliyunPush", "Aliyun Push connected"); - } - - @Override - public void onDisconnect(String s, String s1) { - Log.d("AliyunPush", "Aliyun Push disconnect, errorCode:" + s + " msg = " + s1); - } - }); - - - final CloudPushService pushService = PushServiceFactory.getCloudPushService(); - - //仅适用于Debug包，正式包不需要此行 - pushService.setLogLevel(CloudPushService.LOG_DEBUG); - - pushService.register(this, new CommonCallback() { - @Override - public void onSuccess(String response) { - Log.d("Init", "init cloudchannel success"); - Log.d("Initpushid", pushService.getDeviceId()); - } - - @Override - public void onFailed(String errorCode, String errorMessage) { - Log.d("Init", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage); - } - }); - // 注册方法会自动判断是否支持小米系统推送，如不支持会跳过注册。 - MiPushRegister.register(this, "2882303761517421890", "5491742138890"); - // 注册方法会自动判断是否支持华为系统推送，如不支持会跳过注册。 - HuaWeiRegister.register(this); - } - -// private void initSMSSDK() {//初始化MOB短信 SDK -// SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92"); -// } - - //talkingdata应用留存统计 - private void initTalkingDataSDK() { - TCAgent.init(getApplicationContext()); - } - - //初始化腾讯bugly SDK&全局捕获Crash - private void initCrashSDK() { -// CrashReport.initCrashReport(getApplicationContext(), "4c8cf75014", true);//注册bugly上报 - } - - //初始化友盟社会化分享 - private void initShareSDK() { - // 友盟社会化分享SDK预初始化函数 - // preInit预初始化函数耗时极少，不会影响App首次冷启动用户体验 - UMConfigure.preInit(this, "55f7d5bfe0f55a14770001da", "ifish"); - /** - * 在微博开放平台设置的授权回调REDIRECT_URL必须与代码中设置一致 http://open.weibo.com/apps/1240247140/info/advanced - */ -// Config.REDIRECT_URL = "http://sns.whalecloud.com/sina2/callback"; - PlatformConfig.setWeixin("wxb3b27d653ec3e3cb", "79d35215d7ef369b927f7cb21a2b8ff6"); - PlatformConfig.setWXFileProvider("com.ifish.activity.fileprovider"); -// PlatformConfig.setSinaWeibo("1240247140", "d5825aae9f4c8552b60e112b42c345f3"); -// PlatformConfig.setQQZone("1105206998", "rTiJNwzYY79DExD9"); - } - -======= ->>>>>>> release public boolean inMainProcess() { String packageName = getPackageName(); String processName = SystemUtil.getProcessName(this); diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index e74e67800..d1de61ede 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -9,10 +9,6 @@ package com.ifish.fragment; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; -<<<<<<< HEAD -======= -import android.annotation.SuppressLint; ->>>>>>> release import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -54,11 +50,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; -<<<<<<< HEAD -======= import androidx.core.content.ContextCompat; ->>>>>>> release - import com.bumptech.glide.Glide; //jjia-push //import com.clj.fastble.BleManager; @@ -203,13 +195,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi private PermissionHelper permissionHelper; String[] permission; -<<<<<<< HEAD - String[] permissionM = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE}; - - String[] permission13 = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_PHONE_STATE}; - -======= ->>>>>>> release @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -765,36 +750,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi intent.setData(Uri.parse(String.format("package:%s", getActivity().getApplicationContext().getPackageName()))); startActivityForResult(intent, 301); } else { -<<<<<<< HEAD - ActivityCompat.requestPermissions(getActivity(), new String[]{WRITE_EXTERNAL_STORAGE}, 302); - } - } - - apkDownloadDialog = new Dialog(getActivity(), R.style.DefautDialogs); - apkDownloadDialog.setCancelable(false); - apkDownloadDialog.show(); - Window window = apkDownloadDialog.getWindow(); - window.setContentView(R.layout.dialog_downloadapk); - final TextView tv_title = (TextView) window.findViewById(R.id.tv_title); - final TextView tv_current = (TextView) window.findViewById(R.id.tv_current); - final ProgressBar progess_bar = (ProgressBar) window.findViewById(R.id.progess_bar); - final Button bt_redownload = (Button) window.findViewById(R.id.bt_redownload); - final String downloaded = "maybe the file has downloaded completely";//如果文件已经下载好 就会抛出此异常 可以判断此异常直接打开文件 - /** - * 下载apk - */ - L.i("====================appAddress=" + appAddress + "+path=" + apkPath); - http.download(appAddress, apkPath, false, false, new RequestCallBack() { - @Override - public void onStart() { - super.onStart(); - tv_title.setText("开始下载..."); - tv_current.setText("0%"); - bt_redownload.setVisibility(View.GONE);//开始下载时 把重新下载按钮隐藏 - progess_bar.setProgress(0);//进度条初始 -======= ActivityCompat.requestPermissions(getActivity(), new String[]{WRITE_EXTERNAL_STORAGE}, 301); ->>>>>>> release } }else { apkDownloadDialog = new Dialog(getActivity(), R.style.DefautDialogs); @@ -1245,86 +1201,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi Commons.IS_CAMERA = false; sp.putInt(LoginSPKey.Position, index); sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); -<<<<<<< HEAD - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(getActivity(), BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(getActivity(), MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(getActivity(), MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(getActivity(), MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(getActivity(), MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(getActivity(), MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(getActivity(), MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(getActivity(), MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(getActivity(), MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { - i.setClass(getActivity(), MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(getActivity(), MainThreeControlActivity.class); - } else { - i.setClass(getActivity(), MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(getActivity(), MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(getActivity(), MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(getActivity(), MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(getActivity(), MainFiveControlActivity.class); - } else {//4控 - i.setClass(getActivity(), MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(getActivity(), MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(getActivity(), MainEightControlActivity.class); - break; - } - default: { - i.setClass(getActivity(), MainThreeControlActivity.class); - break; - } - } - } - } - } - } catch (Exception e) { - ClipboardManager clipboardManager = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData mClipData = ClipData.newPlainText("Label", e.getMessage() + getStackTrace(e)); - clipboardManager.setPrimaryClip(mClipData); - Toast.makeText(getActivity(), "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); - i.setClass(getActivity(), MainThreeControlActivity.class); - } - startActivity(i); - AnimationUtil.startAnimation(getActivity()); -======= Device clickItem = (Device) lv_device.getItemAtPosition(position); AppRoute.newToStart(requireActivity(),clickItem,false); // try { @@ -1409,7 +1285,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi // } // startActivity(i); // AnimationUtil.startAnimation(getActivity()); ->>>>>>> release } }); lv_camera.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java b/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java deleted file mode 100644 index 476cacf68..000000000 --- a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java +++ /dev/null @@ -1,121 +0,0 @@ -<<<<<<< HEAD -package com.ifish.push; - -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import com.alibaba.sdk.android.push.MessageReceiver; -import com.alibaba.sdk.android.push.notification.CPushMessage; -import com.ifish.activity.RecentContactsActivity; - -import java.util.Map; - -/** - * Created by Administrator on 2019/5/22. - */ - -public class AlipushReceiver extends MessageReceiver { - // 消息接收部分的LOG_TAG - public static final String REC_TAG = "receiver"; - - @Override - public void onNotification(Context context, String title, String summary, Map extraMap) { - // TODO 处理推送通知 - Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap); - } - - @Override - 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) { - Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); - Intent intent = new Intent(); - intent.setClass(context, RecentContactsActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - @Override - protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { - Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); - Intent intent = new Intent(); - intent.setClass(context, RecentContactsActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - @Override - protected void onNotificationReceivedInApp(Context context, String title, String summary, Map 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) { - Log.e("MyMessageReceiver", "onNotificationRemoved"); - } - -} -======= -//package com.ifish.push; -// -//import android.content.Context; -//import android.content.Intent; -//import android.util.Log; -// -//import com.ifish.activity.RecentContactsActivity; -// -//import java.util.Map; -// -///** -// * Created by Administrator on 2019/5/22. -// */ -// -//public class AlipushReceiver extends MessageReceiver { -// // 消息接收部分的LOG_TAG -// public static final String REC_TAG = "receiver"; -// -// @Override -// public void onNotification(Context context, String title, String summary, Map extraMap) { -// // TODO 处理推送通知 -// Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap); -// } -// -// @Override -// 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) { -// Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); -// Intent intent = new Intent(); -// intent.setClass(context, RecentContactsActivity.class); -// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -// context.startActivity(intent); -// } -// -// @Override -// protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { -// Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); -// Intent intent = new Intent(); -// intent.setClass(context, RecentContactsActivity.class); -// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -// context.startActivity(intent); -// } -// -// @Override -// protected void onNotificationReceivedInApp(Context context, String title, String summary, Map 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) { -// Log.e("MyMessageReceiver", "onNotificationRemoved"); -// } -// -//} ->>>>>>> release