Przeglądaj źródła

游戏详情可取消关注;
添加游戏详情分享功能;
添加发表成功的提示对话框

zengjiebin 7 lat temu
rodzic
commit
8c4a2aa592

+ 15 - 1
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1640,7 +1640,21 @@ public class Jump2View {
         Intent intent = new Intent(activity, ActReservation.class);
         activity.startActivity(intent);
     }
-
+    //分享
+    public void tryShare(final Activity activity, String shareUrlKey, final String idName, final int id, final String description) {
+        try {
+            CommonUtil.getInstance().initUrlConfigByNet(shareUrlKey, new Action1<String>() {
+                @Override
+                public void call(String find_share_url) {
+                    String url = String.format(Locale.CHINA, "%s?authorization=%s&%s=%d&invitation_code=%s", find_share_url, SpUtils.getToken(activity), idName, id, DataUtil.getInstance().getInvitationCode());
+                    CommonUtil.getInstance().popShare(activity, url, DialogShare.ALL, description);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    //分享
     public void tryShare(final Activity activity, String shareUrlKey, final String idName, final int id) {
         try {
             CommonUtil.getInstance().initUrlConfigByNet(shareUrlKey, new Action1<String>() {

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActArticle.java

@@ -120,7 +120,11 @@ public class ActArticle extends BaseActivity implements Action1<Integer> {
                     @Override
                     public void onClick(View view) {
                         FIND_SHARE.onEvent("find_id", id);
-                        Jump2View.getInstance().tryShare(ActArticle.this, "find_share_url", "find_id", id);
+                        if(article == null){
+                            Jump2View.getInstance().tryShare(ActArticle.this, "find_share_url", "find_id", id);
+                        } else {
+                            Jump2View.getInstance().tryShare(ActArticle.this, "find_share_url", "find_id", id, article.getDes());
+                        }
                     }
                 });
 

+ 19 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActCommentGameApp.java

@@ -18,7 +18,10 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.util.concurrent.TimeUnit;
+
 import butterknife.BindView;
+import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -51,11 +54,24 @@ public class ActCommentGameApp extends BaseActivity {
                     }
                 })
                 .setTitleFinish(this);
+//
+//        Observable.just(1).delay(100L, TimeUnit.MILLISECONDS)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new Action1<Integer>() {
+//                    @Override
+//                    public void call(Integer integer) {
+//                        act_comment_game_app_input_comment.setFocusable(true);
+//                        act_comment_game_app_input_comment.setFocusableInTouchMode(true);
+//                        act_comment_game_app_input_comment.requestFocus();
+//                    }
+//                });
     }
+
     //评论游戏
     private void commitUserGameComment(int score, String content) {
-        if(TestUtil.isDev()) G.showToast(score + " " + content);
-        if(TextUtils.isEmpty(content)){
+        if (TestUtil.isDev()) G.showToast(score + " " + content);
+        if (TextUtils.isEmpty(content)) {
             G.showToast("亲,您还没有填写你的观点呢");
             return;
         }
@@ -87,7 +103,7 @@ public class ActCommentGameApp extends BaseActivity {
     public void initData() {
         game_id = getIntent().getIntExtra("game_id", 0);
         if (game_id > 0) {
-            if(TestUtil.isDev()) G.showToast("game_id为" + game_id);
+//            if (TestUtil.isDev()) G.showToast("game_id为" + game_id);
             act_comment_game_app_score.setIsIndicator(false);
         } else {
             G.showToast(R.string.error_data);

+ 5 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActGcGameAppDetail.java

@@ -54,6 +54,8 @@ import butterknife.BindView;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_SHARE;
+
 
 /**
  * Created by realicing on 2018/10/31.
@@ -270,11 +272,12 @@ public class ActGcGameAppDetail extends BaseActivity {
 
     //点击分享
     public void onClickShareImg(View view) {
+        FIND_SHARE.onEvent("application_id", id);
         if(gameEntity == null || gameEntity.getApp() == null || TextUtils.isEmpty(gameEntity.getApp().getName())){
-            CommonUtil.getInstance().tryShowShareDialog(this);
+            Jump2View.getInstance().tryShare(this, "find_share_url", "application_id", id);
             return;
         }
-        CommonUtil.getInstance().tryShowShareDialog(this, String.format(Locale.CHINA, "小朋友,快来玩【%s】", gameEntity.getApp().getName()));
+        Jump2View.getInstance().tryShare(this, "find_share_url", "application_id", id, String.format(Locale.CHINA, "【%s】超好玩,来小绵羊一起玩", gameEntity.getApp().getName()));
     }
 
     //点击加,发表评论

+ 6 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -847,7 +847,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     onClickSecondBtn();
                     break;
                 case R.id.detail_share_friend_tv:
-                    Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
+                    if(taskReleaseEty != null){
+                        Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
+                    } else {
+                        Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId,
+                                String.format(Locale.CHINA, "邀你来玩【%s】,获%s元礼金,还有更多礼金相送", taskReleaseEty.getName(), taskReleaseEty.getBonusText()));
+                    }
                     break;
                 case R.id.task_detail_cancel://尝试取消任务
                     if (gettaskAcceptedEty != null && gettaskAcceptedEty.getId() > 0)

+ 8 - 5
app/src/main/res/layout/act_comment_game_app.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    tools:context="com.sheep.gamegroup.view.activity.ActCommentGameApp">
+    >
 
     <include layout="@layout/title" />
 
@@ -57,7 +57,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.AppCompatEditText
+        <android.support.v7.widget.AppCompatAutoCompleteTextView
             android:id="@+id/act_comment_game_app_input_comment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,9 +70,7 @@
             android:paddingBottom="20dp"
             android:textColor="#333333"
             android:textColorHint="#ffcccccc"
-            android:textSize="13sp" >
-            <requestFocus/>
-        </android.support.v7.widget.AppCompatEditText>
+            android:textSize="13sp" />
 
         <ImageView
             android:layout_width="50dp"
@@ -85,5 +83,10 @@
             android:scaleType="fitCenter"
             android:src="@mipmap/x" />
     </RelativeLayout>
+    <!--这里是一个系统级别的bug吗,为什么上面的输入框不能自动弹出输入法,而必须添加下面的ListView来让整个界面充满才能自动弹出输入法(不能是View...)-->
+    <ListView
+        android:id="@+id/search_app_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
 </LinearLayout>