111

common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java

@@ -62,7 +62,7 @@ public class InstructorOperationDialog extends AbsDialogFragment {
 
     @Override
     protected boolean canCancel() {
-        return false;
+        return true;
     }
 
     @Override

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -41,7 +41,7 @@ public class IMLoginManager extends BaseCacheManager {
     public  boolean isNewUserGif(){
         return getBoolean(isNewUserGif,false);
     }
-    //新用戶是否送了禮物
+    //是否是新用戶還沒有送禮物
     public void setNewUserGif(boolean t){
         put(isNewUserGif,t);
     }

common/src/main/res/layout/view_instructor_operation.xml

@@ -58,7 +58,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="13dp"
+                android:layout_marginTop="5dp"
                 android:gravity="center"
                 android:text="@string/exclusive_instructor1"
                 android:textColor="#FF737373"

common/src/main/res/values-en/strings.xml

@@ -658,7 +658,7 @@
     <string name="exp">EXP</string>
     <string name="new_rewards">Complete newcomer tasks for more rewards</string>
     <string name="receive_awards">ReceiveAwards</string>
-
+    <string name="one_free">One free gift privilege!</string>
 
     <string name="send">Send out</string>
     <string name="sorry">I am sorry</string>

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

@@ -633,6 +633,9 @@
     <string name="reg">立即註冊</string>
     <string name="no_medal">TA還沒有勛章</string>
     <string name="car">座駕</string>
+    <string name="one_free">一次免費贈送禮物特權！</string>
+
+
     <string name="no_car">TA還沒有座騎</string>
     <string name="welcome_pdlive">歡迎來到PDLIVE</string>
     <string name="newcomer">恭喜你獲得了新人獎勵</string>