fix:一些闪退问题

版本:v0.7
a2633063 · Apr 4, 2019 · f079177 · f079177
1 parent d227f11
commit f079177
Show file tree

Hide file tree

Showing 5 changed files with 9 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 6
-        versionName "0.6"
+        versionCode 7
+        versionName "0.7"
         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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,9 @@
         <activity
             android:name=".controlItem.tc1.TC1PlugActivity"
             android:label="插口"/>
+        <activity
+            android:name=".controlItem.dc1.DC1PlugActivity"
+            android:label="插口"/>
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"

diff --git a/app/src/main/java/com/zyc/zcontrol/DeviceItem.java b/app/src/main/java/com/zyc/zcontrol/DeviceItem.java
@@ -8,6 +8,7 @@
 import com.zyc.StaticVariable;
 import com.zyc.zcontrol.controlItem.buttonmate.ButtonMateFragment;
 import com.zyc.zcontrol.controlItem.dc1.DC1Fragment;
+import com.zyc.zcontrol.controlItem.tc1.TC1Fragment;
 
 
 public class DeviceItem {
@@ -51,7 +52,7 @@ private void init()
                 fragment=new ButtonMateFragment(name,mac);
                 break;
             case StaticVariable.TYPE_TC1:
-                fragment=new DC1Fragment(name,mac);
+                fragment=new TC1Fragment(name,mac);
                 break;
             case StaticVariable.TYPE_DC1:
                 fragment=new DC1Fragment(name,mac);

diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/SettingActivity.java b/app/src/main/java/com/zyc/zcontrol/controlItem/SettingActivity.java
@@ -13,6 +13,7 @@
 import com.zyc.zcontrol.R;
 import com.zyc.zcontrol.controlItem.buttonmate.ButtonMateSettingFragment;
 import com.zyc.zcontrol.controlItem.dc1.DC1SettingFragment;
+import com.zyc.zcontrol.controlItem.tc1.TC1SettingFragment;
 
 public class SettingActivity extends AppCompatActivity {
 
@@ -49,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     prefFragment = new ButtonMateSettingFragment(name, mac);
                     break;
                 case StaticVariable.TYPE_TC1:
-                    prefFragment = new DC1SettingFragment(name, mac);
+                    prefFragment = new TC1SettingFragment(name, mac);
                     break;
                 case StaticVariable.TYPE_DC1:
                     prefFragment = new DC1SettingFragment(name, mac);