Merge remote-tracking branch 'origin/燃气自翻炒锅' into 燃气自翻炒锅

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/adapter/sp_adapter.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java
#	app/src/main/res/layout/activity_diy_update.xml

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

@@ -208,11 +208,11 @@ public class CpActivity extends BaseActivity {
         ArrayList<BPA_GOODS> good = QueryDB.GetGoodsALL();
         List<String> Bendi_id = new ArrayList<>();
 
-        SectionHeader header_bdcp = new SectionHeader("本地菜谱", "", "");
+        SectionHeader header_bdcp = new SectionHeader("本地配方", "", "");
         ArrayList<SectionItem> contents_bdcp = new ArrayList<>();
 
-        SectionHeader header_sccp = new SectionHeader("收藏菜谱", "", "");
-        ArrayList<SectionItem> contents_sccp = new ArrayList<>();
+//        SectionHeader header_sccp = new SectionHeader("收藏配方", "", "");
+//        ArrayList<SectionItem> contents_sccp = new ArrayList<>();
 
 
         for (BPA_GOODS item : good) {
@@ -220,18 +220,18 @@ public class CpActivity extends BaseActivity {
                 item.url = "未知";
             }
             contents_bdcp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
-            if (item.issc == 1) {
-                contents_sccp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
-            }
-            Bendi_id.add(item.id);
+//            if (item.issc == 1) {
+//                contents_sccp.add(new SectionItem(item.name, String.valueOf(item.maketime), item.id, item.url, item.issc == 1, false, true));
+//            }
+//            Bendi_id.add(item.id);
         }
         list.add(new QMUISection<>(header_bdcp, contents_bdcp, false));
-        list.add(new QMUISection<>(header_sccp, contents_sccp, true));
+//        list.add(new QMUISection<>(header_sccp, contents_sccp, true));
         return list;
     }
 
     private void initTopBar() {
-        mTopBar.setTitle("菜谱管理");
+        mTopBar.setTitle("配方管理");
         /**
          * 返回按钮
          */
@@ -244,7 +244,7 @@ public class CpActivity extends BaseActivity {
         /**
          * 新建商品
          */
-        mTopBar.addRightTextButton("新建商品", R.id.topbar).setOnClickListener(new View.OnClickListener() {
+        mTopBar.addRightTextButton("新建配方", R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 skipToActivity(DiyActivity.class);

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

@@ -41,7 +41,7 @@ public class CpxzActivity extends BaseActivity {
     }
 
     private void initTopBar() {
-        mTopBar.setTitle("菜谱列表");
+        mTopBar.setTitle("配方列表");
         mTopBar.addLeftImageButton(R.mipmap.fanhui, R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -172,7 +172,7 @@
                                     android:layout_alignParentLeft="true"
                                     android:layout_marginLeft="20dp"
                                     android:textSize="@dimen/textSize"
-                                    android:text="商品名称"
+                                    android:text="配方名称"
                                     android:textAlignment="center"
                                     android:textStyle="bold"
                                     android:textColor="@color/white"/>

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

@@ -133,7 +133,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:fontFamily="sans-serif-condensed-medium"
-                                        android:text="商品管理"
+                                        android:text="配方管理"
                                         android:textColor="@color/white"
                                         android:textSize="26dp"
                                         android:focusable="false"/>

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

@@ -273,15 +273,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -333,15 +333,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -393,15 +393,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -453,15 +453,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button
@@ -639,7 +639,7 @@
             android:clickable="true"
             android:orientation="horizontal">
 
-            <!--重量设定-->
+            <!--称控制-->
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -648,6 +648,52 @@
                 android:layout_columnWeight="1"
                 android:layout_rowWeight="1">
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="当前重量:"
+                        android:textSize="@dimen/textSize"/>
+
+                    <TextView
+                        android:id="@+id/PanWeight"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="100kg"
+                        android:textColor="@color/app_color_blue"
+                        android:textSize="@dimen/textSize"/>
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/button_重量清零"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_marginRight="80dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/bg_btn_false_color"
+                    android:text="重量清零"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/textSize" />
+            </RelativeLayout>
+
+            <!--重量设定-->
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_row="1"
+                android:layout_column="0"
+                android:layout_columnWeight="1"
+                android:layout_rowWeight="1">
+
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_centerVertical="true"
@@ -707,52 +753,6 @@
 
             </RelativeLayout>
 
-            <!--称控制-->
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_row="1"
-                android:layout_column="0"
-                android:layout_columnWeight="1"
-                android:layout_rowWeight="1">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="当前重量:"
-                        android:textSize="@dimen/textSize"/>
-
-                    <TextView
-                        android:id="@+id/PanWeight"
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="100kg"
-                        android:textColor="@color/app_color_blue"
-                        android:textSize="@dimen/textSize"/>
-
-
-                </LinearLayout>
-
-                <Button
-                    android:id="@+id/button_重量清零"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp"
-                    android:layout_marginRight="80dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/bg_btn_false_color"
-                    android:text="重量清零"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/textSize" />
-            </RelativeLayout>
-
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -786,15 +786,15 @@
                         android:valueTo="100"
                         app:enableDrawHalo="false"
                         app:thumbColor="@color/we_read_thumb_color"
-                        app:thumbRadius="11dp"
+                        app:thumbRadius="21dp"
                         app:thumbText="0"
                         app:thumbTextBold="true"
                         app:thumbTextColor="@color/we_read_theme_color"
-                        app:thumbTextSize="12sp"
+                        app:thumbTextSize="19sp"
                         app:thumbWithinTrackBounds="true"
                         app:trackColor="@color/pro1"
                         app:trackColorInactive="@color/pro2"
-                        app:trackHeight="15dp" />
+                        app:trackHeight="25dp" />
                 </LinearLayout>
 
                 <Button