add:zTC1显示功率

add:尝试增加ota进度显示功能
a2633063 · Mar 29, 2019 · b3cb106 · b3cb106
1 parent 86985f2
commit b3cb106
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.zyc.zcontrol"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 5
-        versionName "0.5"
+        versionCode 6
+        versionName "0.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java
@@ -56,10 +56,10 @@ public class TC1Fragment extends Fragment {
     //region 控件
     final private int PLUG_COUNT=6;
     ToggleButton tbtn_all;
+    TextView tv_power;
     ToggleButton tbtn_main_button[] = new ToggleButton[PLUG_COUNT];
     TextView tv_main_button[] = new TextView[PLUG_COUNT];
     //endregion
-
     TextView log;
 
     String device_mac = null;
@@ -123,6 +123,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         //region 控件初始化
 
         tbtn_all = view.findViewById(R.id.tbtn_all);
+        tv_power = view.findViewById(R.id.tv_power);
         tbtn_main_button[0] = view.findViewById(R.id.tbtn_main_button1);
         tbtn_main_button[1] = view.findViewById(R.id.tbtn_main_button2);
         tbtn_main_button[2] = view.findViewById(R.id.tbtn_main_button3);
@@ -266,6 +267,12 @@ void Receive(String topic, String message) {
             if (jsonObject.has("setting")) jsonSetting = jsonObject.getJSONObject("setting");
             if (mac == null || !mac.equals(device_mac)) return;
 
+            if (jsonObject.has("power")) {
+                String power = jsonObject.getString("power");
+                Log.d(Tag,"power:"+power);
+                tv_power.setText(power+"W");
+            }
+
             //region 解析plug
             for (int plug_id = 0; plug_id < 6; plug_id++) {
                 if (!jsonObject.has("plug_" + plug_id)) continue;

diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java
@@ -312,6 +312,10 @@ void Receive(String topic, String message) {
                 } else {
                     if (ota_flag) {
                         //todo 显示更新进度
+
+                        if(pd!=null && pd.isShowing())
+                            pd.setMessage("正在获取最新固件版本,请稍后....\n"+"进度:"+ota_progress+"%");
+//                        Toast.makeText(getActivity(), "ota进度:"+ota_progress+"%", Toast.LENGTH_SHORT).show();
                     }
                 }
 

diff --git a/app/src/main/res/layout/fragment_tc1.xml b/app/src/main/res/layout/fragment_tc1.xml
@@ -25,12 +25,37 @@
                 android:id="@+id/tbtn_all"
                 style="@style/TC1SwitchStyle"
                 app:layout_constraintBottom_toTopOf="@+id/tbtn_main_button2"
-                app:layout_constraintEnd_toEndOf="@+id/tbtn_main_button3"
+                app:layout_constraintEnd_toStartOf="@+id/ll_power"
                 app:layout_constraintStart_toStartOf="@+id/tbtn_main_button1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginBottom="8dp" />
 
 
+            <LinearLayout
+                android:id="@+id/ll_power"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toEndOf="@+id/tbtn_all"
+                app:layout_constraintTop_toTopOf="@+id/tbtn_all"
+                android:layout_gravity="center"
+                app:layout_constraintEnd_toEndOf="@+id/tbtn_main_button3"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_switch_all"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="当前功率"/>
+
+                <TextView
+                    android:id="@+id/tv_power"
+                    android:gravity="center"
+                    android:layout_width="match_parent"
+                    android:textSize="35dp"
+                    android:layout_height="wrap_content"
+                    android:text="----"/>
+            </LinearLayout>
+
             <ToggleButton
                 android:id="@+id/tbtn_main_button1"
                 style="@style/TC1SwitchStyle"