From 487f7c4ee1a777a583d19bfd8520e5ed0d703263 Mon Sep 17 00:00:00 2001
From: jia <jmessage@163.com>
Date: Tue, 18 Jun 2024 00:52:20 +0800
Subject: [PATCH] =?UTF-8?q?logo=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                               |  4 ++--
 iFish7/build.gradle                             |  1 +
 .../ifish/activity/MainSixControlActivity.java  | 17 +++++++++++++++--
 .../java/com/ifish/fragment/DeviceFragment.java | 14 +++-----------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1a54670d9..9905d6243 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,5 +26,5 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-versionCode=41
-versionName=4.11.1
\ No newline at end of file
+versionCode=42
+versionName=4.11.2
\ No newline at end of file
diff --git a/iFish7/build.gradle b/iFish7/build.gradle
index 027afa51d..c9960d615 100644
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@@ -158,4 +158,5 @@ dependencies {
 
     implementation 'com.tencent:mmkv:1.3.3'
 
+
 }
\ No newline at end of file
diff --git a/iFish7/src/main/java/com/ifish/activity/MainSixControlActivity.java b/iFish7/src/main/java/com/ifish/activity/MainSixControlActivity.java
index 0776b62ce..acd098951 100644
--- a/iFish7/src/main/java/com/ifish/activity/MainSixControlActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/MainSixControlActivity.java
@@ -1,5 +1,6 @@
 package com.ifish.activity;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
@@ -95,10 +96,12 @@ public class MainSixControlActivity extends BaseGradeActivity implements SwipeRe
         init();
         initView();
         initListener();
+        L.i( "---3-------------onCreate"+HttpManager.Store_URL+Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getLogo());
         try {
             initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
         } catch (Exception e) {
             e.printStackTrace();
+
         }
         ReviewBrand();
         LoginDevice();
@@ -326,8 +329,18 @@ public class MainSixControlActivity extends BaseGradeActivity implements SwipeRe
     private void ReviewBrand() {
         try {//展示厂家
             if (Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList()!=null) {//厂家为空则展示默认的鱼影
-                Picasso.with(MainSixControlActivity.this).load(HttpManager.Store_URL+Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getLogo()).error(R.drawable.ifish_logo_default).into(iv_left);
-                tv_left.setText(Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getBrandName());
+
+                String imageName = HttpManager.Store_URL+Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0))
+                        .getVenderList().getLogo();
+
+                Picasso.with(MainSixControlActivity.this)
+                        .load(imageName.replace("https","http")).error(R.drawable.ifish_logo_default)
+                        .placeholder(getDrawable(R.drawable.ifish_logo_default))
+                        .into(iv_left);
+                String brandName = Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getBrandName();
+                if (!TextUtils.isEmpty(brandName)){
+                    tv_left.setText(brandName);
+                }
                 L.i("厂家Logo="+HttpManager.Store_URL+Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getLogo());
             }
         } catch (Exception e) {
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index 49948686d..4afaba05d 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -286,20 +286,12 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
                 dialog.setCancelable(false);
 //                dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app");
                 dialog.setMessage("请到应用信息页面-权限管理-打开位置和相机权限");
-                dialog.setPositiveButton("去开启", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(
-                            DialogInterface dialog,
-                            int which) {
+                dialog.setPositiveButton("去开启", (dialog1, which) -> {
 //                        Intent mItent = new Intent(Settings.ACTION_SETTINGS);
 //                        startActivity(mItent);
-                        AppUtil.toAuthority(requireActivity());
-                    }
+                    AppUtil.toAuthority(requireActivity());
                 });
-                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                    }
+                dialog.setNegativeButton("取消", (dialog12, which) -> {
                 });
                 dialog.show();
             }