RedAnt Mobile

移植ra image 编译通过，

RedAnt Mobile/app/src/main/java/com/usai/redant/raimage/ServerSettingActivity.java

@@ -10,10 +10,7 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.Toast;
 
 import com.usai.redant.redantmobile.R;
@@ -79,27 +76,27 @@ public class ServerSettingActivity extends Activity
 		et_ia.setText(aa);
 		et_name.setText(station_name);
 
-		ImageButton ibtn = (ImageButton) findViewById(R.id.ibtn_scan);
-		ibtn.setOnClickListener(new OnClickListener()
-		{
-
-			@Override
-			public void onClick(View v)
-			{
-			//	Log.d(TAG, "==============>Click Scan button");
-//				if (!RAUtil.checkPermission(ServerSettingActivity.this,"android.permission.CAMERA")) {
+//		ImageButton ibtn = (ImageButton) findViewById(R.id.ibtn_scan);
+//		ibtn.setOnClickListener(new OnClickListener()
+//		{
 //
-//					return;
-//				}
-
-				Intent intent = new Intent();
-
-				intent.setClass(ServerSettingActivity.this,
-						CaptureActivity.class);
-				startActivityForResult(intent, REQUEST_SCAN_BARCODE);
-
-			}
-		});
+//			@Override
+//			public void onClick(View v)
+//			{
+//			//	Log.d(TAG, "==============>Click Scan button");
+////				if (!RAUtil.checkPermission(ServerSettingActivity.this,"android.permission.CAMERA")) {
+////
+////					return;
+////				}
+//
+//				Intent intent = new Intent();
+//
+//				intent.setClass(ServerSettingActivity.this,
+//						CaptureActivity.class);
+//				startActivityForResult(intent, REQUEST_SCAN_BARCODE);
+//
+//			}
+//		});
 	}
 
 	@Override

RedAnt Mobile/app/src/main/res/layout/activity_service_setting.xml

@@ -9,86 +9,82 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Name"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:layout_constraintTop_creator="1"
-        tools:layout_constraintRight_creator="1"
+        android:layout_marginLeft="24dp"
         android:layout_marginTop="24dp"
+        android:text="Company ID"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginLeft="24dp"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintTop_creator="1" />
 
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Server"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:layout_constraintBottom_creator="1"
-        tools:layout_constraintLeft_creator="1"
         android:layout_marginLeft="0dp"
+        android:layout_marginTop="24dp"
+        android:text="Password"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         app:layout_constraintLeft_toLeftOf="@+id/tv_name"
-        android:layout_marginTop="32dp"
-        app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+        app:layout_constraintTop_toBottomOf="@+id/et_name"
+        tools:layout_constraintBottom_creator="1"
+        tools:layout_constraintLeft_creator="1" />
 
     <EditText
         android:id="@+id/et_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginRight="24dp"
         android:ems="10"
         android:singleLine="true"
-        app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintRight_toRightOf="parent"
         tools:layout_constraintBaseline_creator="1"
         tools:layout_constraintLeft_creator="1"
         tools:layout_constraintRight_creator="1"
-        app:layout_constraintTop_toTopOf="@+id/tv_name"
-        android:layout_marginTop="0dp"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
-        android:layout_marginBottom="0dp"
-        app:layout_constraintVertical_bias="0.478">
+        android:layout_marginLeft="0dp"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        android:layout_marginTop="16dp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name"
+        app:layout_constraintHorizontal_bias="0.5">
 
         <requestFocus />
     </EditText>
 
-    <ImageButton
-        android:id="@+id/ibtn_scan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_action_scan"
-        tools:layout_constraintTop_creator="1"
-        tools:layout_constraintRight_creator="1"
-        android:layout_marginEnd="112dp"
-        android:layout_marginRight="8dp"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@+id/et_ia"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintVertical_bias="0.26" />
-
     <EditText
         android:id="@+id/et_ia"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="16dp"
         android:ems="10"
+
+        android:password="true"
+
         android:singleLine="true"
-        tools:layout_constraintTop_creator="1"
-        tools:layout_constraintRight_creator="1"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="@+id/textView3"
         app:layout_constraintRight_toRightOf="@+id/et_name"
+        app:layout_constraintTop_toBottomOf="@+id/textView3"
         tools:layout_constraintLeft_creator="1"
-        app:layout_constraintLeft_toLeftOf="@+id/textView3"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
-        app:layout_constraintHorizontal_bias="0.0"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintTop_creator="1" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Connect"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.501"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/et_ia"
+        app:layout_constraintVertical_bias="0.35000002" />
 
 </android.support.constraint.ConstraintLayout>