Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -17,7 +17,12 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            zipAlignEnabled true
+            debuggable true
+            //混淆编译
+            minifyEnabled true//打开
+            //移除无用的资源文件
+            shrinkResources true//打开
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralActivity.java

@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.List;
@@ -67,13 +68,13 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
     @Override
     public void addSucc(LoadingDialog loadingDialog) {
         pop();
-        mPresenter.query(1, mPresenter.integralIndexFragment.NORMAL_TYPE, loadingDialog);
+        mPresenter.query(1, IntegralIndexFragment.NORMAL_TYPE, loadingDialog);
     }
 
     @Override
     public void updateSucc(LoadingDialog loadingDialog) {
         pop();
-        mPresenter.query(1, mPresenter.integralIndexFragment.NORMAL_TYPE, loadingDialog);
+        mPresenter.query(1, IntegralIndexFragment.NORMAL_TYPE, loadingDialog);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -64,7 +64,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
         marketingMenuAdapter = new MarketingMenuAdapter(list);
         mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
-        linearLayoutManager.setOrientation(linearLayoutManager.VERTICAL);
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
         marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java

@@ -44,7 +44,7 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
      * @param buttonID
      */
     private void setRadioButtonChecked(int buttonID) {
-        RadioButton radioButton=   ((RadioButton) mViewBinding.vipLevelRadioGroup.findViewById(buttonID));
+        RadioButton radioButton= mViewBinding.vipLevelRadioGroup.findViewById(buttonID);
         if (radioButton.isChecked()){
             radioButton.getPaint().setFakeBoldText(true);
             radioButton.setTextSize(17);