1.增加PLC配置、PLC监控 loading加载画面

2.调整程序初始化位置,先询问获取权限,在初始化数据库
3.调整料仓按钮大小、选择菜谱按钮大小
4.调整界面默认不弹出键盘

app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java

@@ -71,11 +71,11 @@ public class ConfigName {
     /**
      * 门店Id
      */
-    public String ClientAutoKey = "152";
+    public String ClientAutoKey = "79";
     /**
      * 店铺设备号
      */
-    public String DeviceAutoKey = "146";
+    public String DeviceAutoKey = "159";
     /**
      * 设备id
      */

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java

@@ -13,6 +13,7 @@ import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -178,6 +179,7 @@ public class DiyActivity extends BaseActivity {
                 }
             }
         });
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
     }
 
     /**

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
@@ -264,6 +265,7 @@ public class DiyUpdateActivity extends BaseActivity {
                     new MyBitmapUtils().disPlay(cpfm,good.url);
                 }
             }
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         }catch (Exception ex)
         {
 

app/src/main/java/com/bonait/bnframework/modules/welcome/activity/LoginActivity.java

@@ -13,6 +13,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -117,7 +118,8 @@ public class LoginActivity extends BaseActivity implements Validator.ValidationL
      */
     public void initData()
     {
-
+        mEtAccount.requestFocus();
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
     }
 
     @OnClick({R.id.iv_clean_account, R.id.clean_password, R.id.iv_show_pwd,R.id.forget_password, R.id.btn_login})

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

@@ -66,7 +66,9 @@
                     android:maxLength="20"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:inputType="text"/>
+                    android:inputType="text"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"/>
 
                 <ImageView
                     android:id="@+id/iv_clean_account"