~wjc/HDLPhotovoltaicDebugAPP.git

parent: c11d709a | 补丁 | 提交 | ignore whitespace

2024年03月21日15:11:23

mac

2024-03-21 316edc17322cd39ca9b9bd285ba63018cebfa2b4

2024年03月21日15:11:23

备份代码

9个文件已修改

	app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/drawable/selected.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/fragment_me.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/frgment_house_list_line.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java

@@ -220,6 +220,8 @@

        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
        setMemberName(UserConfigManage.getInstance().getUserName());
//        setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());


    }
@@ -243,10 +245,14 @@
     * 显示用户头像
     */
    private void setMemberHeadIcon(String memberHeadIconUrl) {
        if (TextUtils.isEmpty(memberHeadIconUrl)) {
            return;
        }
        if (mC_UserInfo != null) {
            mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
        }
        GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4),true);
        GlideUtils.getCircleCropImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, true);
//        GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4), true);

    }

@@ -254,6 +260,9 @@
     * 显示用户名称
     */
    private void setMemberName(String userName) {
        if (TextUtils.isEmpty(userName)) {
            return;
        }
        viewBinding.fragmentMeUserNameIv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
        UserConfigManage.getInstance().Save();

 app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java

@@ -2,10 +2,12 @@

import androidx.recyclerview.widget.LinearLayoutManager;

import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;

import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -15,7 +17,9 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;

import java.util.ArrayList;
import java.util.List;
@@ -79,7 +83,7 @@
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                setResult(40);
                backPressedData();
                finish();
            }
        });
@@ -148,5 +152,28 @@
        });
    }

    /**
     * 物理按键返回事件
     */
    @Override
    public void onBackPressed() {
        backPressedData();
        super.onBackPressed();
    }

    /**
     * 返回给上一级界面数据
     */
    private void backPressedData() {
        setResult(40);
        //通知给小程序更新温度单位
        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
        JsonObject jsonObject = new JsonObject();
        jsonObject.addProperty("temperature_unit", UserConfigManage.getInstance().getTemperature_unit());
        uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE);
        uniCallBackBaseBean.setData(jsonObject);
        HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
    }


}

 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java

@@ -98,11 +98,11 @@
            public void onClick(View v) {
                clearCacheData();
                HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
                uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER);
                JsonObject jsonObject = new JsonObject();
                jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
                uniCallBackBaseBean.setData(jsonObject);
                HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER, uniCallBackBaseBean);
                HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
                finish();
            }
        });

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java

@@ -261,7 +261,7 @@
                JsonObject jsonObject = new JsonObject();
                jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                jsonObject.addProperty("homeName", houseIdBean.getHomeName());
                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus()+"");
                HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
                uniCallBackBaseBean.setData(jsonObject);

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java

@@ -101,6 +101,7 @@
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_MODEL = "uni_notification_model";//通知模块(大类)
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS = "refresh_details";//刷新电站详情
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//刷新用户信息
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE = "temperature_format_changed";//刷新单位温度
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER = "refresh_unread_messages_number";//刷新未读消息数量
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//设备添加
    public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//设备删除

 app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java

@@ -9,6 +9,7 @@
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.text.TextUtils;
import android.widget.ImageView;

import androidx.annotation.Nullable;
@@ -28,6 +29,7 @@
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.Target;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;

import java.io.InputStream;
@@ -46,6 +48,9 @@
     * @param imageview 显示图片组件
     */
    public static void getGeneralImage(Context context, String url, ImageView imageview) {
        if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
            return;
        }
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions(false))
@@ -61,6 +66,9 @@
     * @param granularRoundedCorners 设置图片角度
     */
    public static void getGranularRoundedCornersImage(Context context, String url, ImageView imageview, GranularRoundedCorners granularRoundedCorners) {
        if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
            return;
        }
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions(false))
@@ -77,6 +85,9 @@
     * @param roundedCorners 设置图片角度值
     */
    public static void getRoundedCornersImage(Context context, String url, ImageView imageview, RoundedCorners roundedCorners, boolean userImage) {
        if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
            return;
        }
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions(userImage))
@@ -93,6 +104,9 @@
     * @param imageview 显示图片组件
     */
    public static void getCircleCropImage(Context context, String url, ImageView imageview, boolean userImage) {
        if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
            return;
        }
        Glide.with(context)
                .load(url)
                .apply(getRequestOptions(userImage))

 app/src/main/res/drawable/selected.png



 app/src/main/res/layout/fragment_me.xml

@@ -25,7 +25,7 @@
            android:id="@+id/fragment_me_icon_iv"
            android:layout_width="69dp"
            android:layout_height="69dp"
            android:background="@drawable/default_user"
            android:background="@drawable/default_image"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

 app/src/main/res/layout/frgment_house_list_line.xml

@@ -30,6 +30,7 @@
                android:id="@+id/fragment_house_list_line_left_iv"
                android:layout_width="113dp"
                android:layout_height="130dp"
                android:background="@drawable/default_user"
                android:scaleType="centerCrop" />

            <TextView

			@@ -220,6 +220,8 @@

			viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
			viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
			setMemberName(UserConfigManage.getInstance().getUserName());
			// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());


			}
			@@ -243,10 +245,14 @@
			* 显示用户头像
			*/
			private void setMemberHeadIcon(String memberHeadIconUrl) {
			if (TextUtils.isEmpty(memberHeadIconUrl)) {
			return;
			}
			if (mC_UserInfo != null) {
			mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
			}
			GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4),true);
			GlideUtils.getCircleCropImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, true);
			// GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4), true);

			}

			@@ -254,6 +260,9 @@
			* 显示用户名称
			*/
			private void setMemberName(String userName) {
			if (TextUtils.isEmpty(userName)) {
			return;
			}
			viewBinding.fragmentMeUserNameIv.setText(userName);
			UserConfigManage.getInstance().setUserName(userName);
			UserConfigManage.getInstance().Save();

			@@ -2,10 +2,12 @@

			import androidx.recyclerview.widget.LinearLayoutManager;

			import android.content.Intent;
			import android.os.Bundle;
			import android.text.TextUtils;
			import android.view.View;

			import com.google.gson.JsonObject;
			import com.hdl.linkpm.sdk.core.exception.HDLException;
			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.base.CustomBaseActivity;
			@@ -15,7 +17,9 @@
			import com.hdl.photovoltaic.other.HdlLogLogic;
			import com.hdl.photovoltaic.other.HdlResidenceLogic;
			import com.hdl.photovoltaic.other.HdlThreadLogic;
			import com.hdl.photovoltaic.other.HdlUniLogic;
			import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
			import com.hdl.photovoltaic.uni.HDLUniMP;

			import java.util.ArrayList;
			import java.util.List;
			@@ -79,7 +83,7 @@
			viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			setResult(40);
			backPressedData();
			finish();
			}
			});
			@@ -148,5 +152,28 @@
			});
			}

			/**
			* 物理按键返回事件
			*/
			@Override
			public void onBackPressed() {
			backPressedData();
			super.onBackPressed();
			}

			/**
			* 返回给上一级界面数据
			*/
			private void backPressedData() {
			setResult(40);
			//通知给小程序更新温度单位
			HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("temperature_unit", UserConfigManage.getInstance().getTemperature_unit());
			uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE);
			uniCallBackBaseBean.setData(jsonObject);
			HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
			}


			}

			@@ -98,11 +98,11 @@
			public void onClick(View v) {
			clearCacheData();
			HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
			uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
			uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER);
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
			uniCallBackBaseBean.setData(jsonObject);
			HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER, uniCallBackBaseBean);
			HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
			finish();
			}
			});

			@@ -261,7 +261,7 @@
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("homeId", houseIdBean.getHomeId());
			jsonObject.addProperty("homeName", houseIdBean.getHomeName());
			jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
			jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus()+"");
			HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
			uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
			uniCallBackBaseBean.setData(jsonObject);

			@@ -101,6 +101,7 @@
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_MODEL = "uni_notification_model";//通知模块(大类)
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS = "refresh_details";//刷新电站详情
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//刷新用户信息
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE = "temperature_format_changed";//刷新单位温度
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER = "refresh_unread_messages_number";//刷新未读消息数量
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//设备添加
			public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//设备删除

			@@ -9,6 +9,7 @@
			import android.graphics.PorterDuffXfermode;
			import android.graphics.Rect;
			import android.graphics.RectF;
			import android.text.TextUtils;
			import android.widget.ImageView;

			import androidx.annotation.Nullable;
			@@ -28,6 +29,7 @@
			import com.bumptech.glide.request.RequestOptions;
			import com.bumptech.glide.request.target.Target;
			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.other.HdlLogLogic;
			import com.hdl.photovoltaic.other.HdlThreadLogic;

			import java.io.InputStream;
			@@ -46,6 +48,9 @@
			* @param imageview 显示图片组件
			*/
			public static void getGeneralImage(Context context, String url, ImageView imageview) {
			if (TextUtils.isEmpty(url) \|\| !url.startsWith("http://")) {
			return;
			}
			Glide.with(context)
			.load(url)
			.apply(getRequestOptions(false))
			@@ -61,6 +66,9 @@
			* @param granularRoundedCorners 设置图片角度
			*/
			public static void getGranularRoundedCornersImage(Context context, String url, ImageView imageview, GranularRoundedCorners granularRoundedCorners) {
			if (TextUtils.isEmpty(url) \|\| !url.startsWith("http://")) {
			return;
			}
			Glide.with(context)
			.load(url)
			.apply(getRequestOptions(false))
			@@ -77,6 +85,9 @@
			* @param roundedCorners 设置图片角度值
			*/
			public static void getRoundedCornersImage(Context context, String url, ImageView imageview, RoundedCorners roundedCorners, boolean userImage) {
			if (TextUtils.isEmpty(url) \|\| !url.startsWith("http://")) {
			return;
			}
			Glide.with(context)
			.load(url)
			.apply(getRequestOptions(userImage))
			@@ -93,6 +104,9 @@
			* @param imageview 显示图片组件
			*/
			public static void getCircleCropImage(Context context, String url, ImageView imageview, boolean userImage) {
			if (TextUtils.isEmpty(url) \|\| !url.startsWith("http://")) {
			return;
			}
			Glide.with(context)
			.load(url)
			.apply(getRequestOptions(userImage))

			@@ -25,7 +25,7 @@
			android:id="@+id/fragment_me_icon_iv"
			android:layout_width="69dp"
			android:layout_height="69dp"
			android:background="@drawable/default_user"
			android:background="@drawable/default_image"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			@@ -30,6 +30,7 @@
			android:id="@+id/fragment_house_list_line_left_iv"
			android:layout_width="113dp"
			android:layout_height="130dp"
			android:background="@drawable/default_user"
			android:scaleType="centerCrop" />

			<TextView