删除半袋米中的工具类G

.idea/gradle.xml

@@ -5,6 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -46,6 +46,7 @@ import com.kfzs.duanduan.adp.AdpViewPagerDetail;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -55,6 +55,7 @@ import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 

app/src/main/java/com/kfzs/duanduan/BaseCompatFragment.java

@@ -16,6 +16,7 @@ import android.view.ViewGroup;
 
 import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.lang.reflect.Field;
 

app/src/main/java/com/kfzs/duanduan/G.java

@@ -1,79 +0,0 @@
-package com.kfzs.duanduan;
-
-import android.content.Context;
-import android.support.annotation.StringRes;
-import android.view.Gravity;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  G</p>
- * @ <p>Description:</p>
- * @ date:  2017/12/7 10:46
- * @ QQ:    315096953
- */
-
-public class G {
-
-    public static int WIDTH = 0;
-    public static int HEIGHT = 0;
-    public static float DENSITY = 2;//屏幕的Density
-    private static Toast mToast;//全局的Toast
-
-
-    /**
-     * 全局的Toast
-     *
-     * @param context
-     * @param msg      显示的msg，如果为null或者空表示取消显示
-     * @param duration 显示的时长
-     */
-    public static void showToast(Context context, String msg, int duration) {
-        if (mToast == null) {
-            mToast = Toast.makeText(context, msg, duration);
-            mToast.setGravity(Gravity.CENTER, 0, getRealPix(200));//居中靠下
-            if (mToast.getView() instanceof ViewGroup
-                    && ((ViewGroup) mToast.getView()).getChildAt(0) instanceof TextView) {
-                ((TextView) ((ViewGroup) mToast.getView()).getChildAt(0)).setSingleLine(false);
-            }
-        } else if (msg == null || msg.equals(""))
-            mToast.cancel();
-        else {
-            mToast.setText(msg);
-        }
-        mToast.show();
-    }
-
-    /**
-     * 显示短暂消息
-     *
-     * @param msg
-     */
-    public static void showToast(String msg) {
-        showToast(KFZSApp.getInstance().getApplicationContext(), msg, Toast.LENGTH_SHORT);
-    }
-
-    /**
-     * 显示短暂消息
-     * @param resId
-     */
-    public static void showToast(@StringRes int resId) {
-        showToast(KFZSApp.getInstance().getApplicationContext(),
-                KFZSApp.getInstance().getApplicationContext().getString(resId),
-                Toast.LENGTH_SHORT);
-    }
-
-    /**
-     * 返回像素值
-     *
-     * @param dp 将转换的dp值
-     * @return 返回像素植
-     */
-    public static int getRealPix(int dp) {
-        return (int) (dp * G.DENSITY);
-    }
-
-
-}

app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -15,6 +15,7 @@ import com.kfzs.duanduan.db.DataSave;
 import com.kfzs.duanduan.services.KFDownloadServices;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.analytics.MobclickAgent;
 
 import org.wlf.filedownloader.FileDownloadConfiguration;

app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java

@@ -25,7 +25,7 @@ import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CateGameBean;
 import com.kfzs.duanduan.bean.Game;

app/src/main/java/com/kfzs/duanduan/adp/AdpVipCoupon.java

@@ -5,10 +5,9 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ListView;
 import android.widget.TextView;
 
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.CouponCodeOuterClass;
 import com.kfzs.duanduan.utils.DateFormatUtils;

app/src/main/java/com/kfzs/duanduan/adp/ClassificationGridviewAdapter.java

@@ -13,7 +13,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.proto.GameTypeSpecialOuterClass;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;

app/src/main/java/com/kfzs/duanduan/fragment/FgContinuePlay.java

@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.android.volleyplus.Response;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.BaseMsg;
 import com.kfzs.duanduan.bean.BorrowPlayIntegral;

app/src/main/java/com/kfzs/duanduan/mine/GiftpackBroughtAdapter.java

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.GiftList;
 import com.kfzs.duanduan.bll.UrlBll;

app/src/main/java/com/kfzs/duanduan/mine/GiftpackHasBroughtFragment.java

@@ -14,7 +14,7 @@ import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.BaseMsg;

app/src/main/java/com/kfzs/duanduan/mine/VoucherFragment.java

@@ -7,7 +7,7 @@ import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.datashare.KFZSDDContentSession;

app/src/main/java/com/kfzs/duanduan/utils/ShareUtils.java

@@ -2,7 +2,7 @@ package com.kfzs.duanduan.utils;
 
 import android.app.Activity;
 
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;

app/src/main/java/com/kfzs/duanduan/utils/dlg/CheckUtils.java

@@ -2,7 +2,7 @@ package com.kfzs.duanduan.utils.dlg;
 
 import android.text.TextUtils;
 
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.datashare.DDProviderHelper;

app/src/main/java/com/kfzs/duanduan/utils/dlg/HelperUtils.java

@@ -15,7 +15,7 @@ import com.android.volleyplus.Response;
 import com.android.volleyplus.VolleyError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.kfzs.duanduan.KFZSApp;
 
 import java.io.File;

app/src/main/java/com/kfzs/duanduan/utils/net/APIRequest.java

@@ -10,7 +10,7 @@ import com.android.volleyplus.Response;
 import com.android.volleyplus.toolbox.HttpHeaderParser;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.kfzs.appstore.utils.string.HexUtils;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.datashare.DDProviderHelper;

app/src/main/java/com/kfzs/duanduan/view/ImageGlarry.java

@@ -15,7 +15,7 @@ import android.widget.RadioGroup;
 
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.G;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/sheep/gamegroup/di/components/CommitWxMakeMoneyComponent.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.CommitWxMakeMoneyModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.CommitWxAct;
+
+import dagger.Component;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@UserScope
+@Component(modules = CommitWxMakeMoneyModule.class, dependencies = NetComponent.class)
+public interface CommitWxMakeMoneyComponent {
+    void inject(CommitWxAct commitWxAct);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/CommitWxMakeMoneyModule.java

@@ -0,0 +1,24 @@
+package com.sheep.gamegroup.di.modules;
+
+
+import com.sheep.gamegroup.presenter.CommitWxMakeMoneyContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@Module
+public class CommitWxMakeMoneyModule {
+    private CommitWxMakeMoneyContract.View view;
+
+    public CommitWxMakeMoneyModule(CommitWxMakeMoneyContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public CommitWxMakeMoneyContract.View provideView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxMakeMoneyContract.java

@@ -12,8 +12,6 @@ public interface CommitWxMakeMoneyContract {
     }
     interface View{
 
-        void updateData2View(Object o);
-        void failData2View(Object o);
         void postWebchatUpdataView(Object o);
         void failPostWebchat2View(Object o);
     }

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxMakeMoneyPresenter.java

@@ -33,12 +33,12 @@ public class CommitWxMakeMoneyPresenter implements CommitWxMakeMoneyContract.Pre
                 .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(ExceptionHandle.ResponeThrowable responeThrowable) {
-                        view.failData2View(responeThrowable.getMessage());
+                        view.failPostWebchat2View(responeThrowable.getMessage());
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        view.updateData2View(baseMessage);
+                        view.postWebchatUpdataView(baseMessage);
 
                     }
                 });

app/src/main/java/com/sheep/gamegroup/presenter/LieMakeMoneyContract.java

@@ -12,8 +12,6 @@ public interface LieMakeMoneyContract {
     }
     interface View{
 
-        void updateData2View(Object o);
-        void failData2View(Object o);
         void getWebchatUpdataView(Object o);
         void failGetWebchat2View(Object o);
     }

app/src/main/java/com/sheep/gamegroup/presenter/LieMakeMoneyPresenter.java

@@ -33,12 +33,12 @@ public class LieMakeMoneyPresenter implements LieMakeMoneyContract.Presenter {
                 .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(ExceptionHandle.ResponeThrowable responeThrowable) {
-                        view.failData2View(responeThrowable.getMessage());
+                        view.failGetWebchat2View(responeThrowable.getMessage());
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        view.updateData2View(baseMessage);
+                        view.getWebchatUpdataView(baseMessage);
 
                     }
                 });

app/src/main/java/com/sheep/gamegroup/view/activity/CommitWxAct.java

@@ -1,14 +1,20 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.kfzs.duanduan.G;
+import com.sheep.gamegroup.di.components.DaggerCommitWxMakeMoneyComponent;
+import com.sheep.gamegroup.di.modules.CommitWxMakeMoneyModule;
+import com.sheep.gamegroup.presenter.CommitWxMakeMoneyContract;
 import com.sheep.gamegroup.presenter.CommitWxMakeMoneyPresenter;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
@@ -22,7 +28,7 @@ import butterknife.OnClick;
  * realicing@sina.com
  */
 
-public class CommitWxAct extends BaseActivity {
+public class CommitWxAct extends BaseActivity implements CommitWxMakeMoneyContract.View{
 
     @BindView(R.id.tv_wx_commit)
     TextView tv_wx_commit;
@@ -34,7 +40,17 @@ public class CommitWxAct extends BaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_wx_commit:
-                G.showToast("该功能正在建设中");
+                String account = et_wx_account.getText().toString();
+                String password = et_wx_pwd.getText().toString();
+                if(TextUtils.isEmpty(account)){
+                    G.showToast("微信账号不能为空");
+                } else if(TextUtils.isEmpty(password)){
+                    G.showToast("微信密码不能为空");
+                } else if(presenter != null) {
+                    presenter.postWebchat(account, password);
+                } else {
+                    if(BuildConfig.DEBUG) G.showToast("功能不正常");
+                }
                 break;
         }
     }
@@ -55,6 +71,11 @@ public class CommitWxAct extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(activity, "挂机赚钱")
                 .setTitleFinish(activity);
+        DaggerCommitWxMakeMoneyComponent.builder()
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .commitWxMakeMoneyModule(new CommitWxMakeMoneyModule(this))
+                .build()
+                .inject(this);
     }
 
     @Override
@@ -66,4 +87,14 @@ public class CommitWxAct extends BaseActivity {
     public void initData() {
 
     }
+
+    @Override
+    public void postWebchatUpdataView(Object o) {
+        G.showToast("updateData2View");
+    }
+
+    @Override
+    public void failPostWebchat2View(Object o) {
+        G.showToast("updateData2View");
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/LieMakeMoneyAct.java

@@ -118,16 +118,6 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
     }
 
     @Override
-    public void updateData2View(Object o) {
-        G.showToast("updateData2View");
-    }
-
-    @Override
-    public void failData2View(Object o) {
-        G.showToast("failData2View");
-    }
-
-    @Override
     public void getWebchatUpdataView(Object o) {
         G.showToast("getWebchatUpdataView");
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/G.java

@@ -68,4 +68,7 @@ public class G {
     public static void showToast(String msg) {
         showToast(SheepApp.mSheepApp, msg, Toast.LENGTH_SHORT);
     }
+    public static void showToast(int resId) {
+        showToast(SheepApp.mSheepApp, SheepApp.mSheepApp.getString(resId), Toast.LENGTH_SHORT);
+    }
 }