1.完成Model模式界面搭建。

RA Image/app/app.iml

@@ -78,6 +78,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />

RA Image/app/src/main/AndroidManifest.xml

@@ -130,12 +130,15 @@
             android:theme="@style/Base.Theme.AppCompat.Light" />
         <activity
             android:name=".POP.PopActivity"
-            android:theme="@style/Theme.AppCompat.Light"
             android:label="@string/app_name"
-            android:stateNotNeeded="true">
-
-        </activity>
+            android:stateNotNeeded="true"
+            android:theme="@style/Theme.AppCompat.Light"></activity>
 
+        <activity
+            android:name=".Model.ModelActivity"
+            android:label="@string/app_name"
+            android:stateNotNeeded="true"
+            android:theme="@style/Theme.AppCompat.Light"></activity>
     </application>
 
 </manifest>

RA Image/app/src/main/java/com/usai/redant/raimage/MainActivity.java

@@ -30,6 +30,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -40,7 +41,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-public class MainActivity extends Activity
+public class MainActivity extends AppCompatActivity
 {
 	// static final int ACTIVITY_CAMERA = 0;
 	// static final int ACTIVITY_VIEW = 1;

RA Image/app/src/main/java/com/usai/redant/raimage/ModeActivity.java

@@ -26,6 +26,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.usai.redant.raimage.Model.ModelActivity;
 import com.usai.redant.raimage.POP.PopActivity;
 import com.usai.util.Network;
 
@@ -117,9 +118,9 @@ public class ModeActivity extends AppCompatActivity {
                 JSONObject mode = dataSource.get(position);
                try {
                    int enable = mode.getInt("enable");
-                   if (enable != 0) {
+//                   if (enable != 0) {
                        showActivityMode(mode);
-                   }
+//                   }
 
                } catch (Exception e) {
                    e.printStackTrace();
@@ -166,7 +167,8 @@ public class ModeActivity extends AppCompatActivity {
                Intent intent = new Intent(this,PopActivity.class);
                startActivity(intent);
            } else if (name.equals("Model")) {
-
+               Intent intent = new Intent(this,ModelActivity.class);
+               startActivity(intent);
            }
        } catch (Exception e) {
            e.printStackTrace();

RA Image/app/src/main/java/com/usai/redant/raimage/Model/ModelActivity.java

@@ -0,0 +1,34 @@
+package com.usai.redant.raimage.Model;
+
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import com.usai.redant.raimage.R;
+
+public class ModelActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_model);
+
+        ActionBar mActionBar = getSupportActionBar();
+        mActionBar.setHomeButtonEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setTitle("RA Image");
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        switch (item.getItemId()) {
+            case android.R.id.home: {
+                finish();
+            }
+            break;
+        }
+        return true;
+    }
+}

RA Image/app/src/main/java/com/usai/redant/raimage/POP/PopActivity.java

@@ -5,9 +5,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import com.usai.redant.raimage.MainActivity;
 import com.usai.redant.raimage.R;
 
-public class PopActivity extends AppCompatActivity {
+public class PopActivity extends MainActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

RA Image/app/src/main/res/drawable/black_border.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--背景色-->
+    <solid android:color="#FFFFFF" />
+
+    <!--边框颜色-->
+    <stroke
+        android:width="0.01dp"
+        android:color="#000000" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+</shape>

RA Image/app/src/main/res/layout-land/activity_model.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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="match_parent"
+    android:background="@color/black_overlay"
+    tools:context="com.usai.redant.raimage.Model.ModelActivity">
+
+    <RelativeLayout
+        android:id="@+id/photo_layout"
+        android:layout_width="220dp"
+        android:layout_height="220dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginStart="31dp"
+        android:layout_centerVertical="true"
+        >
+
+        <ImageView
+            android:id="@+id/photo_iv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/no_pic"></ImageView>
+
+        <TextView
+            android:id="@+id/photo_count_lb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/photo_iv"
+            android:layout_centerHorizontal="true"
+            android:gravity="center_horizontal|bottom"
+            android:text="No Photos"
+            android:textColor="@color/blue"
+            android:textSize="12sp"
+            />
+
+    </RelativeLayout>
+
+
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PIIP:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        android:layout_marginLeft="11dp"
+        android:layout_marginStart="11dp"
+        android:layout_alignTop="@+id/photo_layout"
+        android:layout_toRightOf="@+id/photo_layout"
+        android:layout_toEndOf="@+id/photo_layout" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:inputType="number"
+        android:textSize="17sp"
+        android:layout_alignBaseline="@+id/barcode_tv"
+        android:layout_alignBottom="@+id/barcode_tv"
+        android:layout_toRightOf="@+id/barcode_tv"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/barcode_tv"
+        android:layout_alignStart="@+id/barcode_tv"
+        android:layout_alignEnd="@+id/barcode_et"
+        android:layout_alignRight="@+id/barcode_et"
+        android:layout_below="@+id/barcode_et"
+        android:layout_alignBottom="@+id/photo_layout"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical"
+        >
+
+        <LinearLayout
+            android:id="@+id/note_layout"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical"
+            >
+            <EditText
+                android:id="@+id/note_et"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="Note:"
+                android:textColor="#000000"
+                android:gravity="left"
+                android:textSize="15sp"
+                android:inputType="textMultiLine"
+                android:background="@drawable/black_border"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/divide_btn_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal"
+            >
+
+            <ImageButton
+                android:id="@+id/scan_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@color/clear_color"
+                app:srcCompat="@drawable/bar2" />
+
+            <ImageButton
+                android:id="@+id/camera_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_action_camera"
+                android:background="@color/clear_color"/>
+
+            <ImageButton
+                android:id="@+id/upload_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@color/clear_color"
+                app:srcCompat="@drawable/ic_action_upload" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</RelativeLayout>

RA Image/app/src/main/res/layout/activity_model.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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="match_parent"
+    android:background="@color/black_overlay"
+    tools:context="com.usai.redant.raimage.Model.ModelActivity">
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="260dp"
+        android:layout_height="260dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="30dp"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/no_pic" />
+
+    <TextView
+        android:id="@+id/photo_count_lb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/photo_iv"
+        android:layout_centerHorizontal="true"
+        android:ems="10"
+        android:gravity="center_horizontal|bottom"
+        android:inputType="textPersonName"
+        android:text="No Photos"
+        android:textColor="@color/blue"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PIIP:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        android:layout_alignBaseline="@+id/barcode_et"
+        android:layout_alignBottom="@+id/barcode_et"
+        android:layout_alignLeft="@+id/photo_iv"
+        android:layout_alignStart="@+id/photo_iv" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:inputType="number"
+        android:textSize="17sp"
+        android:layout_below="@+id/photo_iv"
+        android:layout_toRightOf="@+id/barcode_tv"
+        android:layout_marginTop="20dp"
+        android:layout_alignRight="@+id/photo_iv"
+        android:layout_alignEnd="@+id/photo_iv" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/photo_iv"
+        android:layout_alignStart="@+id/photo_iv"
+        android:layout_alignEnd="@+id/photo_iv"
+        android:layout_alignRight="@+id/photo_iv"
+        android:layout_below="@+id/barcode_et"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical"
+        >
+
+        <LinearLayout
+            android:id="@+id/note_layout"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical"
+            >
+            <EditText
+                android:id="@+id/note_et"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="Note:"
+                android:textColor="#000000"
+                android:gravity="left"
+                android:textSize="15sp"
+                android:inputType="textMultiLine"
+                android:background="@drawable/black_border"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/divide_btn_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal"
+            >
+
+            <ImageButton
+                android:id="@+id/scan_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@color/clear_color"
+                app:srcCompat="@drawable/bar2" />
+
+            <ImageButton
+                android:id="@+id/camera_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_action_camera"
+                android:background="@color/clear_color"/>
+
+            <ImageButton
+                android:id="@+id/upload_btn"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@color/clear_color"
+                app:srcCompat="@drawable/ic_action_upload" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>