Kaynağa Gözat

1.修改Android RAImage Service Setting布局错误,以及Menu没有显示。
2.修改Android RAImage签名点击清除不起作用。

Pen Li 7 yıl önce
ebeveyn
işleme
a92873f793

+ 1 - 1
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/signature/SignatureActivity.java

@@ -136,6 +136,6 @@ public class SignatureActivity extends AppCompatActivity {
     }
 
     private void clearSignature() {
-        mSignatureView.clear();
+        mSignatureView.reset();
     }
 }

+ 1 - 0
ApexDrivers/raimage/src/main/AndroidManifest.xml

@@ -93,6 +93,7 @@
         <activity
             android:name=".ServerSettingActivity"
             android:label="@string/title_activity_service_setting"
+            android:theme="@style/Base.Theme.AppCompat.Light"
             android:screenOrientation="portrait"/>
         <activity
             android:name=".FullScreenLoginActivity"

+ 19 - 1
ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/ServerSettingActivity.java

@@ -6,9 +6,12 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -18,7 +21,7 @@ import android.widget.Toast;
 
 import com.usai.redant.rautils.zxing.codescanner.CaptureActivity;
 
-public class ServerSettingActivity extends Activity
+public class ServerSettingActivity extends AppCompatActivity
 {
 	static final int	REQUEST_SCAN_BARCODE	= 2;
 
@@ -104,8 +107,23 @@ public class ServerSettingActivity extends Activity
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
 		// Inflate the menu; this adds items to the action bar if it is present.
+
+		/**
+		 * 将RAImage搬到ApexDriver工程后,app:showAsAction="always" 不起作用
+		 * 修改:继承自 AppCompatActivity,并修改theme
+		 * */
 		getMenuInflater().inflate(R.menu.server_setting, menu);
 		return true;
+
+//		/**
+//		 * 将RAImage搬到ApexDriver工程后
+//		 * app:showAsAction="always" 不起作用
+//		 *
+//		 * */
+//		new MenuInflater(this).inflate(R.menu.server_setting,menu);
+//		MenuItemCompat.setShowAsAction(menu.findItem(R.id.action_save), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+//		return super.onCreateOptionsMenu(menu);
+
 	}
 
 	@Override

+ 25 - 37
ApexDrivers/raimage/src/main/res/layout/activity_service_setting.xml

@@ -22,73 +22,61 @@
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:text="Server"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:layout_constraintBottom_creator="1"
-        tools:layout_constraintLeft_creator="1"
-        android:layout_marginLeft="0dp"
         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:layout_marginTop="10dp"
+        android:layout_marginEnd="24dp"
         android:ems="10"
         android:singleLine="true"
-        app:layout_constraintLeft_toRightOf="@+id/tv_name"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/tv_name"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name"
         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">
+        tools:layout_constraintRight_creator="1">
 
-        <requestFocus />
+        <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_marginRight="8dp"
         android:layout_marginBottom="8dp"
-        app:layout_constraintVertical_bias="0.26" />
+        android:src="@drawable/ic_action_scan"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/et_ia"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintTop_creator="1"/>
 
     <EditText
         android:id="@+id/et_ia"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:ems="10"
         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"/>
 
 </android.support.constraint.ConstraintLayout>

+ 5 - 3
ApexDrivers/raimage/src/main/res/menu/server_setting.xml

@@ -1,9 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:raimage="http://schemas.android.com/apk/res-auto">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <item
         android:id="@+id/action_save"
-        raimage:showAsAction="always"
-        android:title="@string/action_save"/>
+        android:title="@string/action_save"
+        app:showAsAction="always"
+        />
 
 </menu>