xiongxiaohe před 8 roky
rodič
revize
295b82278b

+ 1 - 54
app/build.gradle

@@ -55,10 +55,6 @@ android {
     }
 
 
-    dexOptions {
-        preDexLibraries = false
-        javaMaxHeapSize "4g"
-    }
     packagingOptions {
 
         exclude 'META-INF/services/com.fasterxml.jackson.core.JsonFactory'
@@ -73,56 +69,7 @@ android {
             signingConfig signingConfigs.config
         }
     }
-    productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: "${flavor.name}",
-                                       DUANDUAN_GRAPH     : "${flavor.name}",
-                                       DUANDUAN_DATASHARE : "${flavor.name}",
-        ]
-    }
-    productFlavors {
-        bandaimitest {
-            applicationId "com.sheep.jiuyan.samllsheep"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimitest",
-                                    DUANDUAN_GRAPH        : "bandaimitest",
-                                    DUANDUAN_DATASHARE    : "bandaimitest",
-                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2",
-                                    JPUSH_PKGNAME : applicationId,
-                                    JPUSH_APPKEY : "b8b5adf7d70d0c904d46d04c",
-                                    JPUSH_CHANNEL : "developer-default"]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimitest"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimitest"'
-            buildConfigField "boolean", "KF_DEBUG", 'true'
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
-//            buildConfigField "String", "RN_DOMAIN", '"10.8.210.229:8070"'
-            buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
-            signingConfig signingConfigs.config
-        }
-        bandaimi {
-            applicationId "com.sheep.jiuyan.samllsheep"
-//            applicationId "com.kfzs.duanduan.bandaimi"
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE   : "bandaimi",
-                                    DUANDUAN_GRAPH        : "bandaimi",
-                                    DUANDUAN_DATASHARE    : "bandaimi",
-                                    UMENG_APPKEY          : "58edcfeb310c93091c000be2",
-                                    JPUSH_PKGNAME : applicationId,
-                                    JPUSH_APPKEY : "b8b5adf7d70d0c904d46d04c",
-                                    JPUSH_CHANNEL : "developer-default"]
-            buildConfigField "String", "DUANDUAN_DATASHARE", '"bandaimi"'
-            buildConfigField "String", "DUANDUAN_GRAPH", '"bandaimi"'
-            buildConfigField "boolean", "KF_DEBUG", 'false'
-            buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
-            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
-//            buildConfigField "String", "API_DOMAIN", '"app.bdmoem.kfzs.com"'
-//            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bdmoem.kfzs.com/"'//积分商城
-            buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
-            buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
-            signingConfig signingConfigs.config
-        }
-    }
+
 
 
 

+ 6 - 3
app/src/main/java/com/sheep/gamegroup/di/components/AskGetMoneyComponet.java

@@ -1,15 +1,18 @@
 package com.sheep.gamegroup.di.components;
 
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
-import com.sheep.gamegroup.di.modules.LoginModule;
+import com.sheep.gamegroup.di.modules.PhoneModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
+import com.sheep.gamegroup.view.activity.PhoneAct;
 
 import dagger.Component;
 
 /**
- * Created by Administrator on 2018/3/23.
+ * Created by ljy on 2018/3/15.
  */
 @UserScope
 @Component(modules = AskGetMoneyModule.class, dependencies = NetComponent.class)
-public interface AskGetMoneyComponet {
+public interface AskGetMoneyComponent {
+    void inject(AskGetMoneyAct phoneAct);
 }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -127,7 +127,7 @@ public interface ApiService {
 
 
 
-    @GET(V1+" /app/user/friend_count_and_award")
+    @GET(V1+"/app/user/friend_count_and_award")
     Observable<BaseMessage> FriendCountAndAward();
 
 

+ 54 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/FriendAndAwardEntity.java

@@ -0,0 +1,54 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by Administrator on 2018/3/23.
+ */
+
+public class FriendAndAwardEntity {
+
+    private   String   award;
+    private   int  frind_count;
+    private  String  share_desc;
+    private  String  share_link;
+    private  String  share_title;
+
+    public String getAward() {
+        return award;
+    }
+
+    public void setAward(String award) {
+        this.award = award;
+    }
+
+    public int getFrind_count() {
+        return frind_count;
+    }
+
+    public void setFrind_count(int frind_count) {
+        this.frind_count = frind_count;
+    }
+
+    public String getShare_desc() {
+        return share_desc;
+    }
+
+    public void setShare_desc(String share_desc) {
+        this.share_desc = share_desc;
+    }
+
+    public String getShare_link() {
+        return share_link;
+    }
+
+    public void setShare_link(String share_link) {
+        this.share_link = share_link;
+    }
+
+    public String getShare_title() {
+        return share_title;
+    }
+
+    public void setShare_title(String share_title) {
+        this.share_title = share_title;
+    }
+}

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyContract.java

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.presenter;
 
 import com.sheep.gamegroup.IBase.IBasePresenter;
 import com.sheep.gamegroup.IBase.IBaseView;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 
 /**
  * Created by Administrator on 2018/3/10.
@@ -14,6 +15,9 @@ public interface AskGetMoneyContract {
     }
 
     interface View extends IBaseView{
+       void   showTask(FriendAndAwardEntity entity);
+
+
 
     }
 }

+ 14 - 0
app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyPresenter.java

@@ -3,10 +3,18 @@ package com.sheep.gamegroup.presenter;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.SheepApp;
 import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
+import com.sheep.gamegroup.model.entity.LoginEntity;
+import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.Parmameter;
+import com.sheep.gamegroup.util.SpUtils;
+
+import org.xutils.ex.DbException;
 
 import java.util.HashMap;
 
@@ -50,6 +58,12 @@ public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
 
+                        if(baseMessage!=null){
+                            FriendAndAwardEntity Ety = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),FriendAndAwardEntity.class);
+                            view.showTask(Ety);
+                        }else{
+                            view.NetError(-1,"数据解析出错");
+                        }
                     }
                 });
 

+ 120 - 57
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -1,25 +1,32 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.graphics.Bitmap;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.SheepApp;
-import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
-import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponet;
-import com.sheep.gamegroup.di.components.DaggerLoginComponent;
-import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
+import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
-import com.sheep.gamegroup.di.modules.LoginModule;
-import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
+import com.sheep.gamegroup.util.G;
+import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
+import com.umeng.socialize.media.UMWeb;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 import javax.inject.Inject;
 
@@ -31,8 +38,11 @@ import butterknife.OnClick;
  * Created by Administrator on 2018/3/19.
  */
 
-public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener ,AskGetMoneyContract.View {
+public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, AskGetMoneyContract.View {
 
+
+    @Inject
+    AskGetMoneyPresenter mPresenter;
     @BindView(R.id.tv_size)
     TextView tvSize;
     @BindView(R.id.tv_money)
@@ -46,15 +56,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener ,A
     @BindView(R.id.rl_link)
     RelativeLayout rlLink;
 
-    @Inject
-    AskGetMoneyPresenter  mPresenter;
-
-    /**
-     * 分享的链接地址
-     */
-    private  String  mShareLink;
-
-
+    private  FriendAndAwardEntity  mEntity;
 
     @Override
     protected int getLayoutId() {
@@ -63,11 +65,10 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener ,A
 
     @Override
     public void initView() {
-        DaggerAskGetMoneyComponet.builder()
+        DaggerAskGetMoneyComponent.builder().askGetMoneyModule(new AskGetMoneyModule(this))
                 .netComponent(SheepApp.get(this).getNetComponent())
-                .askGetMoneyModule(new AskGetMoneyModule(this))
-                .build();
-
+                .build()
+                .inject(this);
     }
 
     @Override
@@ -77,57 +78,84 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener ,A
 
     @Override
     public void initData() {
+        showProgress();
         mPresenter.getTask(null);
     }
 
-
-    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.rl_wx:
-                shareToWX();
-                break;
-            case R.id.rl_qq:
-                shareToQQ();
-                break;
-            case R.id.rl_qr:
-                shareToQR();
-                break;
-            case R.id.rl_link:
-                shareToLink();
-                break;
-        }
+    private void shareToWX() {
+        shareToOther(1);
     }
 
-    private  void  shareToWX(){
-        new ShareAction(AskGetMoneyAct.this)
-                .setPlatform(SHARE_MEDIA.WEIXIN)//传入平台
-                .withText(mShareLink)//分享内容
-                .setCallback(this)//回调监听器
-                .share();
-
+    private void shareToQQ() {
+        shareToOther(2);
     }
 
-
-    private  void  shareToQQ(){
-        new ShareAction(AskGetMoneyAct.this)
-                .setPlatform(SHARE_MEDIA.QZONE)//传入平台
-                .withText(mShareLink)//分享内容
-                .setCallback(this)//回调监听器
-                .share();
-
+    private void shareToOther(int code) {
+        UMImage thumb = new UMImage(this, R.drawable.icon);
+        UMWeb web = new UMWeb(mEntity.getShare_link());
+        web.setTitle(mEntity.getShare_title());//标题
+        web.setThumb(thumb);  //缩略图
+        web.setDescription(mEntity.getShare_desc());//描述
+        ShareAction shareAction = new ShareAction(AskGetMoneyAct.this);
+        if (code == 1) {
+            shareAction.setPlatform(SHARE_MEDIA.WEIXIN);
+        } else {
+            shareAction.setPlatform(SHARE_MEDIA.QQ);
+        }
+        shareAction.setCallback(this).withMedia(web).share();
     }
 
 
-    private  void  shareToQR(){
+    private void shareToQR() {
 
-
-    }
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+//        dialog.getWindow().setDimAmount(0.1f);
+//        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+        ImageView iv=view.findViewById(R.id.iv_close);
+        ImageView iv_qr=view.findViewById(R.id.iv_qr);
+         Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), G.WIDTH-40, G.HEIGHT/2, null);
+         iv_qr.setImageBitmap(mBitmap);
+         dialog.show();
+        iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
 
 
-    private  void  shareToLink(){
+    }
 
 
+    private void shareToLink() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = View.inflate(this, R.layout.x_ask_reward_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+//        dialog.getWindow().setDimAmount(0.1f);
+//        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+        TextView tv_link=view.findViewById(R.id.tv_link);
+        tv_link.setText(mEntity.getShare_link());
+        TextView withdrawal=view.findViewById(R.id.withdrawal);
+        ImageView iv=view.findViewById(R.id.iv_close);
+        dialog.show();
+        iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        withdrawal.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StringUtils.CopyText(AskGetMoneyAct.this,mEntity.getShare_link());
+                showToast("复制链接成功");
+                dialog.dismiss();
+            }
+        });
     }
 
 
@@ -153,11 +181,46 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener ,A
 
     @Override
     public void NetSuccess(int code, String msg) {
-        
+
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
+        hideProgress();
         showToast(errorMsg);
+
+    }
+
+    @Override
+    public void showTask(FriendAndAwardEntity entity) {
+        hideProgress();
+        mEntity=entity;
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                tvSize.setText(mEntity.getFrind_count()+"");
+                tvMoney.setText(mEntity.getAward());
+            }
+        });
+
+    }
+
+
+    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_wx:
+                shareToWX();
+                break;
+            case R.id.rl_qq:
+                shareToQQ();
+                break;
+            case R.id.rl_qr:
+                shareToQR();
+                break;
+            case R.id.rl_link:
+                shareToLink();
+                break;
+        }
     }
 }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/HomePageAct.java

@@ -103,6 +103,7 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
 
     @Override
     public void initData() {
+
         pagePresenter.getUserInfo();
 
     }

+ 1 - 1
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -462,7 +462,7 @@
                 android:id="@+id/tv_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/share_qr_code"
+                android:text="@string/share_link"
                 android:layout_toRightOf="@id/iv_link"
                 style="@style/txt_style_15"
                 android:layout_marginLeft="5dp"

+ 29 - 0
app/src/main/res/layout/x_ask_qr_dialog.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginBottom="20dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_close_diaolog"
+        android:layout_gravity="right"
+        />
+
+     <ImageView
+         android:id="@+id/iv_qr"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="20dp"
+         android:layout_gravity="center"
+         />
+
+
+
+</LinearLayout>

+ 35 - 13
app/src/main/res/layout/x_ask_reward_dialog.xml

@@ -14,28 +14,50 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
-        android:orientation="vertical"
-        android:background="@drawable/x_ll_bg"
+        android:layout_marginBottom="20dp"
         android:layout_marginTop="2dp"
         >
-      <TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="通过连接即将成为好友"
-          android:textSize="@dimen/text_size_12"
-          android:layout_gravity="center_vertical"
-          />
         <TextView
+            android:id="@+id/tv_link"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="通过连接即将成为好友"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:textSize="@dimen/text_size_15"
-            android:textColor="@color/txt_black_404040"
-            android:layout_gravity="center_vertical"
+            android:textColor="@color/txt_black_9e9c9c"
+            android:layout_gravity="left"
+            android:lines="2"
             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="通过连接加入小绵羊即可成为你的好友"
+            android:textSize="@dimen/text_size_15"
+            android:textColor="@color/txt_black_9e9c9c"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            />
+
+        <TextView
+            android:id="@+id/withdrawal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="160dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:text="复制链接"
+            android:textColor="@color/black_444444"
+            android:textSize="18dp"
+            android:background="@drawable/sp_bg_yellow"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:padding="7dp"/>
 
     </LinearLayout>
 </LinearLayout>