parent: c19f27f3 | 补丁 | 提交 | ignore whitespace
wjc
昨天 fdd0e04d23551a7b17a8f9a7f818683968c2c656 
1.3.0
3个文件已修改
137 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_house_list.xml 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java


@@ -10,7 +10,8 @@


public class AppConfigManage {




    /*********是否正式服务器*********/


    private static boolean isOnlineServer = UserConfigManage.getInstance().isOnlineServer();


//    private static boolean isOnlineServer = UserConfigManage.getInstance().isOnlineServer();


    private static boolean isOnlineServer = true;


    /*********正式环境*********/


    private static final String APP_KEY_ONLINE = "CSZEMDJL";


    private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";




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


@@ -122,22 +122,23 @@


        viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);


        viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());




        if (AppConfigManage.isDebug()) {


            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);


            viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("当前环境");


            viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);


            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);


            if (AppConfigManage.getOnlineServer()) {


                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("线上");


            } else {


                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("测试");


            }


        } else {


            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);


            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);


        }


//        if (AppConfigManage.isDebug()) {


//            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);


//            viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("当前环境");


//            viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);


//            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);


//            if (AppConfigManage.getOnlineServer()) {


//                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("线上");


//            } else {


//                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("测试");


//            }


//        } else {


//            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);


//            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);


//        }




//        viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);


        viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);


        viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);






    }




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


@@ -25,7 +25,7 @@


            android:layout_centerVertical="true"


            android:gravity="center"


            android:text="@string/power_station"


            android:textColor="@color/text_E6FFFFFF"


            android:textColor="@color/text_FFACACAC"


            android:textSize="@dimen/text_18" />




        <TextView


@@ -37,19 +37,11 @@


            android:layout_toEndOf="@+id/power_station_label"


            android:gravity="center"


            android:text="@string/device"


            android:textColor="@color/text_66FFFFFF"


            android:textColor="@color/text_FF5B5B5B"


            android:textSize="@dimen/text_14"




            />




        <ImageView


            android:id="@+id/edit_iv"


            android:layout_width="@dimen/dp_31"


            android:layout_height="@dimen/dp_31"


            android:layout_marginEnd="@dimen/dp_13"


            android:layout_toStartOf="@+id/add_iv"


            android:src="@drawable/edit"


            android:visibility="gone" />




        <ImageView


            android:id="@+id/add_iv"


@@ -117,7 +109,7 @@


                        android:layout_marginStart="@dimen/dp_11"


                        android:layout_toEndOf="@+id/power_station_search_iv"


                        android:text="@string/search_station"


                        android:textColor="@color/text_66FFFFFF"


                        android:textColor="@color/text_FF5B5B5B"


                        android:textSize="@dimen/text_14" />


                </RelativeLayout>




@@ -161,7 +153,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="0"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_16" />




                    <TextView


@@ -172,7 +164,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="@string/message_all"


                        android:textColor="@color/text_66FFFFFF"


                        android:textColor="@color/text_FF5B5B5B"


                        android:textSize="@dimen/text_12" />


                </LinearLayout>




@@ -198,7 +190,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="0"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_16" />




                    <TextView


@@ -209,7 +201,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="@string/my_power_station_malfunction"


                        android:textColor="@color/text_66FFFFFF"


                        android:textColor="@color/text_FF5B5B5B"


                        android:textSize="@dimen/text_12" />


                </LinearLayout>




@@ -235,7 +227,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="0"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_16" />




                    <TextView


@@ -246,7 +238,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="@string/my_power_station_off_line"


                        android:textColor="@color/text_66FFFFFF"


                        android:textColor="@color/text_FF5B5B5B"


                        android:textSize="@dimen/text_12" />


                </LinearLayout>




@@ -272,7 +264,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="0"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_16" />




                    <TextView


@@ -283,7 +275,7 @@


                        android:paddingStart="@dimen/dp_2"


                        android:paddingEnd="@dimen/dp_2"


                        android:text="@string/to_be_added"


                        android:textColor="@color/text_66FFFFFF"


                        android:textColor="@color/text_FF5B5B5B"


                        android:textSize="@dimen/text_12" />


                </LinearLayout>




@@ -313,8 +305,8 @@


                        android:id="@+id/station_name_tv"


                        android:layout_width="wrap_content"


                        android:layout_height="match_parent"


                        android:text="@string/station_name"


                        android:textColor="@color/text_E6FFFFFF"


                        android:text="@string/pv"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_14"




                        />


@@ -346,8 +338,8 @@


                        android:id="@+id/station_power_tv"


                        android:layout_width="wrap_content"


                        android:layout_height="match_parent"


                        android:text="@string/generated_power"


                        android:textColor="@color/text_E6FFFFFF"


                        android:text="@string/output"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_14" />




                    <ImageView


@@ -356,36 +348,6 @@


                        android:layout_height="@dimen/dp_18"


                        android:layout_toEndOf="@+id/station_power_tv"


                        android:background="@drawable/ascending_descending_order_select" />




                </RelativeLayout>




                <View


                    android:layout_width="0dp"


                    android:layout_height="match_parent"


                    android:layout_weight="1" />




                <RelativeLayout


                    android:id="@+id/station_day_rl"


                    android:layout_width="wrap_content"


                    android:layout_height="match_parent"


                    android:layout_gravity="center_horizontal"


                    android:orientation="horizontal">




                    <TextView


                        android:id="@+id/station_day_tv"


                        android:layout_width="wrap_content"


                        android:layout_height="match_parent"


                        android:text="@string/day_power_generation"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textSize="@dimen/text_14" />




                    <ImageView


                        android:id="@+id/station_day_iv"


                        android:layout_width="@dimen/dp_18"


                        android:layout_height="@dimen/dp_18"


                        android:layout_toEndOf="@+id/station_day_tv"


                        android:background="@drawable/ascending_descending_order_select" />






                </RelativeLayout>




@@ -406,7 +368,7 @@


                        android:layout_width="wrap_content"


                        android:layout_height="match_parent"


                        android:text="@string/battery_capacity_indicator"


                        android:textColor="@color/text_E6FFFFFF"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_14" />




                    <ImageView


@@ -416,6 +378,37 @@


                        android:layout_toEndOf="@+id/station_month_tv"


                        android:background="@drawable/ascending_descending_order_select" />


                </RelativeLayout>




                <View


                    android:layout_width="0dp"


                    android:layout_height="match_parent"


                    android:layout_weight="1" />




                <RelativeLayout


                    android:id="@+id/station_day_rl"


                    android:layout_width="wrap_content"


                    android:layout_height="match_parent"


                    android:layout_gravity="center_horizontal"


                    android:orientation="horizontal">




                    <TextView


                        android:id="@+id/station_day_tv"


                        android:layout_width="wrap_content"


                        android:layout_height="match_parent"


                        android:text="@string/day_generation"


                        android:textColor="@color/text_FFACACAC"


                        android:textSize="@dimen/text_14" />




                    <ImageView


                        android:id="@+id/station_day_iv"


                        android:layout_width="@dimen/dp_18"


                        android:layout_height="@dimen/dp_18"


                        android:layout_toEndOf="@+id/station_day_tv"


                        android:background="@drawable/ascending_descending_order_select" />






                </RelativeLayout>






            </LinearLayout>




@@ -502,7 +495,7 @@


                    android:layout_marginStart="@dimen/dp_11"


                    android:layout_toEndOf="@+id/device_search_iv"


                    android:text="@string/enter_the_device_sn_and_device_name"


                    android:textColor="@color/text_66FFFFFF"


                    android:textColor="@color/text_FF5B5B5B"


                    android:textSize="@dimen/text_14" />


            </RelativeLayout>