[军测]

修复bug

app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java

@@ -455,17 +455,18 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn
      * 选择激活方式
      */
     private void showActivateType() {
-        if (AppChannel.customChannel == AppChannel.CUSTOM_CONTROL_PUBLIC) {
+//        if (AppChannel.customChannel == AppChannel.CUSTOM_CONTROL_PUBLIC) {
-            if (LCUser.getCurrentUser() == null) {
+//            if (LCUser.getCurrentUser() == null) {
-                Intent intent = new Intent(Utils.getApp(), LoginActivity.class);
+//                Intent intent = new Intent(Utils.getApp(), LoginActivity.class);
-                intent.putExtra("finishTo", UserInfoActivity.class.getName());
+//                intent.putExtra("finishTo", UserInfoActivity.class.getName());
-                startActivity(intent);
+//                startActivity(intent);
-            } else {
+//            } else {
-                startActivity(new Intent(MainActivity.this, UserInfoActivity.class));
+//                startActivity(new Intent(MainActivity.this, UserInfoActivity.class));
-            }
+//            }
-        } else {
+//        } else {
-            startActivity(new Intent(MainActivity.this, RegisterActivity.class));
+//            startActivity(new Intent(MainActivity.this, RegisterActivity.class));
-        }
+//        }
+        startActivity(new Intent(MainActivity.this, RegisterActivity.class));
     }
 
     @Override

app/src/main/java/com/bingce/controlnetwork/fragment/station/line/AbstractLineStationKnownUnknownSetupFragment.java

@@ -167,9 +167,11 @@ public abstract class AbstractLineStationKnownUnknownSetupFragment extends Abstr
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         inflater.inflate(R.menu.menu_confirm, menu);
-        confirmItem = menu.findItem(R.id.menu_confirm);
+        if (confirmItem == null) {
-        if (confirmItem != null) {
+            confirmItem = menu.findItem(R.id.menu_confirm);
-            confirmItem.setEnabled(false);
+            if (confirmItem != null) {
+                confirmItem.setEnabled(false);
+            }
         }
         super.onCreateOptionsMenu(menu, inflater);
     }

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

@@ -111,7 +111,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:visibility="gone">
 
         <Button
             android:id="@+id/activity_activate_btn_taobao_link"

buildSrc/src/main/java/com/bingce/kotlin/com/bingce/dependencies.kt

@@ -245,4 +245,7 @@ object Libs {
     const val serialPort = "io.github.xmaihh:serialport:2.1.1"
     const val timber = "com.jakewharton.timber:timber:4.7.1"
     const val loadingView = "com.ldoublem.loadingview:loadingviewlib:1.0"
+
+    const val gjygitEditext="com.github.gjygit:editext:3.0"
+
 }