修改一些按钮处理

app/src/main/java/peanut/keenon/com/util/AppConstant.java

@@ -7,4 +7,8 @@ package peanut.keenon.com.util;
 public class AppConstant {
 
     public static final int  ERROR_SUCCESS = 100;
+    /**
+     * 机器人初始点位
+     */
+    public static final int  INIT_POINT = 0;
 }

app/src/main/java/peanut/keenon/com/util/DinnerUtil.java

+package peanut.keenon.com.util;
+
+/**
+ * Created by li.liu on 2018/11/27.
+ */
+
+public class DinnerUtil {
+    public static String tranPointName(int point){
+        String pointName =null;
+        if(point== 1){
+            pointName = "一号餐桌";
+        }else if(point== 2){
+            pointName = "二号餐桌";
+        }else if(point== 3){
+            pointName = "三号餐桌";
+        }else if(point== 4){
+            pointName = "四号餐桌";
+        }else if(point== 5){
+            pointName = "五号餐桌";
+        }else if(point== 6){
+            pointName = "六号餐桌";
+        }else if(point== 7){
+            pointName = "七号餐桌";
+        }else if(point== 8){
+            pointName = "八号餐桌";
+        }
+        return pointName;
+    }
+}

app/src/main/java/peanut/keenon/com/util/SystemUtils.java

+package peanut.keenon.com.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Point;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.WindowManager;
+
+/**
+ * Created by li.liu on 2018/10/16.
+ * SystemUtil
+ */
+
+public class SystemUtils {
+
+    //版本名
+    public static String getVersionName(Context context) {
+        return getPackageInfo(context).versionName;
+    }
+
+    //版本号
+    public static int getVersionCode(Context context) {
+        return getPackageInfo(context).versionCode;
+    }
+
+    private static PackageInfo getPackageInfo(Context context) {
+        PackageInfo pi = null;
+
+        try {
+            PackageManager pm = context.getPackageManager();
+            pi = pm.getPackageInfo(context.getPackageName(),
+                    PackageManager.GET_CONFIGURATIONS);
+
+            return pi;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return pi;
+    }
+
+    public static void getPixelSize(Activity activity) {
+        // 通过Activity类中的getWindowManager()方法获取窗口管理，再调用getDefaultDisplay()方法获取获取Display对象
+        Display display = activity.getWindowManager().getDefaultDisplay();
+
+        // 方法一(推荐使用)使用Point来保存屏幕宽、高两个数据
+        Point outSize = new Point();
+        // 通过Display对象获取屏幕宽、高数据并保存到Point对象中
+        display.getSize(outSize);
+        // 从Point对象中获取宽、高
+        int x = outSize.x;
+        int y = outSize.y;
+        // 通过吐司显示屏幕宽、高数据
+        Log.e("SystemUtils", "手机像素为:" + x + " y:" + y);
+    }
+
+    public static void getMinDp(Activity activity) {
+        DisplayMetrics dm = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
+        int heightPixels = dm.heightPixels;
+        int widthPixels = dm.widthPixels;
+        float density = dm.density;
+        float heightDP = heightPixels / density;
+        float widthDP = widthPixels / density;
+        float smallestWidthDP;
+        if (widthDP < heightDP) {
+            smallestWidthDP = widthDP;
+        } else {
+            smallestWidthDP = heightDP;
+        }
+        Log.e("SystemUtils", "手机最小宽度为:" + smallestWidthDP);
+    }
+
+    /**
+     *  * 判断是否为平板
+     *  * 
+     *  * @return
+     *  
+     */
+    public static boolean isPad(Activity activity) {
+        WindowManager wm = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        // 屏幕宽度
+        float screenWidth = display.getWidth();
+        // 屏幕高度
+        float screenHeight = display.getHeight();
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getMetrics(dm);
+        double x = Math.pow(dm.widthPixels / dm.xdpi, 2);
+        double y = Math.pow(dm.heightPixels / dm.ydpi, 2);
+        // 屏幕尺寸
+        double screenInches = Math.sqrt(x + y);
+        Log.e("SystemUtils", "screenInches:" + screenInches);
+        // 大于6尺寸则为Pad
+        if (screenInches >= 6.0) {
+            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//横屏
+            return true;
+        }else {
+            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+        }
+        return false;
+    }
+
+}

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

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:gravity="center"
     tools:context="peanut.keenon.com.peanutsample.MainActivity"
     tools:showIn="@layout/activity_dinner">
 
     <peanut.keenon.com.control.MetroLoadingView
         android:id="@+id/loading"
-        android:layout_width="wrap_content"
-        android:layout_height="64dp"
-        android:layout_centerInParent="true"
-
-        app:number="4"
-        app:interval_in_mills="200"
-
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_64"
         app:fade="false"
+        app:has_shadow="false"
         app:indicator="circle"
-        app:indicator_radius="6dp"
-        app:transform_color_mode="symmetry"
         app:indicator_color="#FF0062cc"
-        app:transform_color="#FFFFFFFF"
-        app:indicator_height="9dp"
-        app:indicator_width="4dp"
-
+        app:indicator_height="@dimen/dp_9"
+        app:indicator_radius="@dimen/dp_6"
+        app:indicator_width="@dimen/dp_4"
+        app:interval_in_mills="200"
+        app:number="4"
+        app:shadow_color="#666666"
         app:transform="false"
-        app:transform_height="4dp"
-        app:transform_width="4dp"
-        app:transform_radius="3dp"
-
-        app:has_shadow = "false"
-        app:shadow_color="#666666"/>
+        app:transform_color="#FFFFFFFF"
+        app:transform_color_mode="symmetry"
+        app:transform_height="@dimen/dp_4"
+        app:transform_radius="@dimen/dp_3"
+        app:transform_width="@dimen/dp_4" />
 
-</RelativeLayout>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -18,4 +18,5 @@
     <string name="dinner_left_table">2</string>
     <string name="dinner_right_table">3</string>
     <string name="dinner_table_have_check">已经被选择,请选择其它餐桌</string>
+    <string name="dinner_table_hint">机器人会按右侧餐桌顺序送餐</string>
 </resources>